From 54aa64de64d4b541defb50f8bd2fbeb0446ef91a Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Thu, 13 Oct 2022 14:47:53 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/modules/abilityStatistics/index.vue | 34 ++++++++++--- front/public/static/config/basicConfig.js | 6 +-- .../components/AbilityTotal.vue | 50 ++++++++++++++++--- 3 files changed, 73 insertions(+), 17 deletions(-) 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/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/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue index 026d3919..16a8934b 100644 --- a/front/src/views/home/integrationServicesDetails.vue +++ b/front/src/views/home/integrationServicesDetails.vue @@ -92,15 +92,24 @@ >
{{ i == 0 ? '基础设施' : i == 1 ? '组件服务' : '数据资源' }}
-
- 共 {{ i == 0 ? infrastructureCount : i == 1 ? componentCount : dataSourceCount }}条数据,示例数据如下： + + 共 + {{ + i == 0 + ? infrastructureCount + : i == 1 + ? componentCount + : dataSourceCount + }}条数据,示例数据如下： +
@@ -679,7 +688,8 @@ // width: 100%; font-size: 16px; } - .data-count{} + .data-count { + } } .name-box { From 10fe94fbfada690d186d13c61695d41d7d73cfb5 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 13 Oct 2022 15:47:25 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/integrationServicesDetails.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue index 5319a75a..4343167b 100644 --- a/front/src/views/home/integrationServicesDetails.vue +++ b/front/src/views/home/integrationServicesDetails.vue @@ -292,9 +292,9 @@ return message.error(res.data.msg) } detailInfoObj.value = res.data.data || {} - dataSourceCount.value = res.data.dataSourceCount || 0 - infrastructureCount.value = res.data.infrastructureCount || 0 - componentCount.value = res.data.componentCount || 0 + 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 || [] // 融合关系 From 07a924cce48b077b16cab328be4274fbc9277cb3 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 13 Oct 2022 15:51:59 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/integrationServicesDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue index 4343167b..24efca0d 100644 --- a/front/src/views/home/integrationServicesDetails.vue +++ b/front/src/views/home/integrationServicesDetails.vue @@ -293,7 +293,7 @@ } detailInfoObj.value = res.data.data || {} dataSourceCount.value = res.data.data.dataSourceCount || 0 - infrastructureCount.value = res.data.data.infrastructureCount || 0 + infrastructureCount.value = res.data.data.infrastructureCount|| 0 componentCount.value = res.data.data.componentCount || 0 // 资源属性 let fuseAttrList = res.data.data.fuseAttrList || [] From 6d45680b9a6d67abe80278a95a708b23f0f7836c Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Thu, 13 Oct 2022 15:54:50 +0800 Subject: [PATCH 08/10] 1 --- .../modules/ability/assignedScene/add-update-scene.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 5ba410c8..9f121c0e 100644 --- a/back/src/views/modules/ability/assignedScene/add-update-scene.vue +++ b/back/src/views/modules/ability/assignedScene/add-update-scene.vue @@ -357,10 +357,10 @@ export default { update: 'put' } this.dataForm.fuseResourceList = this.getFuseResourceList() - // if (this.imageUrl == '') { - // this.$message.error('请上传图片！') - // return - // } + if (this.imageUrl == '') { + this.$message.error('请上传图片！') + return + } this.dataForm.fuseAttrList.find(v => v.attrType == '服务图片').attrValue = this.imageUrl || '' const _obj = Object.assign({}, this.dataForm, { type: '赋能场景' From f4f5292540f320b328d1e71ecb550aab36d961b8 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 13 Oct 2022 16:19:03 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/AbilityToApplyFor.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue index 9eb8fd49..0a6a6153 100644 --- a/front/src/views/home/AbilityToApplyFor.vue +++ b/front/src/views/home/AbilityToApplyFor.vue @@ -105,7 +105,7 @@ }}
-
+
From 7abf71a6fb11c2bc098c71e7adb17b32299a5b11 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Thu, 13 Oct 2022 16:31:42 +0800 Subject: [PATCH 10/10] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/infrastructurePage.vue | 101 ++++++++++++-------- 1 file changed, 63 insertions(+), 38 deletions(-) diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index ba77c2e5..3fe3880a 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -331,10 +331,7 @@ - + @@ -389,7 +386,9 @@ :wrapper-col="{ span: 14, offset: 4 }" style="text-align: center; margin-top: 0.4rem" > - 取消 + + 取消 +
-
+
@@ -635,17 +637,33 @@ style="width: 100%; height: 100%; position: relative" > -
-
+
+
{{ userInfo.usernameShow }}
-
+
{{ userInfo.realNameShow }}
-
+
{{ userInfo.usernameShow }}
-
+
{{ userInfo.realNameShow }}

