Просмотр исходного кода

部门数据:另起接口获取

洪海涛 4 лет назад
Родитель
Сommit
07fe24b042

+ 11 - 1
src/api/qualityMonthlyReport/edit.js

@@ -1,6 +1,6 @@
 // 质量月报
 import request from '@/utils/request'
-import { projectManagementUrl } from '@/apiConfig/api'
+import { projectManagementUrl, ldapServer } from '@/apiConfig/api'
 
 // 获取月报
 export function getMonthlyReport(reportId) {
@@ -80,6 +80,16 @@ export function getReportDependence(params) {
   })
 }
 
+// 获取部门数据 v2
+// /api/department/getDeptArch
+export function getDeptArch() {
+  return request({
+    url: ldapServer + '/api/department/getDeptArch?deptId=100001',
+    method: 'get',
+    timeout: '100000'
+  })
+}
+
 // 月报发送确认
 export function sendConfirm(data) {
   return request({

+ 10 - 4
src/store/modules/monthlyReport/edit/index.js

@@ -5,7 +5,8 @@ import {
   delMonthlyReport,
   getAllSubReportCatalog,
   getSubReport,
-  getReportDependence,
+  // getReportDependence,
+  getDeptArch,
   sendConfirm,
   returnReport,
   sendSubConfirm,
@@ -93,7 +94,7 @@ export default {
       // state.subTitle = state.pageDate.reportName
       const subReports = [...params.subReports]
       // 设置部门数据
-      state.selectEnum = [...params.dependence.deptArch.children]
+      // state.selectEnum = [...params.dependence.deptArch.children]
       setDeptArch(state.selectEnum)
       // 设置端数据
       if (params.dependence.clientType) {
@@ -652,6 +653,11 @@ export default {
           commit('SET_SELECT_ENUM', res.data.dependence.deptArch.children)
           commit('SET_PAGE_DATA', res.data)
         }
+        console.log(res);
+        if (params.catalogTitle.search(/服务端详情|客户端详情/) > -1 && pageType === 'readAll') {
+          res.data.splice(0,0,{depth: 1, fromUser: false, hiddenAncestor: null, isVisible: true, subTitles: null, title: "整体概览", type: "Head1", content: []})
+          console.log(params)
+        }
         commit('SET_TAB_PAGE_DATA', {
           data:
             pageType === 'readAll' ? res.data : res.data.reportCatalog.children,
@@ -715,11 +721,11 @@ export default {
     },
     // 获取部门数据
     async setSelectEnum({ commit }, reportId) {
-      const res = await getReportDependence({
+      const res = await getDeptArch({
         reportId
       })
       if (res.code === 200) {
-        commit('SET_SELECT_ENUM', res.data.deptArch.children)
+        commit('SET_SELECT_ENUM', res.data.children)
       }
     },
     // 删除月报

+ 1 - 1
src/views/monthlyReport/childrenPage/editReport/components/OverallOverviewOfTheClient/onlineQuestion.vue

@@ -161,7 +161,7 @@ export default {
   .detail-wrapper {
     width: 50%;
     padding: 10px;
-    height: 200px;
+    height: 220px;
     overflow-y: scroll;
   }
 }

+ 1 - 1
src/views/monthlyReport/childrenPage/editReport/components/OverallOverviewOfTheServer.vue

@@ -15,7 +15,7 @@
         </td>
         <td colspan="3" class="color_1">线上质量</td>
         <td colspan="5" class="color_2">发布</td>
-        <td colspan="6" class="color_3">线下质量及研究效率</td>
+        <td colspan="8" class="color_3">线下质量及研究效率</td>
       </tr>
       <tr>
         <td class="col color_1_sub">P5+</td>

+ 11 - 9
src/views/monthlyReport/childrenPage/editReport/index.vue

@@ -204,6 +204,8 @@ export default {
     this.indexShow = true
     // 默认获取用户权限
     this.$store.dispatch('monthlyReportEdit/getUserPermission')
+    // 获取部门数据
+    this.$store.dispatch('monthlyReportEdit/setSelectEnum')
   },
   mounted() {
     this.$store.commit('monthlyReportEdit/INIT_STATE_DATA')
@@ -220,15 +222,15 @@ export default {
       )
     }
     // 获取部门数据;只有查看但业务线时,才需要单独获取部门数据
-    if (
-      this.$route.query.pageType === 'readAll' &&
-      this.$route.query.reportId
-    ) {
-      this.$store.dispatch(
-        'monthlyReportEdit/setSelectEnum',
-        this.$route.query.reportId
-      )
-    }
+    // if (
+    //   this.$route.query.pageType === 'readAll' &&
+    //   this.$route.query.reportId
+    // ) {
+    //   this.$store.dispatch(
+    //     'monthlyReportEdit/setSelectEnum',
+    //     this.$route.query.reportId
+    //   )
+    // }
     // 查看
     if (this.$route.query.pageType === 'readAll') {
       this.$store.commit('monthlyReportEdit/SET_SUB_TITLE', '查看完整月报')