Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/main-sidebar.vue

@@ -53,17 +53,15 @@ export default {
     getNum(){
       http.get('/act/task/myToDoTaskNum').then(({ data: res }) => {
     this.numObject=res.data
-    console.log("this.numObject========",this.numObject)
    let menuList= window.SITE_CONFIG["menuList"];
    for(var i=0;i<menuList.length;i++){
      let menu=menuList[i];
-    // menu.total=0;
       if(menu.id=='1541261628388888578'){//我的待办
         let daibanNum=0
       for(let j=0;j<menu.children.length;j++){
         let children=menu.children[j]
-        if(children.id=="1541261780432408577"){//能力申请 v3
+        if(children.id=="1541261780432408577"){//能力申请 v2
-          children.total=Number(this.numObject.abilityprocess_v3)
+          children.total=Number(this.numObject.abilityprocess_v2)
          daibanNum=Number(daibanNum)+Number(children.total)
       } if(children.id=="1559376285703081986"){//会议室审核
         children.total=Number(this.numObject.meetingroom_book)
@@ -84,7 +82,6 @@ export default {
         children.total=0
          daibanNum=Number(daibanNum)+Number(children.total)
       } 
-    
       }
       menu.total=daibanNum
     }

back/src/views/modules/ability/IntegratedServices-add.vue

@@ -55,10 +55,19 @@
             </div>
             <InfrastructureModal v-model="dataForm" :dataForm="dataForm" @update="updateDataForm" type="基础设施"
               :modalType="modalType" ref="jcssDom"></InfrastructureModal>
+              <el-form-item label="基础设施总数" >
+           <el-input   v-model="dataForm.infrastructureCount"  onkeyup="value=value.replace(/[^\d]/g,0)" placeholder="请输入基础设施总数"></el-input>
+              </el-form-item>
             <combine-ability v-model="dataForm" :dataForm="dataForm" @update="updateDataForm" type="数据资源" ref="sjzyDom"
               :getDataParams="getListParams['数据资源']"></combine-ability>
+              <el-form-item label="数据资源总数" >
+           <el-input v-model="dataForm.dataSourceCount"  onkeyup="value=value.replace(/[^\d]/g,0)" placeholder="请输入数据资源总数"></el-input>
+              </el-form-item>
             <combine-ability v-model="dataForm" :dataForm="dataForm" @update="updateDataForm" type="组件服务" ref="zjfwDom"
               :getDataParams="getListParams['组件服务']"></combine-ability>
+              <el-form-item label="组件服务总数" >
+           <el-input v-model="dataForm.componentCount"  placeholder="请输入组件服务总数"></el-input>
+              </el-form-item>
           </div>
         </el-form>
       </div>
@@ -96,6 +105,9 @@ export default {
     return {
       fileUploadUrl: window.SITE_CONFIG.apiURL + '/upload',
       dataForm: {
+        "infrastructureCount":null,
+        "dataSourceCount":null,
+        "componentCount":null,
         "name": "",
         "applicationArea": "",
         "description": "",