From 75299e864884b0c166fdf5d599bf4090cd0d44ba Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Thu, 13 Oct 2022 11:55:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1=20=20?=
 =?UTF-8?q?=E8=83=BD=E5=8A=9B=E4=BD=BF=E7=94=A8=E7=BB=9F=E8=AE=A1=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=20=E4=BC=9A=E8=AE=AE=E5=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/abilityStatistics/index.vue | 239 ++++++++++--------
 1 file changed, 140 insertions(+), 99 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index e1b2f00d..9ae9cc02 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -142,7 +142,7 @@
             :cell-style="{ textAlign: 'center' }"
             border
             style="width: 100%"
-            v-show="this.departmentId === 1 || this.departmentId === 2"
+            v-show="this.departmentId === 1"
           >
             <el-table-column prop="name" label="部门名称" min-width="100%">
             </el-table-column>
@@ -169,6 +169,41 @@
             <el-table-column prop="zj" label="总计" min-width="100%">
             </el-table-column>
           </el-table>
+          <el-table
+            :data="tableData"
+            :header-cell-style="{ textAlign: 'center' }"
+            :cell-style="{ textAlign: 'center' }"
+            border
+            style="width: 100%"
+            v-show="this.departmentId === 2"
+          >
+            <el-table-column prop="name" label="部门名称" min-width="100%">
+            </el-table-column>
+            <el-table-column label="组件">
+              <el-table-column prop="znsf" label="智能算法" min-width="100%">
+              </el-table-column>
+              <el-table-column prop="tcfw" label="图层服务" min-width="100%">
+              </el-table-column>
+              <el-table-column
+                prop="kfzj"
+                label="通用开发组件"
+                min-width="100%"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="ywzj"
+                label="业务能力组件"
+                min-width="100%"
+              >
+              </el-table-column>
+            </el-table-column>
+            <el-table-column prop="yyzy" label="应用资源" min-width="100%">
+            </el-table-column>
+            <el-table-column prop="hys" label="会议室" min-width="100%" v-show='departmentId == 2'>
+            </el-table-column>
+            <el-table-column prop="zj" label="总计" min-width="100%">
+            </el-table-column>
+          </el-table>
           <!--明细表-->
 
           <el-table
