diff --git a/package.json b/package.json index 870bc9a..6aa2e83 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202410171335", + "version": "1.0.202410171437", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/views/dataCloudMap/components/headquarterEnterprise.vue b/src/views/dataCloudMap/components/headquarterEnterprise.vue index eccf33b..79d513e 100644 --- a/src/views/dataCloudMap/components/headquarterEnterprise.vue +++ b/src/views/dataCloudMap/components/headquarterEnterprise.vue @@ -39,7 +39,7 @@ - 全部({{ countData.count1 + countData.count2 + countData.count3 }}) + 总部({{ countData.count1 + countData.count2 + countData.count3 }}) 省级总部({{ countData.count1 }}) 市级总部({{ countData.count2 }}) 区级总部({{ countData.count3 }}) diff --git a/src/views/onlineDeclaration/templateDetail/index.vue b/src/views/onlineDeclaration/templateDetail/index.vue index 135e730..05ec11f 100644 --- a/src/views/onlineDeclaration/templateDetail/index.vue +++ b/src/views/onlineDeclaration/templateDetail/index.vue @@ -168,7 +168,7 @@ - +

【上传材料】

@@ -209,6 +209,7 @@ export default { info:{}, templateJson:{}, specialType:false, + isMaterials:false, }; }, async mounted(){ @@ -224,7 +225,16 @@ export default { // console.log(res); this.info = res.data this.templateJson = res.data.templateJson ? JSON.parse(res.data.templateJson) : {}; - console.log(this.templateJson); + // console.log(this.templateJson); + // let arr = [] + // this.templateJson.map(item=>{ + // if(item.action) { + // arr.push(item) + // } + // }) + // if(arr.length > 0) { + // this.isMaterials = true; + // } }) }, methods: {