qinzhipeng_v 5 年之前
父節點
當前提交
a4508aa63c

+ 1 - 1
src/views/projectManage/bugList/bugindex.vue

@@ -76,7 +76,7 @@
           <el-col v-if="DetailedScreening" :span="24" class="Layout">
             <el-form :model="formInline" style="width: 100%;">
               <el-row style="width: 100%;">
-                <el-col :span="24" class="DetailedScreening" style="width: 100%;padding: 15px">
+                <el-col :span="24" class="DetailedScreening" style="width: 100%;padding: 15px;margin-bottom: 15px;">
                   <div class="flex_start">
                     <div class="Layout">
                       <div class="queryName">缺陷等级</div>

+ 1 - 1
src/views/projectManage/bugList/css/index.css

@@ -17,7 +17,7 @@
 }
 .headerBg {
    background: #FFFFFF;
-   padding: 1%;
+   padding: 1% 1% 0 1%;
    height: auto;
    border-radius: 4px;
    overflow-x: hidden;

+ 14 - 7
src/views/projectManage/bugList/details/index.vue

@@ -20,7 +20,7 @@
             <el-dropdown-item @click.native="openDeleteDialog()">删除</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <div style="display: inline-block;margin-left: 10px;margin-right: 15px;padding: 10px" @mouseover="iconName = 'float_反馈_icon_close_蓝色'" @mouseleave="iconName = 'float_反馈_icon_close'" @mousedown="closeDrawer();">
+        <div style="display: inline-block;margin-left: 10px;margin-right: 15px;" @mouseover="iconName = 'float_反馈_icon_close_蓝色'" @mouseleave="iconName = 'float_反馈_icon_close'" @mousedown="closeDrawer();">
           <el-button size="medium" type="text" style="margin-top:-5px;">
             <svg-icon :icon-class="iconName" />
           </el-button>
@@ -29,7 +29,7 @@
     </div>
     <el-container
       v-loading.fullscreen.lock="loading.fullscreen"
-      :style="type=='page'?{'background-color': '#F2F3F6','padding': '1%'}:{'background-color': '#F2F3F6','overflow': 'auto','height':height}"
+      :style="type=='page'?{'background-color': '#F2F3F6','padding': '1%'}:{'background-color': '#F56C6C','overflow': 'auto','height':height}"
       class="bug_manage_container"
     >
       <el-header height="0" />
@@ -278,7 +278,7 @@
             </el-container>
           </el-main>
         </el-aside>
-        <el-aside :width="type=='page'?'28.5%':'100%'">
+        <el-aside :width="type=='page'?'29.2%':'100%'">
           <el-main v-loading="loading.userInfo" :style="type=='page'?{'padding': '20px 30px'}:{'padding-left':'30px'}" class="layout_main bug_manage_user_info">
             <div class="module_title">
               <div class="module_title__sign" />
@@ -416,12 +416,12 @@
             placement="top"
           >
             <div class="bug_describe_content" @click="describeEditorVisible = true;">
-              <div v-html="bug.bugDescribe" />
+              <div style="font-size:14px" v-html="bug.bugDescribe" />
             </div>
           </el-tooltip>
-          <div v-show="describeEditorVisible">
+          <div v-show="describeEditorVisible" style="margin-top:15px">
             <div id="wage" class="toolbar" />
-            <div id="wage1" class="text" @blur="describeConfirm()" />
+            <div id="wage1" class="text" style="font-size:14px" @blur="describeConfirm()" />
             <div style="margin-top:40px;float: right">
               <el-button @click="describeCancel()">取 消</el-button>
               <el-button type="primary" @click="describeConfirm()">确 认</el-button>
@@ -436,7 +436,7 @@
           <el-divider v-if="type !== 'page'" />
           <el-upload
             ref="upload"
-            style="margin-top: 20px;"
+            style="margin-top: 15px"
             class="upload-demo"
             list-type="picture-card"
             multiple
@@ -696,6 +696,7 @@ export default {
       }
     },
     id(newVal, oldVal) {
+      window.scrollTo(0, 0)
       this.bug = {}
       this.bugModel = {}
       this.bugNameForm = { bugName: '' }
@@ -898,6 +899,11 @@ export default {
     },
     describeConfirm() {
       this.bug.bugDescribe = this.bugDescribe
+      if (this.bugDescribe) {
+        this.bugDescribeNoHtml = this.bugDescribe
+          .replace(/<[^>]+>/g, '')
+          .replace(/&nbsp;/gi, '')
+      }
       this.bugUpdate(this.bug, 'describe').then(res => {
         if (res.code === 200) {
           this.describeEditorVisible = false
@@ -1271,6 +1277,7 @@ export default {
 }
 .bug_describe {
   color: #C0C4CC;
+  font-size: 14px;
 }
 .bug_describe:hover {
   color: #409eff;

+ 11 - 4
src/views/projectManage/projectList/projectViewDetails.vue

@@ -250,7 +250,7 @@
           </div>
         </el-aside>
         <el-container>
-          <el-main class="bgborder" style=" margin: 0 1.3% 1.3% 0;min-height: 50vh;">
+          <el-main class="bgborder planList" style=" margin: 0 1.3% 1.3% 0;min-height: 50vh;">
             <div class="titDiv">
               <div class="titIcon" />
               <div class="titSonName">任务列表</div>
@@ -278,7 +278,7 @@
             >
               <el-table-column type="selection" width="55" align="center" />
               <el-table-column label="任务名称" min-width="100" align="center" show-overflow-tooltip>
-                <template slot-scope="scope"><div style="cursor: pointer;" @click="link_task(scope.row.id)">{{ scope.row.name }}</div></template>
+                <template slot-scope="scope" @click="link_task(scope.row.id)">{{ scope.row.name }}</template>
               </el-table-column>
               <el-table-column label="所属需求" min-width="100" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">{{ scope.row.requireName }}</template>
@@ -317,7 +317,7 @@
         </el-container>
       </el-container>
     </el-container>
-    <el-dialog :visible.sync="dialogFormVisible" class="dialog" @close="close_dialog">
+    <el-dialog :visible.sync="dialogFormVisible" class="dialog" :close-on-click-modal="false" @close="close_dialog">
       <div style="display:flex;align-items: center;margin:0 0 30px 10px;">
         <div class="titIcon" />
         <div style="width:150px;height:20px;font-size:18px;font-family:MicrosoftYaHei;color:rgba(51,59,74,1);margin-left:6px">{{ title_name }}</div>
@@ -1270,5 +1270,12 @@ export default {
     color: #409EFF;
   }
 }
-
+.descr {
+  display: flex;
+  justify-content: start;
+}
+.planList /deep/ .el-table th>.cell {
+  padding-left: 14px;
+  padding-right: 14px;
+}
 </style>

+ 2 - 2
src/views/projectManage/requirement/details/index.vue

@@ -199,9 +199,9 @@
         <el-col :span="8">
           <div v-for="(item,index) in task.preOnlineVersion" :key="index" style="margin-bottom:10px"> <span :style="{visibility: index===0?'visible ':'hidden'}">预期上线版本:</span>{{ item }}</div>
         </el-col>
-        <el-col :span="16">
+        <!-- <el-col :span="16">
           <div v-for="(item,index) in task.preOnlineVersion" :key="index" style="margin-bottom:10px"> <span :style="{visibility: index===0?'visible ':'hidden'}">实际上线版本:</span>{{ item }}</div>
-        </el-col>
+        </el-col> -->
       </el-row>
     </el-main>
     <el-main style="margin: 1%;padding: 2% !important;" class="layout_main requirement_details_layout_main">