qinzhipeng_v@didiglobal.com 4 rokov pred
rodič
commit
b40cd9a9cf

+ 6 - 3
src/views/ToConfigure/components/modifyNotice.vue

@@ -42,7 +42,7 @@
       </el-form>
       <el-form ref="form" :model="formData" label-width="100px" label-position="left" :inline="true">
         <el-form-item v-if="type === 'bug'" label="端类型">
-          <el-select v-model="formData.sysType" size="small" style="width: 209px;" clearable filterable placeholder="请选择">
+          <el-select v-model="formData.sysType" size="small" style="width: 209px;" :disabled="disabled" clearable filterable placeholder="请选择">
             <el-option v-for="item in sysTypeEnumList" :key="item.code" :label="item.name" :value="item.code" />
           </el-select>
         </el-form-item>
@@ -171,7 +171,7 @@
             <el-option v-for="(key, index) in timeDateEnum" :key="'continuity'+index" :label="key" :value="key" />
           </el-select>
         </el-form-item><br>
-        <el-form-item v-if="type === 'bug'" label="频次">
+        <el-form-item label="频次">
           <el-select v-model="formData.noticeFrequency" placeholder="请选择" size="small" style="width: 209px;" :disabled="disabled" clearable>
             <el-option v-for="key in continuityDaysList" :key="'continuity'+key.value" :label="key.label" :value="key.value" />
           </el-select>
@@ -387,17 +387,20 @@ export default {
   },
   methods: {
     initData(data) {
+      console.log(data)
       this.formData = {
         type: data.type,
         id: data.id,
         bizId: data.bizId,
+        sysType: data.sysType,
         requireOrientIdList: data.requireOrientIdList, // 需求方向
         techModuleIdList: data.techModuleIdList, // 技术模块
         clientId: data.clientId || null, // 客户端
         clientVersionId: data.clientVersionId, // 版本
         noticeConditionList: data.noticeConditionList || [], // 条件列表
         noticeSetting: {}, // 通知方式
-        noticeTime: data.noticeTime // 通知时刻
+        noticeTimeList: data.noticeTimeList, // 通知时刻
+        noticeFrequency: data.noticeFrequency // 频次
       }
       if (data.noticeSetting.email && data.noticeSetting.email.length > 0) {
         this.EmailList = Array(data.noticeSetting.email.length).fill({ type: 0, member: true, teams: [], customStaffs: [] })

+ 2 - 2
src/views/ToConfigure/components/noticeConfig.vue

@@ -43,12 +43,12 @@
             <label v-show="item.type === 2">缺陷范围:</label>
             <el-tooltip
               effect="dark"
-              :content="item.copywriter.requirementArea || item.copywriter.taskArea"
+              :content="item.copywriter.requirementArea || item.copywriter.taskArea || item.copywriter.bugArea"
               placement="bottom"
               popper-class="item-span-tooltip"
             >
               <div class="detail-contain">
-                {{ item.copywriter.requirementArea || item.copywriter.taskArea }}
+                {{ item.copywriter.requirementArea || item.copywriter.taskArea || item.copywriter.bugArea }}
               </div>
             </el-tooltip>
           </div>

+ 2 - 1
src/views/projectManage/bugList/details/bugTableDialog.vue

@@ -63,7 +63,7 @@
           <el-button class="bug-botton" @click="bugFormQuery = {}">重置</el-button>
           <el-button class="bug-botton" style="margin-left: 20px;" type="primary" @click="bugGetTableList(bugFormQuery, false, 2)">筛选</el-button>
         </div>
-        <div slot="reference" class="bug-Status" style="cursor: pointer;" @click="bugClickIcon"><svg-icon v-if="bugIcon" icon-class="筛选" /><svg-icon v-if="!bugIcon" icon-class="筛选1" /></div>
+        <div slot="reference" class="bug-Status" :class="{'bug-color': !bugIcon, 'bug-bgColor': bugIcon}" @click="bugClickIcon"><svg-icon v-if="bugIcon" icon-class="筛选" /><svg-icon v-if="!bugIcon" icon-class="筛选1" /> 筛选项 </div>
       </el-popover>
     </div>
     <el-table
@@ -400,6 +400,7 @@ export default {
   .bug-Status {
     line-height: 60px;
     padding: 0 30px;
+    cursor: pointer;
   }
   .bug-bgColor {
     color: #606266;

+ 7 - 2
src/views/quality/components/requireDrawer.vue

@@ -1,8 +1,8 @@
 <template>
-  <el-drawer :title="Statistics.label" :visible.sync="drawer_" :direction="direction" :modal="false" size="100%" :before-close="handleClose">
+  <el-drawer :title="Statistics.label" :visible.sync="drawer_" :direction="direction" :modal="false" :class="{'drawer-box': showClass}" size="100%" :before-close="handleClose">
     <div class="_font">{{ Statistics.total }}</div>
     <div style="height: calc(100vh - 200px); overflow: scroll; overflow-x: hidden;">
-      <el-table :data="tableData" style="width: 100%;" class="integration-num">
+      <el-table :data="tableData" style="width: 100%;" :header-cell-style="{ 'color':'rgba(74,74,74,1)','font-size':'14px','font-weight':'500' }" class="integration-num">
         <el-table-column label="优先级" min-width="100">
           <template slot-scope="scope">
             <div class="div_priority" :style="{background: priorityColors[scope.row.priority % priorityColors.length]}">{{ 'P'+scope.row.priority }}</div>
@@ -68,6 +68,7 @@ export default {
       priorityColors: ['#F56C6C', '#FF8952', '#F5E300', '#7ED321', '#61D3B8', '#69B3FF', '#BDBDBD'],
       Statistics: {}, // title
       direction: 'rtl',
+      showClass: false,
       bugList: [],
       currentPage: 1,
       total: 0,
@@ -148,6 +149,7 @@ export default {
       const res = await bugGetEnum()
       if (res.code === 200) {
         this.bugList = res.data.bugEnumList
+        this.showClass = true
       }
     },
     handleSizeChange(val) {
@@ -198,6 +200,9 @@ export default {
     font-weight: 500;
     margin-bottom: 0px;
     padding: 20px 30px 0;
+}
+.drawer-box {
+  box-shadow: 0 8px 10px -5px rgba(0,0,0,.2), 0 16px 24px 2px rgba(0,0,0,.14), 0 6px 30px 5px rgba(0,0,0,.12);
 }
  .el-drawer__wrapper {
     width: 100%;

+ 1 - 1
src/views/quality/defectStatistics.vue

@@ -303,7 +303,7 @@
         </div>
       </el-main>
       <div @click.stop>
-        <require-drawer :drawer="drawer" :data="requireList" @clone="clone" />
+        <require-drawer v-if="drawer" :drawer="drawer" :data="requireList" @clone="clone" />
       </div>
     </el-container>
   </div>

+ 1 - 1
src/views/quality/requireStatistics.vue

@@ -183,7 +183,7 @@
         </div>
       </el-main>
       <div @click.stop>
-        <require-drawer :drawer="drawer" :data="requireList" @clone="clone" />
+        <require-drawer v-if="drawer" :drawer="drawer" :data="requireList" @clone="clone" />
       </div>
     </el-container>
   </div>

+ 1 - 1
src/views/quality/taskStatistics.vue

@@ -185,7 +185,7 @@
         </div>
       </el-main>
       <div @click.stop>
-        <require-drawer :drawer="drawer" :data="requireList" @clone="clone" />
+        <require-drawer v-if="drawer" :drawer="drawer" :data="requireList" @clone="clone" />
       </div>
     </el-container>
   </div>