Merge branch 'http_test' into http_mock

src/views/projectManage/requirement/components/ganntViews.vue

@@ -66,11 +66,8 @@ export default {
       const colorlist = ['#A1DEFF', '#FAB5B5', '#BCED86', '#FFA87F', '#8E44AD', '#1EBC61', '#0287D0']
       return {
         id: item.id,
-        taskName: item.name,
         label: item.name,
         belongModules: item.moduleInfoName || '',
-        // devPerson: item.rdObject.name || '',
-        // testPerson: item.qaObject.name || '',
         description: data + '个排期',
         startDate: item.optionsObject.startTime ? moment(item.optionsObject.startTime).format('YYYY.MM.DD') : '',
         endDate: item.optionsObject.endTime ? moment(item.optionsObject.endTime).format('YYYY.MM.DD') : '',
@@ -78,6 +75,7 @@ export default {
         type: 'task',
         percent: 0,
         html: true,
+        collapsed: true,
         start: moment(item.optionsObject.startTime).toDate().getTime(),
         duration: moment(item.optionsObject.endTime).toDate().getTime() - moment(item.optionsObject.startTime).toDate().getTime(),
         style: {
@@ -95,8 +93,6 @@ export default {
         for (const vel in arr) {
           const ds = {
             id: arr[vel].id,
-            taskName: '',
-            label: arr[vel].desc ? arr[vel].name + '-' + arr[vel].desc : arr[vel].name,
             description: arr[vel].desc ? arr[vel].name + '-' + arr[vel].desc : arr[vel].name,
             startDate: arr[vel].dayList[0],
             endDate: arr[vel].dayList[arr[vel].dayList.length - 1],

src/views/projectManage/requirement/gannttOptions/requireGannt.js

@@ -32,18 +32,12 @@ const options = {
       {
         id: 1,
         label: '任务名称',
-        value: 'taskName',
+        value: 'label',
         width: 150,
         style: {
-          'task-list-header-label': {
-            'text-align': 'left',
-            width: '100%'
-          },
           'task-list-item-value-container': {
             'text-align': 'left',
-            'font-weight': '500',
-            width: '100%'
-
+            'font-weight': '500'
           }
         }
       },
@@ -54,12 +48,10 @@ const options = {
         width: 100,
         style: {
           'task-list-header-label': {
-            'text-align': 'center',
-            width: '100%'
+            'text-align': 'center'
           },
           'task-list-item-value-container': {
-            'text-align': 'center',
-            width: '100%'
+            'text-align': 'center'
           }
         }
       },

src/views/projectManage/requirement/requirementDetail.vue

@@ -423,7 +423,6 @@ export default {
     createdBug,
     tasksList,
     dataStatistics,
-    // scheduleList,
     bugTableDialog,
     schedule,
     download,
@@ -879,7 +878,7 @@ export default {
     }
     .demo-form-inline {
       .el-form-item {
-        width: 20%;
+        width: 33%;
         margin-right: 0;
       }
     }

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -141,28 +141,6 @@ export default {
     }
   },
   watch: {
-    templateId: {
-      handler(newV) {
-        if (newV === '新建模版') {
-          this.releaseType = true
-        } else {
-          if (newV.set_up) {
-            this.releaseType = true
-            this.settingGetReportModuleById(newV.set_up)
-          } else {
-            this.releaseType = false
-            if (newV.id) {
-              this.reportId = newV.id
-              this.reportreleaseGetReportById(newV.id)
-            } else {
-              this.tpsltId = newV
-              this.settingGetReportModuleById(newV)
-            }
-          }
-        }
-      },
-      immediate: true
-    },
     taskIds: {
       handler(newV) {
         if (newV) {
@@ -176,6 +154,29 @@ export default {
         }
       },
       immediate: true
+    },
+    templateId: {
+      handler(newV) {
+        console.log(newV, 'cdscdscsds')
+        if (newV === '新建模版') { // 新建模版
+          this.releaseType = true
+          return false
+        }
+        if (newV.set_up) { // 编辑模版
+          this.releaseType = true
+          this.settingGetReportModuleById(newV.set_up)
+          return false
+        }
+        this.releaseType = false
+        if (newV.id) { // 编辑
+          this.reportId = newV.id
+          this.reportreleaseGetReportById(newV.id)
+        } else { // 新建
+          this.tpsltId = newV
+          this.settingGetReportModuleById(newV)
+        }
+      },
+      immediate: true
     }
   },
   methods: {

src/views/reportManagement/components/ReleaseReport.vue

@@ -113,9 +113,9 @@ export default {
       dailys: this.$route.query.id
     }
   },
-  created() {
-    this.getreportTemplate()
-  },
+  // created() {
+  //   this.getreportTemplate()
+  // },
   methods: {
     async getreportTemplate() { // 获取模版list
       const res = await settingQueryReportModuleList({ bizId: this.bizJson, type: 4 })
@@ -146,6 +146,7 @@ export default {
           this.reportTamplate = false // 隐藏模版
           break
         case 3: // 发送报告
+          this.getreportTemplate()
           this.dailyId = newData.id
           this.reportHome = true // 步骤条
           this.active = 3 // 步骤条状态第三步
@@ -154,6 +155,7 @@ export default {
           this.dailyPreview = true // 展示第三部
           break
         case 7: // 新建
+          this.getreportTemplate()
           this.daily_taskIds = newData // taskList
           this.reportHome = true // 步骤条
           this.active = 1 // 步骤条状态第一步
@@ -163,6 +165,7 @@ export default {
           this.reportTamplate = false // 隐藏模版
           break
         case 8: // 新建
+          this.getreportTemplate()
           this.daily_taskIds = newData
           this.reportHome = true // 步骤条
           this.active = 1 // 步骤条状态第三步

src/views/reportManagement/testPresentation.vue

@@ -224,7 +224,6 @@ export default {
     },
 
     async getList(e) { // 报告list
-      console.log(e, 'sousuo')
       this.loading = true
       this.history = true
       const indexPage = { bizId: localStorage.getItem('bizId'), pageSize: this.pageSize, curIndex: this.curIndex }
@@ -319,7 +318,6 @@ export default {
     },
 
     clientButtom(e, data) { // 准出报告
-      console.log(data, 'scncjsncnjkn')
       this.report_data = data
       this.dialogClient = true
       this.$nextTick(() => {
@@ -328,7 +326,6 @@ export default {
     },
 
     async report_click(e, data) { // 提测报告
-      console.log(data, 'sjaicohiscnsaio')
       this.report_from.name = data.name || data.reportName
       this.report_data = data
       switch (e) {
@@ -387,9 +384,6 @@ export default {
     },
 
     async createPresentation(vel) {
-      console.log(vel, '查看报告')
-      const data = this.restaurants.filter(item => { return item.id === vel })
-      console.log(data, '查看报告2')
       if (vel !== '') {
         if (this.title === '测试日报') {
           const res = await dailyReportCheckStatus([vel])