diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js index 9608ff60..8f8c94c0 100644 --- a/back/public/config/basicConfig.js +++ b/back/public/config/basicConfig.js @@ -2,16 +2,16 @@ * @Author: hisense.wuhongjian * @Date: 2022-08-25 14:37:49 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-10-12 15:25:01 + * @LastEditTime: 2022-10-13 14:49:32 * @Description: 告诉大家这是什么 */ var _global = {} var CONFIGITEM = { // version: 'qingdao', // 青岛 // version: 'xihaian', // 西海岸 - // version: 'test', // 测试 + version: 'test', // 测试 // version: 'frp', // 内网穿透 - version: 'xihaian', // 开发 + // version: 'xihaian', // 开发 vNum: 'v0.8.7.2', configData: { // 青岛市大数据局 diff --git a/back/src/views/modules/ability/assignedScene/add-update-scene.vue b/back/src/views/modules/ability/assignedScene/add-update-scene.vue index b518967d..e72d2b21 100644 --- a/back/src/views/modules/ability/assignedScene/add-update-scene.vue +++ b/back/src/views/modules/ability/assignedScene/add-update-scene.vue @@ -67,10 +67,19 @@ + + + + + + + + + @@ -195,6 +204,9 @@ export default { painKeyTextObj: getDescJson('痛点'), solutionKeyTextObj: getDescJson('方案'), dataForm: { + infrastructureCount:null, + dataSourceCount:null, + componentCount:null, name: '', applicationArea: '', description: '', diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index 9ae9cc02..e95ec4b3 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -25,6 +25,7 @@ + 日期： + 审核状态： + 部门名称： + 类型： 能力上架统计 @@ -119,7 +123,7 @@ ? 'departmentStyle' : '' ]" - @click="handleChose(2)" + @click="handleChose(4)" > 能力使用统计 @@ -144,7 +148,7 @@ style="width: 100%" v-show="this.departmentId === 1" > - + @@ -177,7 +181,7 @@ style="width: 100%" v-show="this.departmentId === 2" > - + @@ -211,11 +215,15 @@ style="width: 100%" v-show="this.departmentId === 3 || this.departmentId === 4" > - + + + + + @@ -390,7 +398,7 @@ export default { { name: '页面开发组件', value: 4 }, { name: '应用资源', value: 5 } ], // 类型备选列表 - detailFlag: true, // 明细返回按钮显示标志位 + detailFlag: false, // 明细返回按钮显示标志位 startDate: '', // 开始时间 endDate: '' // 结束时间 } @@ -410,7 +418,15 @@ export default { // this.value1.unshift(date2) }, mounted () { - this.getFirstTree() + // this.getFirstTree() + if (this.departmentId === 1) { + this.handleChose(3) + // this.departmentId = 1; + } else if (this.departmentId === 2) { + this.handleChose(4) + // this.departmentId = 2; + } else { + } }, computed: { ...mapState(['departmentSelects']) @@ -786,12 +802,14 @@ export default { // this.getUsedTree() } } else if (index === 3) { + this.detailFlag = false if (this.choseId === 0) { this.getOneDetail() } else { // this.getUsedTree() } } else if (index === 4) { + this.detailFlag = false if (this.choseId === 0) { this.getTwoDetail() } else { @@ -879,7 +897,7 @@ export default { this.value1 = [] this.startDate = '' this.endDate = '' - this.examineStatus = '全部' + this.examineStatus = '' this.abilityDepartment = '' this.abilityType = '' if (this.departmentId === 1) { diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index 6d37819d..4e0eaedd 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -2,16 +2,16 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-10-12 15:29:29 + * @LastEditTime: 2022-10-13 13:50:44 * @Description: 系统静态参数配置 */ var _global = {} var CONFIGITEM = { // version: 'qingdao', //青岛 // version: 'xihaian', // 西海岸 - version: 'dev', // 开发 + // version: 'dev', // 开发 // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加) - //version: 'test', // 测试 + version: 'test', // 测试 //version: 'frp', // 内网穿透 vNum: 'v0.8.7.2', configData: { diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index a75068ec..bbd6e6cc 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-08-29 09:55:56 + * @LastEditTime: 2022-10-13 15:29:31 * @Description: 数据资源参数配置 */ // eslint-disable-next-line no-undef @@ -51,10 +51,10 @@ if (newLocation !== 'baotou' && newLocation !== 'xihaian') { right: '海信网络科技股份有限公司', }, address: [ - { - name: '鲁IC备00000000号', - value: '政府标识码3702000106', - }, + // { + // name: '鲁IC备00000000号', + // value: '政府标识码3702000106', + // }, { name: '版权所有：青岛市大数据发展管理局', value: '地址：山东省青岛市香港中路17号市级机关办公楼', @@ -523,6 +523,11 @@ else if (newLocation === 'xihaian') { }, ], } - xhaHasPermissionUser.list = ['xihaian01', 'xihaian02', 'xihaian03', 'xihaian04', 'admin'] - + xhaHasPermissionUser.list = [ + 'xihaian01', + 'xihaian02', + 'xihaian03', + 'xihaian04', + 'admin', + ] } diff --git a/front/src/views/abilityStatistics/components/AbilityTotal.vue b/front/src/views/abilityStatistics/components/AbilityTotal.vue index 2632bb9d..9c26c740 100644 --- a/front/src/views/abilityStatistics/components/AbilityTotal.vue +++ b/front/src/views/abilityStatistics/components/AbilityTotal.vue @@ -15,11 +15,26 @@ >
{{ item.type }}
- {{ item.amount }} + + + + {{ item.amount }} + + + + {{ item.amount }} + {{ item.organization }}
-
@@ -27,21 +42,25 @@ diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue index fb72c949..92a04545 100644 --- a/front/src/views/home/integrationServices.vue +++ b/front/src/views/home/integrationServices.vue @@ -5,8 +5,13 @@
全部： -
+
{{ item.name === '赋能场景' ? '典型赋能场景' : '打包模式' }} @@ -15,26 +20,55 @@
模糊搜索 - +
- - + + -
+
@@ -43,357 +77,382 @@ diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue index 836ed89c..af1ad0d3 100644 --- a/front/src/views/home/integrationServicesDetails.vue +++ b/front/src/views/home/integrationServicesDetails.vue @@ -96,6 +96,21 @@ > {{ i == 0 ? '基础设施' : i == 1 ? '组件服务' : '数据资源' }}
+
+ + 共 + {{ + i == 0 + ? infrastructureCount + : i == 1 + ? componentCount + : dataSourceCount + }}条数据，示例数据如下： + +
@@ -171,6 +186,9 @@ const solution = ref([]) const step = ref([]) const bgImg = ref('') + const dataSourceCount = ref(0) + const infrastructureCount = ref(0) + const componentCount = ref(0) const id = router.currentRoute.value.query.id document.documentElement.style.transition = 'all 0.3s ease' document.documentElement.scrollTop = 0 @@ -283,6 +301,9 @@ return message.error(res.data.msg) } detailInfoObj.value = res.data.data || {} + dataSourceCount.value = res.data.data.dataSourceCount || 0 + infrastructureCount.value = res.data.data.infrastructureCount|| 0 + componentCount.value = res.data.data.componentCount || 0 // 资源属性 let fuseAttrList = res.data.data.fuseAttrList || [] // 融合关系 @@ -667,6 +688,8 @@ // width: 100%; font-size: 16px; } + .data-count { + } } .name-box {