@@ -244,13 +279,13 @@ import { mapState } from 'vuex'
 //   showType: { type: String, default: null },
 // })
 export default {
-  components: { componentServices, applicationResources, ComponentUsed,AbilityDetail },
+  components: { componentServices, applicationResources, ComponentUsed, AbilityDetail },
   data () {
     return {
-      detailType:'',
-      detailParamss:{},
-      isBack:true,
-      detailsVisible:false,
+      detailType: '',
+      detailParamss: {},
+      isBack: true,
+      detailsVisible: false,
       inputTxt: '',
       tableId: '',
       fatherId: '',
@@ -322,6 +357,7 @@ export default {
       homeIsShow: true,
       servicesIsShow: false,
       resourcesIsShow: false,
+      showFlag: false,
       UsedIsShow: false,
       titleList: [
         { name: '组件服务', key: 1 },
@@ -341,7 +377,7 @@ export default {
         }
       ],
       examineStatus: '-1', // 审核状态
-      status:'',
+      status: '',
       value1: [], // 起始时间
       abilityDepartment: '', // 部门
       abilityType: '', // 能力
@@ -380,8 +416,8 @@ export default {
     ...mapState(['departmentSelects'])
   },
   methods: {
-    closeModal() {
-      this.detailsVisible = false;
+    closeModal () {
+      this.detailsVisible = false
     },
     handleCurrentChange (val) {
       if (this.choseId === 0) {
@@ -421,15 +457,14 @@ export default {
 
     // 组件服务部门发布情况--改为能力上架统计
     getFirstTree (page) {
-    
-      if(this.examineStatus== '-1'  ){
-         this.status=''
-      }else if(this.examineStatus== '0'   ){
-         this.status='审核中'
-      }else if(this.examineStatus== '1'   ){
-         this.status='审核完成'
-      }else{
-        this.status=this.examineStatus
+      if (this.examineStatus == '-1') {
+        this.status = ''
+      } else if (this.examineStatus == '0') {
+        this.status = '审核中'
+      } else if (this.examineStatus == '1') {
+        this.status = '审核完成'
+      } else {
+        this.status = this.examineStatus
       }
       this.$http
         .get('/census/center/selectDeptDetailTypeCountList/', {
@@ -461,12 +496,16 @@ export default {
             if (!result[i].hasOwnProperty('ywzj')) {
               result[i].ywzj = 0
             }
+            if (!result[i].hasOwnProperty('hys')) {
+              result[i].hys = 0
+            }
             result[i].zj =
               parseInt(result[i].yyzy) +
               parseInt(result[i].kfzj) +
               parseInt(result[i].znsf) +
               parseInt(result[i].ywzj) +
-              parseInt(result[i].tcfw)
+              parseInt(result[i].tcfw) +
+              parseInt(result[i].hys)
           }
           this.tableData = res.data.data
           this.total = res.data.data.total
@@ -474,14 +513,14 @@ export default {
     },
     // 组件服务部门使用情况列表-改为能力使用统计
     getSecondTree () {
-      if(this.examineStatus== '-1'  ){
-         this.status=''
-      }else if(this.examineStatus== '0'   ){
-         this.status='审核中'
-      }else if(this.examineStatus== '1'   ){
-         this.status='审核完成'
-      }else{
-        this.status=this.examineStatus
+      if (this.examineStatus == '-1') {
+        this.status = ''
+      } else if (this.examineStatus == '0') {
+        this.status = '审核中'
+      } else if (this.examineStatus == '1') {
+        this.status = '审核完成'
+      } else {
+        this.status = this.examineStatus
       }
       this.$http
         .get('/census/center/selectApplyDeptDetailTypeCountList', {
@@ -513,76 +552,74 @@ export default {
             if (!result[i].hasOwnProperty('ywzj')) {
               result[i].ywzj = 0
             }
+            if (!result[i].hasOwnProperty('hys')) {
+              result[i].hys = 0
+            }
             result[i].zj =
               parseInt(result[i].yyzy) +
               parseInt(result[i].kfzj) +
               parseInt(result[i].znsf) +
               parseInt(result[i].ywzj) +
-              parseInt(result[i].tcfw)
+              parseInt(result[i].tcfw) +
+              parseInt(result[i].hys)
           }
           this.tableData = res.data.data
           this.total = res.data.data.total
         })
     },
-    //点击查看详情
-    detailClick(row){
-      this.detailParamss={}
-      let applyNumber=row.applyNumber
-      if (this.departmentId == 3) { //能力上架
-        this.detailType='能力上架'
-       let params = {
-         processInstanceId: applyNumber,
-       }
-        this.$http
-        .get('/act/his/getTaskHandleDetailInfo',{params})
-        .then((res) => {
-        if (res.data.code == 0) {
-        
-          if(res.data.data!=null){
-          this.detailParamss.resourceApplication=[]
-          this.detailParamss.resourceApplication=res.data.data  
-          this.detailsVisible=true     
-        } else{
-          this.$message.info('暂无详情数据！')
-        }}else {
-          this.$message.error('数据请求失败！')
+    // 点击查看详情
+    detailClick (row) {
+      this.detailParamss = {}
+      const applyNumber = row.applyNumber
+      if (this.departmentId == 3) { // 能力上架
+        this.detailType = '能力上架'
+        const params = {
+          processInstanceId: applyNumber
         }
-       
-      })
-      } else if (this.departmentId === 4) {//能力使用
-       
-      this.detailType='能力使用'
         this.$http
-        .get('/processForm/tabilityapplication/getByApplyFlag/'+applyNumber)
-        .then((res) => {
-        
-        if (res.data.code == 0) {
-          if(res.data.data!=null){
-          this.detailParamss=res.data.data     
-          this.detailsVisible=true  }
-          else{
-            this.$message.info('暂无详情数据！')
-          }
-        } else {
-          this.$message.error('数据请求失败！')
-        }
-       
-      })
+          .get('/act/his/getTaskHandleDetailInfo', { params })
+          .then((res) => {
+            if (res.data.code == 0) {
+              if (res.data.data != null) {
+                this.detailParamss.resourceApplication = []
+                this.detailParamss.resourceApplication = res.data.data
+                this.detailsVisible = true
+              } else {
+                this.$message.info('暂无详情数据！')
+              }
+            } else {
+              this.$message.error('数据请求失败！')
+            }
+          })
+      } else if (this.departmentId === 4) { // 能力使用
+        this.detailType = '能力使用'
+        this.$http
+          .get('/processForm/tabilityapplication/getByApplyFlag/' + applyNumber)
+          .then((res) => {
+            if (res.data.code == 0) {
+              if (res.data.data != null) {
+                this.detailParamss = res.data.data
+                this.detailsVisible = true
+              } else {
+                this.$message.info('暂无详情数据！')
+              }
+            } else {
+              this.$message.error('数据请求失败！')
+            }
+          })
       }
-    
-    
     },
     // 能力上架明细
     getOneDetail (page) {
       var passAndReview = '' // 转变"审核完成"字段为通过
-      if(this.examineStatus== '-1'  ){
-         this.status=''
-      }else if(this.examineStatus== '0'   ){
-         this.status='审核中'
-      }else if(this.examineStatus== '1'   ){
-         this.status='通过'
-      }else{
-        this.status=this.examineStatus
+      if (this.examineStatus == '-1') {
+        this.status = ''
+      } else if (this.examineStatus == '0') {
+        this.status = '审核中'
+      } else if (this.examineStatus == '1') {
+        this.status = '通过'
+      } else {
+        this.status = this.examineStatus
       }
       this.$http
         .get('/census/center/selectCensusResourceTable', {
@@ -605,14 +642,14 @@ export default {
     // 能力使用明细
     getTwoDetail (page) {
       var passAndReview = '' // 转变"审核完成"字段为通过
-      if(this.examineStatus== '-1'  ){
-         this.status=''
-      }else if(this.examineStatus== '0'   ){
-         this.status='审核中'
-      }else if(this.examineStatus== '1'   ){
-         this.status='通过'
-      }else{
-        this.status=this.examineStatus
+      if (this.examineStatus == '-1') {
+        this.status = ''
+      } else if (this.examineStatus == '0') {
+        this.status = '审核中'
+      } else if (this.examineStatus == '1') {
+        this.status = '通过'
+      } else {
+        this.status = this.examineStatus
       }
       this.$http
         .get('/census/center/selectCensusApplyTable', {
@@ -661,12 +698,16 @@ export default {
             if (!result[i].hasOwnProperty('ywzj')) {
               result[i].ywzj = 0
             }
+            if (!result[i].hasOwnProperty('hys')) {
+              result[i].hys = 0
+            }
             result[i].zj =
               parseInt(result[i].yyzy) +
               parseInt(result[i].kfzj) +
               parseInt(result[i].znsf) +
               parseInt(result[i].ywzj) +
-              parseInt(result[i].tcfw)
+              parseInt(result[i].tcfw) +
+              parseInt(result[i].hys)
           }
           this.tableData = res.data.data
           this.total = res.data.data.total
@@ -807,9 +848,9 @@ export default {
       if (this.value1 && this.value1.length > 0) {
         this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd HH:mm:ss')
         this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd HH:mm:ss')
-      }else{
-        this.startDate =''
-        this.endDate =''
+      } else {
+        this.startDate = ''
+        this.endDate = ''
       }
 
       if (this.abilityDepartment) {
@@ -823,10 +864,10 @@ export default {
       } else {
         this.abilityType = ''
       }
-      if (this.departmentId === 1) { 
-          this.handleChose(1)
-      } else if (this.departmentId === 2) {        
-          this.handleChose(2)
+      if (this.departmentId === 1) {
+        this.handleChose(1)
+      } else if (this.departmentId === 2) {
+        this.handleChose(2)
       } else if (this.departmentId === 3) {
         this.handleChose(3)
       } else {
@@ -835,7 +876,7 @@ export default {
     },
     // 重置按钮查询数据
     resetDataList () {
-      this.value1=[]
+      this.value1 = []
       this.startDate = ''
       this.endDate = ''
       this.examineStatus = '全部'
@@ -846,7 +887,7 @@ export default {
         //   this.handleChose(3)
         //   this.detailFlag = !this.detailFlag
         // } else {
-          this.handleChose(1)
+        this.handleChose(1)
         //   this.detailFlag = !this.detailFlag
         // }
         // this.departmentId = 1;
@@ -855,7 +896,7 @@ export default {
         //   this.handleChose(4)
         //   this.detailFlag = !this.detailFlag
         // } else {
-          this.handleChose(2)
+        this.handleChose(2)
         //   this.detailFlag = !this.detailFlag
         // }
       } else if (this.departmentId === 3) {