Compare commits

..

No commits in common. "dbfdfd62850d0eed094edbfde403564345f804ec" and "bff7f514676f052b16a21d2539ab82bec4ff6a45" have entirely different histories.

2 changed files with 6 additions and 15 deletions

View File

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

View File

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