@@ -899,12 +917,12 @@ tabClick(0, '视频资源') } else { // 默认选中 - if(formPage && formPage == 'noticePage') { + if (formPage && formPage == 'noticePage') { tabClick(0, '城市云脑会客厅') roomYuyue.value = false roomResult.value = true onSearch() - }else { + } else { tabClick(0, '政务云资源') } } @@ -1397,7 +1415,7 @@ tabList.value[1].title = '视频标签' } selectType.value = '视频资源' - console.log('444------------>', 444); + console.log('444------------>', 444) } else if (name == '政务云资源') { room.value = true tableHeight.value = 600 @@ -1579,8 +1597,11 @@ clickList.value[1].content = [] } clickList.value[indexFather].content[0] = name - console.log('clickList.value[indexFather].content[0]------------>', clickList.value[indexFather].content[0]); - + console.log( + 'clickList.value[indexFather].content[0]------------>', + clickList.value[indexFather].content[0] + ) + if (tabList.value[1]) { tabList.value[1].title = '' tabList.value[1].content = [] @@ -1814,22 +1835,24 @@ // 西海岸-视频资源loading const loadingCamera = ref(false) const getCamera = (flag, str) => { - loadingCamera.value = true; + loadingCamera.value = true if (flag) { mapSearchParam.value.cameraName = str } console.log('初始化调用') console.log('不选左侧树的时候不调用接口', mapSearchParam.value) if (!whoShow1.value.itShowXiHaiAn) { - getCameraByParentId(mapSearchParam.value).then((res) => { - console.log('res--查询摄像头---------->', res); - loadingCamera.value = false; - dataSource.value = res.data.data - pagination.value.total = res.data.count - }).catch(err => { - loadingCamera.value = false; - message.error(err) - }) + getCameraByParentId(mapSearchParam.value) + .then((res) => { + console.log('res--查询摄像头---------->', res) + loadingCamera.value = false + dataSource.value = res.data.data + pagination.value.total = res.data.count + }) + .catch((err) => { + loadingCamera.value = false + message.error(err) + }) } else { let params = { regionId: @@ -1866,15 +1889,17 @@ } } } - getCameraByCondition(params).then((res) => { - console.log('res--查询摄像头---------->', res); - loadingCamera.value = false; - dataSource.value = res.data.data - pagination.value.total = res.data.count - }).catch(err => { - loadingCamera.value = false; - message.error(err) - }) + getCameraByCondition(params) + .then((res) => { + console.log('res--查询摄像头---------->', res) + loadingCamera.value = false + dataSource.value = res.data.data + pagination.value.total = res.data.count + }) + .catch((err) => { + loadingCamera.value = false + message.error(err) + }) } } defineExpose({ @@ -1884,7 +1909,7 @@ const addShoppingCart = () => { if (selectedList.value.length > 0) { let _arr = [] - selectedList.value.map(v => { + selectedList.value.map((v) => { _arr.push({ delFlag: '0', resourceId: v.idtCameraChannel, @@ -1892,7 +1917,7 @@ }) }) xhaAddCart(_arr).then((res) => { - if(res.data.code !== 0) { + if (res.data.code !== 0) { return message.error(res.data.msg) } message.success('添加申购车成功！') @@ -1929,7 +1954,7 @@ }, ]) // 西海岸--状态展示 - if(isXiHaiAn) { + if (isXiHaiAn) { columns.value.splice(2, 0, { title: '状态', dataIndex: 'status',