From 428af8b74f7b654966f5e4d8d24f95030e933421 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Fri, 29 Jul 2022 09:08:06 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/public/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/back/public/index.html b/back/public/index.html index c8f9e70b..5ba2148d 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-11 10:11:40 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-07-26 20:23:13 + * @LastEditTime: 2022-07-28 20:14:40 * @Description: 告诉大家这是什么 --> @@ -45,9 +45,9 @@ // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.166:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://10.16.5.35:8888/renren-admin'; - window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin'; + // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin'; window.SITE_CONFIG['previewUrl'] = 'http://localhost:8080/'; - // window.SITE_CONFIG['apiURL'] = 'http://15.2.23.141:8000/renren-admin'; + window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; // WebSocket地址 window.SITE_CONFIG['socketURL'] ='ws://localhost:8080/renren-admin/websocket'; From 42bad9af8e964d1ddbbbfff8f754acd42837793d Mon Sep 17 00:00:00 2001 From: guoyue Date: Fri, 29 Jul 2022 09:27:04 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E8=B5=8B=E8=83=BD=E5=9C=BA=E6=99=AF=20?= =?UTF-8?q?=20=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/infrastructure-modal.vue | 13 ++++++++++++- .../components/infrastructure-tree.vue | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue b/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue index 0d05d598..6c78daa0 100644 --- a/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue +++ b/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue @@ -40,6 +40,9 @@ 搜索 + + 重置 + @@ -252,6 +255,8 @@ export default { } else { this.checkList.push(item.labelCode) } + console.log('this.checkList------------>', this.checkList); + this.getData() }, // 获取列表 getData(parentId = '') { @@ -265,7 +270,7 @@ export default { gpsX: '', gpsY: '', radius: '', - labelCodes: '', + labelCodes: this.checkList.join(), } return new Promise((resolve, reject) => { this.$http.get('/api/project/selectByParentIdNew', { params: postData }).then(res => { @@ -283,6 +288,7 @@ export default { }, changeParentId(parentId) { + console.log('parentId------------>', parentId); this.getData(parentId) }, confirmSubmitHandle() { @@ -312,6 +318,11 @@ export default { this.transferData = []; this.$emit('closeModal'); }, + clear() { + this.cameraName = '' + this.selectedArray = []; + this.getData() + }, } } diff --git a/back/src/views/modules/ability/assignedScene/components/infrastructure-tree.vue b/back/src/views/modules/ability/assignedScene/components/infrastructure-tree.vue index 8b977a47..a4ccdd1b 100644 --- a/back/src/views/modules/ability/assignedScene/components/infrastructure-tree.vue +++ b/back/src/views/modules/ability/assignedScene/components/infrastructure-tree.vue @@ -96,7 +96,7 @@ export default { }) }, onSelect(item, val, child) { - // mybus.emit('getListByParentId', val.id) + this.$emit('changeParentId', val.id) this.getCameraAllOrgan({ parentId: val.id }).then((res) => { if (res.data.code !== 1) { return this.$message.error(res.msg); From cfa9de0b328c4c46cff4674dff87ac2c37cb105b Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Fri, 29 Jul 2022 11:02:16 +0800 Subject: [PATCH 03/16] =?UTF-8?q?747=E3=80=81749?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Algorithm/AlgorithmApplicationScenarios.vue | 5 +---- .../Application/ApplicationFunctionIntorduction.vue | 9 +++------ ...ApplicationOwningDepartmentAndServiceProvider.vue | 12 +++++++++++- .../Business/BusinessApplicationScenarios.vue | 5 +---- .../Business/BusinessFunctionIntorduction.vue | 5 +---- .../components/Business/BusinessUsageMode.vue | 7 +++---- .../Developer/DeveloperApplicationScenarios.vue | 5 +---- .../Developer/DeveloperFunctionIntorduction.vue | 5 +---- .../DeveloperOwningDepartmentAndServiceProvider.vue | 2 +- .../LayerServiceApplicationScenarios.vue | 5 +---- .../LayerService/LayerServiceUsageMode.vue | 4 ++-- 11 files changed, 26 insertions(+), 38 deletions(-) diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue index 530234ad..bbc1600b 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue @@ -47,10 +47,7 @@
{{ itemSonTitle.name }}
- - -
{{ itemSonTitle.desc }}
- +
{{ itemSonTitle.desc }}
diff --git a/front/src/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue b/front/src/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue index 5ea3c2f8..6542e3f3 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationFunctionIntorduction.vue @@ -47,10 +47,7 @@
{{ itemSonTitle.name }}
- - -
{{ itemSonTitle.desc }}
- +
{{ itemSonTitle.desc }}
@@ -153,10 +150,10 @@ .tab-top { min-width: 1.2rem; font-size: 0.24rem; - line-height: 0.24rem; + line-height: 0.26rem; margin-bottom: 0.2rem; max-width: 2rem; - height: 0.24rem; + height: 0.26rem; display: -webkit-box; overflow: hidden; -webkit-line-clamp: 1; diff --git a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue index fde98caf..89c7fdc8 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue @@ -16,7 +16,7 @@
{{ item.childrenTitle }}
-
+
{{ carditem.attrType }}： @@ -220,11 +220,21 @@ div { max-width: 2.8rem; + display: flex; // overflow: hidden; // text-overflow: ellipsis; // display: -webkit-box; // -webkit-box-orient: vertical; // -webkit-line-clamp: 1; + span:last-child { + display: block; + width: 2.3rem; + overflow: hidden; + text-overflow: ellipsis; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + word-break: break-all; + } } } diff --git a/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue b/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue index 99b15adf..2a213429 100644 --- a/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue +++ b/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue @@ -47,10 +47,7 @@
{{ itemSonTitle.name }}
- - -
{{ itemSonTitle.desc }}
- +
{{ itemSonTitle.desc }}
diff --git a/front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue b/front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue index 3446025f..ddd8070a 100644 --- a/front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue +++ b/front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue @@ -47,10 +47,7 @@
- - -
{{ itemSonTitle.desc }}
- +
{{ itemSonTitle.desc }}
diff --git a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue index 76db9cfe..4d6af1ae 100644 --- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue +++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue @@ -322,7 +322,7 @@ .content-right-left { border-right: 0.01rem solid #707fe0; padding-right: 0.1rem; - margin-right: 0.1rem; + margin-right: 0.3rem; } .content-right-title { @@ -344,12 +344,11 @@ word-break: break-all; p { - // width: 1.60rem; + min-width: 2.2rem; height: 0.2rem; display: -webkit-box; - // overflow: hidden; + overflow: hidden; margin-bottom: 0.08rem; - white-space: nowrap; -webkit-line-clamp: 1; -webkit-box-orient: vertical; margin-right: 0.15rem; diff --git a/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue b/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue index 99b15adf..2a213429 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue @@ -47,10 +47,7 @@
{{ itemSonTitle.name }}
- - -
{{ itemSonTitle.desc }}
- +
{{ itemSonTitle.desc }}
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperFunctionIntorduction.vue b/front/src/views/detailsAll/components/Developer/DeveloperFunctionIntorduction.vue index ff5f8297..a203a5ec 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperFunctionIntorduction.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperFunctionIntorduction.vue @@ -47,10 +47,7 @@
{{ itemSonTitle.name }}
- - -
{{ itemSonTitle.desc }}
- +
{{ itemSonTitle.desc }}
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue index a8132abe..400d6595 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue @@ -265,7 +265,7 @@ // -webkit-line-clamp: 1; & > span:last-child { display: inline-block; - width: 1.49rem; + width: 2rem; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue index 99b15adf..2a213429 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue @@ -47,10 +47,7 @@
{{ itemSonTitle.name }}
- - -
{{ itemSonTitle.desc }}
- +
{{ itemSonTitle.desc }}
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue index 59c5ffc3..2a69ed53 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue @@ -345,8 +345,8 @@ word-break: break-all; p { - // width: 1.60rem; - height: 0.2rem; + width: 2.6rem; + // height: 0.2rem; margin-right: 0.15rem; overflow: hidden; text-overflow: ellipsis; From 16a624b1366423ae5d7b964f1c5167a8ba2aa332 Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Fri, 29 Jul 2022 11:43:24 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E3=80=81=E5=8A=9F=E8=83=BD=E4=BB=8B=E7=BB=8Dtab=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Algorithm/AlgorithmApplicationScenarios.vue | 4 ++-- .../components/Algorithm/AlgorithmTopDetails.vue | 2 +- .../components/Algorithm/AlgorithmUsageMode.vue | 8 ++++---- .../components/Business/BusinessApplicationScenarios.vue | 4 ++-- .../components/Business/BusinessFunctionIntorduction.vue | 4 ++-- .../Developer/DeveloperApplicationScenarios.vue | 4 ++-- .../Developer/DeveloperFunctionIntorduction.vue | 4 ++-- .../LayerService/LayerServiceApplicationScenarios.vue | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue index bbc1600b..a9cd566a 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue @@ -167,10 +167,10 @@ .tab-top { min-width: 120px; font-size: 24px; - line-height: 24px; + line-height: 26px; margin-bottom: 20px; max-width: 200px; - height: 24px; + height: 26px; display: -webkit-box; overflow: hidden; -webkit-line-clamp: 1; diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue index 588af45f..08f5195f 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue @@ -258,7 +258,7 @@ // white-space: nowrap; font-size: 40px; margin-right: 20px; - max-width: 7rem; + max-width: 6rem; text-overflow: -o-ellipsis-lastline; overflow: hidden; text-overflow: ellipsis; diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue index 36dfbb5c..fa5082d1 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue @@ -402,7 +402,7 @@ .content-right-left { border-right: 0.01rem solid #707fe0; padding-right: 0.1rem; - margin-right: 0.1rem; + margin-right: 0.2rem; } .content-right-title { @@ -424,12 +424,12 @@ flex-direction: column; p { - // width: 1.60rem; + width: 2.3rem; height: 0.2rem; display: -webkit-box; - // overflow: hidden; + overflow: hidden; margin-bottom: 0.08rem; - white-space: nowrap; + // white-space: nowrap; -webkit-line-clamp: 1; word-break: break-all; -webkit-box-orient: vertical; diff --git a/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue b/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue index 2a213429..4790ca75 100644 --- a/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue +++ b/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue @@ -167,10 +167,10 @@ .tab-top { min-width: 120px; font-size: 24px; - line-height: 24px; + line-height: 26px; margin-bottom: 20px; max-width: 200px; - height: 24px; + height: 26px; display: -webkit-box; overflow: hidden; -webkit-line-clamp: 1; diff --git a/front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue b/front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue index ddd8070a..3195b456 100644 --- a/front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue +++ b/front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue @@ -147,10 +147,10 @@ .tab-top { min-width: 1.2rem; font-size: 0.24rem; - line-height: 0.24rem; + line-height: 0.26rem; margin-bottom: 0.2rem; max-width: 2rem; - height: 0.24rem; + height: 0.26rem; display: -webkit-box; overflow: hidden; -webkit-line-clamp: 1; diff --git a/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue b/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue index 2a213429..4790ca75 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue @@ -167,10 +167,10 @@ .tab-top { min-width: 120px; font-size: 24px; - line-height: 24px; + line-height: 26px; margin-bottom: 20px; max-width: 200px; - height: 24px; + height: 26px; display: -webkit-box; overflow: hidden; -webkit-line-clamp: 1; diff --git a/front/src/views/detailsAll/components/Developer/DeveloperFunctionIntorduction.vue b/front/src/views/detailsAll/components/Developer/DeveloperFunctionIntorduction.vue index a203a5ec..24064c7b 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperFunctionIntorduction.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperFunctionIntorduction.vue @@ -146,11 +146,11 @@ .tab-top { min-width: 1.2rem; font-size: 0.24rem; - line-height: 0.24rem; + line-height: 0.26rem; margin-bottom: 0.2rem; text-align: center; max-width: 2rem; - height: 0.24rem; + height: 0.26rem; display: -webkit-box; overflow: hidden; -webkit-line-clamp: 1; diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue index 2a213429..4790ca75 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue @@ -167,10 +167,10 @@ .tab-top { min-width: 120px; font-size: 24px; - line-height: 24px; + line-height: 26px; margin-bottom: 20px; max-width: 200px; - height: 24px; + height: 26px; display: -webkit-box; overflow: hidden; -webkit-line-clamp: 1; From d8cbe92fb63a8cebc835cb9533b58dcfbb671307 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Fri, 29 Jul 2022 14:14:30 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E8=83=BD=E5=8A=9B=E9=A3=8E=E9=99=A9=E5=92=8C=E8=83=BD?= =?UTF-8?q?=E5=8A=9B=E4=BA=91=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workBench/components/risk-view.vue | 133 +++++++++++++++--- front/src/api/capabilityCloud.js | 4 +- .../components/ComponentServices.vue | 18 +-- 3 files changed, 124 insertions(+), 31 deletions(-) diff --git a/back/src/views/modules/workBench/components/risk-view.vue b/back/src/views/modules/workBench/components/risk-view.vue index 33fb27ad..f7f884d3 100644 --- a/back/src/views/modules/workBench/components/risk-view.vue +++ b/back/src/views/modules/workBench/components/risk-view.vue @@ -1,32 +1,129 @@ \ No newline at end of file + diff --git a/front/src/api/capabilityCloud.js b/front/src/api/capabilityCloud.js index d6e2e151..011517fe 100644 --- a/front/src/api/capabilityCloud.js +++ b/front/src/api/capabilityCloud.js @@ -97,7 +97,7 @@ export function callTheTrendPort(start, end, params) { export function totalCallsSnum(params) { return request({ url: - `metrics/api/v1/query?query=sum(increase(apigateway_http_status))&time=${params}`, + `/metrics/api/v1/query?time=${params}&query=sum(apigateway_http_status)`, method: 'get', }) } @@ -105,7 +105,7 @@ export function totalCallsSnum(params) { export function totalCallsSnum2(params) { return request({ url: - `metrics/api/v1/query?query=sum(increase(apigateway_http_status{code=~"^2.."}))&time=${params}`, + `metrics/api/v1/query?query=sum(apigateway_http_status{code=~"^2.."})&time=${params}`, method: 'get', }) } diff --git a/front/src/views/capabilityCloud/components/ComponentServices.vue b/front/src/views/capabilityCloud/components/ComponentServices.vue index b3359fd0..fc2dbd45 100644 --- a/front/src/views/capabilityCloud/components/ComponentServices.vue +++ b/front/src/views/capabilityCloud/components/ComponentServices.vue @@ -408,18 +408,14 @@ //总调用次数接口 const TotalCallsAPI = () => { const end = Date.parse(new Date()) / 1000 - if (!xinhaianIsShow) { - totalCallsSnum(end).then((res) => { - snum.value[1].num = res.data.data.result[0].value[1] - totalCallsSnum2(end).then((resSon) => { - snum.value[2].num = - ((snum.value[1].num - resSon.data.data.result[0].value[1]) / - snum.value[1].num) * - 100 + - '%' - }) + totalCallsSnum(end).then((res) => { + debugger + snum.value[1].num = res.data.data.result[0].value[1] + totalCallsSnum2(end).then((resSon) => { + snum.value[2].num = + (resSon.data.data.result[0].value[1] / snum.value[1].num) * 100 + '%' }) - } + }) } const init = () => { timeSwitch(timeSwitchindex.value) From 4d31d111ac3f951b08d2e6b63e162afefdf62719 Mon Sep 17 00:00:00 2001 From: lizhicheng2 Date: Fri, 29 Jul 2022 14:20:40 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E8=B5=8B=E8=83=BD=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Application/ApplicationTopDetails.vue | 16 +-- .../views/home/integrationServicesDetails.vue | 116 ++++++++++-------- 2 files changed, 75 insertions(+), 57 deletions(-) diff --git a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue index d2216eec..93f8ca1f 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue @@ -44,14 +44,6 @@
- - - 申请使用 - - - - 加入购物车 - 申请使用 + + + 申请使用 + + + + 加入购物车 + {{ props.dataList.isCollect == 'true' ? '已' : '' }}收藏 diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue index ca2033eb..971bc3e6 100644 --- a/front/src/views/home/integrationServicesDetails.vue +++ b/front/src/views/home/integrationServicesDetails.vue @@ -56,22 +56,43 @@
- +
-
-
-
{{ item.title }}
-
-
- {{ name }} -
+
@@ -82,7 +103,7 @@
-
+
@@ -135,7 +156,7 @@ }, { name: '使用能力', - key: 'integration-combination-ability', + key: 'integration-ability', }, { name: '构建步骤', @@ -234,14 +255,25 @@ attrType: '应用领域', attrValue: fuseAttrList.find((v) => v.attrType === '应用领域').attrValue, } - combineList.value.map((item) => { - let arr = ( - fuseResourceList.filter( - (v) => v.resource && v.resource.type == item.title - ) || [] - ).map((d) => d.resource.name) + combineList.value.forEach((item) => { + let arr = [] + let resource=fuseResourceList.filter((v)=>v.resource && v.type == item.title) + if(resource.length>0){ + if(item.title==='基础设施'){ + arr=resource.map(res=>({ + id: res.resource.idtCameraChannel, name: res.resource.channelName, dept: res.resource.nodeName, platform: 'UCS' + })) + }else if(item.title==='组件服务'){ + arr=resource.map(res=>({ + id: res.resource.id, name: res.resource.name, dept: res.resource.deptName, platform: 'UCS' + })) + }else if(item.title==='数据资源'){ + arr=resource.map(res=>({ + id: res.resource.zycode, name: res.resource.zyname, dept: res.resource.TGBM, platform: 'UCS' + })) + } + } item.list = arr - return item }) detailInfoObj.value.infoList = [] detailInfoObj.value.infoList.push(questionObj) @@ -254,6 +286,10 @@ } getIntegrationServicesDeatil(id) + function openResourceDetail(row, column, event){ + console.log(row) + } + function handleOpenUrl(type) { let obj = (detailInfoObj.value.fuseAttrList || []).find( @@ -459,10 +495,12 @@ .step { padding: 0.8rem 0; background: rgb(247, 248, 250); - + .step-content { + margin-top: 0.3rem; + } } - .combination-ability { + .ability { padding: 0.8rem 0; background: rgb(247, 248, 250); @@ -471,34 +509,14 @@ } .combine-content { - width: 13rem; - margin: 0 auto; - } - - .combine-item { - margin: 0 0.1rem; - width: 4.28rem; - display: flex; - flex-direction: column; - align-items: center; - border: 1px solid #e4e6f5; - border-radius: 0.1rem; - padding: 0.1rem 0; - cursor: pointer; - height: 2.5rem; - - &:hover { - border-radius: 0.02rem; - border: 0.01rem solid #0058e1; - box-shadow: 0rem 0.08rem 0.2rem rgb(0 88 225 / 30%); - } - + margin-top: 0.3rem; + align-items: flex-start; .title { - color: #212121; - text-align: center; - padding: 0.2rem 0; - font-size: 0.22rem; - text-align: center; + height: 2rem; + width: 2rem; + margin-right: 0.5rem; + background: url('~@/assets/home/rhfw_square.png') no-repeat; + background-size: 100%; } } From 3609c2ba20dca480145437696074e38d7ba0dc0c Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Fri, 29 Jul 2022 14:49:44 +0800 Subject: [PATCH 07/16] bug751 --- .../components/PurchaseVehicle.vue | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue index 2e2814df..99b76346 100644 --- a/front/src/views/personalCenter/components/PurchaseVehicle.vue +++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue @@ -21,6 +21,7 @@ />
批量删除 + + 批量删除 + Date: Fri, 29 Jul 2022 14:54:31 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E6=9D=A5=E6=BA=90=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=85=B1=E4=BA=AB=E9=97=A8=E6=88=B7=E9=A2=9C=E8=89=B2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/abilityStatistics/components/ResourceAggregation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue index 837b6885..230b5b5e 100644 --- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue +++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue @@ -237,7 +237,7 @@ type: 'pie', selectedMode: 'single', radius: ['50%', '30%'], - color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#fe8455'], + color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#FAC858'], top: '0', label: { normal: { From c8a8a58705731ea56eb0c59abec1e2e9bda805c5 Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Fri, 29 Jul 2022 15:27:24 +0800 Subject: [PATCH 09/16] 747\739\748 Bug --- .../myAgent/demo/ResourcesAndServices.vue | 71 ++++++++++++++++--- .../Application/ApplicationTopDetails.vue | 8 ++- .../Business/BusinessTopDetails.vue | 2 +- .../Developer/DeveloperTopDetails.vue | 2 +- .../LayerService/LayerServiceTopDetails.vue | 2 +- 5 files changed, 72 insertions(+), 13 deletions(-) diff --git a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue index 75305f2e..c12c04d2 100644 --- a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue +++ b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue @@ -40,29 +40,48 @@ v-for="multipleAdditionsItem in itemsonson.note1" :key="multipleAdditionsItem" > -
+ +
{{ + multipleAdditionsItem.question || + multipleAdditionsItem.type || + multipleAdditionsItem.name + }}
+
{{ multipleAdditionsItem.question || multipleAdditionsItem.type || multipleAdditionsItem.name }}
-
+ + +
{{ + multipleAdditionsItem.answer || + multipleAdditionsItem.price || + multipleAdditionsItem.img + }}
+
{{ multipleAdditionsItem.answer || multipleAdditionsItem.price || multipleAdditionsItem.img }}
-
{{ multipleAdditionsItem.desc }}
+ + +
{{ multipleAdditionsItem.desc }}
+
{{ multipleAdditionsItem.desc }}
+
+ +
{{ itemsonson.note1 }}
+
{{ itemDataFormValue.name }}
-
{{ itemDataFormValue.desc }}
+ +
{{ itemDataFormValue.desc }}
+
{{ itemDataFormValue.desc }}
+
@@ -115,7 +137,10 @@ style="border: 1px solid #3c9bcd;margin" >
{{ itemDataFormValue.name }}
-
{{ itemDataFormValue.desc }}
+ +
{{ itemDataFormValue.desc }}
+
{{ itemDataFormValue.desc }}
+
浏览
@@ -137,7 +162,10 @@ style="border: 1px solid #3c9bcd;margin" >
{{ itemDataFormValue.name }}
-
{{ itemDataFormValue.desc }}
+ +
{{ itemDataFormValue.desc }}
+
{{ itemDataFormValue.desc }}
+
浏览
@@ -432,6 +460,11 @@ export default { } } + \ No newline at end of file diff --git a/front/src/views/home/packagingDetails.vue b/front/src/views/home/packagingDetails.vue index da672d45..14a6cf19 100644 --- a/front/src/views/home/packagingDetails.vue +++ b/front/src/views/home/packagingDetails.vue @@ -2,7 +2,58 @@
-
+
+
打包模式
+
+
+
+ 基本信息 +
+
+
+
+
名称：{{ detailInfoObj.name || '--' }}
+
+
应用领域：
+
+ {{ detailInfoObj.applicationArea }} +
+
+
+ +
描述：{{ detailInfoObj.description + + '哈啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊哈啊啊啊啊啊啊啊啊啊啊啊啊' + || '--' + }}
+
+
+ + + 申请使用 + + + + 收藏 + +
+
+
+
+ +
+
+
+ 服务使用能力列表 +
+
+ +
+
+
@@ -11,143 +62,169 @@ import HomeFooter from '@/views/newHome/components/Footer' import mybus from '@/myplugins/mybus' import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue' - import { getIntegrationServicesList } from '@/api/home.js' import { useRouter } from 'vue-router' import HomeHeader from '@/views/home/components/header' import searchResultList from '@/views/home/components/searchResultList.vue' +import packageAbilityList from '@/views/home/components/packageAbilityList.vue' import { message } from 'ant-design-vue' +import { getIntegrationDetail } from '@/api/home' + + +const router = useRouter() +const id = router.currentRoute.value.query.id + +const detailInfoObj = ref({}) +const abilityList = ref([ + { + name: '数据资源', + // bgImg: require('../../assets/home/integration/jcssDetail.png'), + list: [] + }, + { + name: '组件服务', + list: [] + }, + { + name: '基础设施', + list: [] + }, +]) + +// 融合服务--详情 +const getIntegrationServicesDeatil = (id) => { + getIntegrationDetail(id).then( + (res) => { + if (res.data.code !== 0) { + return message.error(res.data.msg) + } + detailInfoObj.value = res.data.data || {} + console.log('detailInfoObj------------>', detailInfoObj); + + let fuseResourceList = detailInfoObj.value.fuseResourceList || [] + abilityList.value.map(v => { + let list = fuseResourceList.filter(x => x.type == v.name) || []; + v.list = list.map(v => v.resource && v.resource.channelName) + }) + console.log('abilityList.value------------>', abilityList.value); + }, + (err) => { + message.error(err) + } + ) +} +getIntegrationServicesDeatil(id) From 7b04a81d62bcebeac194d925ad9cf7195d5df004 Mon Sep 17 00:00:00 2001 From: guoyue Date: Fri, 29 Jul 2022 15:58:27 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E8=B5=8B=E8=83=BD=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E5=A4=B4=E9=83=A8?= 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, 2 insertions(+) diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue index 971bc3e6..73c3f3cb 100644 --- a/front/src/views/home/integrationServicesDetails.vue +++ b/front/src/views/home/integrationServicesDetails.vue @@ -1,6 +1,7 @@ + + + \ No newline at end of file From b79f0674bfb97e42a611f74e6d71f978543a61f5 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Sat, 30 Jul 2022 17:13:56 +0800 Subject: [PATCH 15/16] =?UTF-8?q?bug764=E9=97=B2=E6=83=85=E4=B9=9F?= =?UTF-8?q?=E8=A1=8C=E8=B7=9D=E5=92=8Cbug759=E5=A4=B4=E9=83=A8=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E5=B0=8F=E6=89=8B=E5=92=8C=E8=87=AA=E6=B5=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../abilityStatistics/components/SharingSituation.vue | 4 ++-- .../components/Algorithm/AlgorithmCommonProblem.vue | 4 +++- .../Application/ApplicationCommonProblem.vue | 4 +++- .../components/Business/BusinessCommonProblem.vue | 4 +++- .../components/Developer/DeveloperCommonProblem.vue | 4 +++- .../LayerService/LayerServiceCommonProblem.vue | 4 +++- front/src/views/home/components/header.vue | 10 ++++++++-- front/src/views/newHome/components/WorkDynamics.vue | 4 ++-- 8 files changed, 27 insertions(+), 11 deletions(-) diff --git a/front/src/views/abilityStatistics/components/SharingSituation.vue b/front/src/views/abilityStatistics/components/SharingSituation.vue index 88b0eddc..c49277ad 100644 --- a/front/src/views/abilityStatistics/components/SharingSituation.vue +++ b/front/src/views/abilityStatistics/components/SharingSituation.vue @@ -85,7 +85,7 @@ import * as moment from 'moment' import * as echarts from 'echarts' import { applyAmount, trafficStatistics } from '@/api/abilityStatistics' - const quarter = ref(['近七天', '近14天', '月度']) + const quarter = ref(['近七天', '近十四天', '月度']) let startDate = ref('') let endDate = ref('') @@ -128,7 +128,7 @@ hebdomad() swtichname.value = '日' break - case '近14天': + case '近十四天': fortnight() swtichname.value = '14日' break diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmCommonProblem.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmCommonProblem.vue index 967a2296..c05adf26 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmCommonProblem.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmCommonProblem.vue @@ -85,7 +85,9 @@ display: flex; align-items: center; margin-bottom: 20px; - line-height: 20px; + div:last-child { + line-height: 34px; + } } .content-bottom { display: flex; diff --git a/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue b/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue index c4168a11..17d7a7c9 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationCommonProblem.vue @@ -89,7 +89,9 @@ display: flex; align-items: center; margin-bottom: 20px; - line-height: 20px; + div:last-child { + line-height: 34px; + } } .content-bottom { diff --git a/front/src/views/detailsAll/components/Business/BusinessCommonProblem.vue b/front/src/views/detailsAll/components/Business/BusinessCommonProblem.vue index 0345e0cd..583a7525 100644 --- a/front/src/views/detailsAll/components/Business/BusinessCommonProblem.vue +++ b/front/src/views/detailsAll/components/Business/BusinessCommonProblem.vue @@ -85,7 +85,9 @@ display: flex; align-items: center; margin-bottom: 0.2rem; - line-height: 0.2rem; + div:last-child { + line-height: 0.34rem; + } } .content-bottom { display: flex; diff --git a/front/src/views/detailsAll/components/Developer/DeveloperCommonProblem.vue b/front/src/views/detailsAll/components/Developer/DeveloperCommonProblem.vue index 967a2296..c05adf26 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperCommonProblem.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperCommonProblem.vue @@ -85,7 +85,9 @@ display: flex; align-items: center; margin-bottom: 20px; - line-height: 20px; + div:last-child { + line-height: 34px; + } } .content-bottom { display: flex; diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceCommonProblem.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceCommonProblem.vue index 0345e0cd..ba57667e 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceCommonProblem.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceCommonProblem.vue @@ -85,7 +85,9 @@ display: flex; align-items: center; margin-bottom: 0.2rem; - line-height: 0.2rem; + div:last-child { + line-height: 34px; + } } .content-bottom { display: flex; diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue index faadcd15..a67954ed 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -151,8 +151,8 @@ // eslint-disable-next-line no-undef const navList = ref(navListManagement.navList) - console.log('navList------------>', navList); - + console.log('navList------------>', navList) + const props = defineProps({ showView: { type: String, default: '' }, }) @@ -422,6 +422,9 @@ padding: 0 0.04rem 0 0.1rem; border-left: 0.01rem solid #666; } + .icon { + cursor: pointer; + } } } .white { @@ -430,6 +433,9 @@ .name { color: #0058e1; } + .icon { + cursor: pointer; + } .nav { color: #000; } diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue index 3169b131..bd99da15 100644 --- a/front/src/views/newHome/components/WorkDynamics.vue +++ b/front/src/views/newHome/components/WorkDynamics.vue @@ -384,7 +384,6 @@ height: 2.2rem; padding-top: 0.49rem; } - background: #f3f5f9; border: #eaedf2 0.01rem solid; } @@ -516,7 +515,8 @@ .content > div { height: 4.8rem; width: 3.1rem; - margin-right: 0.2rem; + margin-right: 0.1rem; + background: #f3f5f9; } .fixedmount { From 53f0b38c5a82d40a233022464aa0dc391fc8bf80 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Sat, 30 Jul 2022 17:55:40 +0800 Subject: [PATCH 16/16] =?UTF-8?q?bug774=E6=90=9C=E7=B4=A2=E6=A1=86?= =?UTF-8?q?=E9=81=AE=E6=8C=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/videoSurveillance/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue index 32097d52..333b6258 100644 --- a/front/src/views/home/videoSurveillance/index.vue +++ b/front/src/views/home/videoSurveillance/index.vue @@ -521,7 +521,7 @@ #contain { .searchPoint { position: absolute; - z-index: 1000; + z-index: 800; top: 0.1rem; right: 0.1rem; border-radius: 4px;