From 42bad9af8e964d1ddbbbfff8f754acd42837793d Mon Sep 17 00:00:00 2001 From: guoyue Date: Fri, 29 Jul 2022 09:27:04 +0800 Subject: [PATCH 01/34] =?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 02/34] =?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 03/34] =?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 04/34] =?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 05/34] =?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 06/34] 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 07/34] =?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 08/34] 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 10/34] =?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 14/34] =?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 15/34] =?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; From 328ab1102e078cc3efb8581a73b2673a5692bb15 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Mon, 1 Aug 2022 09:21:57 +0800 Subject: [PATCH 16/34] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E6=BC=94?= =?UTF-8?q?=E7=A4=BA=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/public/index.html | 4 +- front/public/index.html | 23 +- front/public/static/config/location.js | 345 +++++++++++++++++- .../components/ResourceAggregation.vue | 3 + .../components/Infrastructure.vue | 9 +- front/src/views/home/AbilityToApplyFor.vue | 2 +- front/src/views/home/DetailsPageconetent.vue | 4 +- front/src/views/home/apply.vue | 210 ++++++----- front/src/views/home/infrastructurePage.vue | 211 ++++++++++- .../components/CapabilityConvergence.vue | 10 + .../views/newHome/components/Navigation2.vue | 3 + 11 files changed, 704 insertions(+), 120 deletions(-) diff --git a/back/public/index.html b/back/public/index.html index c8f9e70b..5105ee33 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -1,8 +1,8 @@ diff --git a/front/public/index.html b/front/public/index.html index 20fff5c7..09778cff 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -1,8 +1,8 @@ @@ -48,22 +48,23 @@ // window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin'; // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // 西海岸版本 - window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797'; - window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/'; - window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/'; - window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; + // window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797'; + // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/'; + // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/'; + // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; // 开发 // window.SITE_CONFIG['backUrl'] = 'http://localhost:8001'; // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/'; // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/'; // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin'; // window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin'; - window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; - // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; - // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/'; - // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/'; - // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin'; // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; + window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; + window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/'; + window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/'; + // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin'; + window.SITE_CONFIG['apiURL'] = 'http://192.168.124.5:8888/renren-admin'; + window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // 穿透版本 // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/'; diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index 15f4921f..802db4a8 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -1,11 +1,11 @@ /* * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 - * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-07-28 14:32:04 + * @LastEditors: hisense.liangjunhua + * @LastEditTime: 2022-07-30 17:43:50 * @Description: 数据资源参数配置 */ -//const newLocation = 'qingdao' +// const newLocation = 'qingdao' // const newLocation = 'baotou' const newLocation = 'xihaian' @@ -14,6 +14,8 @@ const whoShow = {} const launchedDataNumObject = {} // 导航数据 const navListManagement = {} +// 无人机单兵数据 +const uavAndIndividualSoldier = {} // 基础设施 const infrastructure = {} // 区市站点数据 @@ -149,6 +151,341 @@ else if (newLocation === 'baotou') { // xihaian else if (newLocation === 'xihaian') { whoShow.itShowXiHaiAn = true + infrastructure.deptName = '西海岸新区大数据发展' + // infrastructure.deptId = '1067246875800000066' + uavAndIndividualSoldier.num = 4 + uavAndIndividualSoldier.uavList = [ + { + name: '经纬 M300 RTK-1', + url: '', + details: [ + { + name: '飞行器', + attribute: { + 尺寸: '尺寸（展开，不包含桨叶）：810×670×430 mm（长×宽×高）；尺寸（折叠，包含桨叶）：430×420×430 mm（长×宽×高）', + 对称电机轴距: '895 mm', + '重量（含下置单云台支架）:空机重量（不含电池）': + '3.6 kg；空机重量（含双电池）：6.3 kg', + 单云台减震球最大负重: '930g', + 最大起飞重量: '9 kg', + 工作频率: '2.4000-2.4835 GHz；5.725-5.850 GHz', + '发射功率（EIRP）': + '2.4000-2.4835 GHz：29.5 dBm（FCC）、18.5dBm（CE）、18.5 dBm（SRRC）、18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）、12.5dBm（CE）、28.5 dBm（SRRC）', + '悬停精度（P-GPS）': + '垂直：±0.1 m（视觉定位正常工作时）、±0.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）；水平：±0.3 m（视觉定位正常工作时）、±1.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）', + 'RTK 位置精度': + '在 RTK FIX 时：1 cm+1 ppm（水平）、1.5 cm + 1 ppm（垂直）', + 最大旋转角速度: '俯仰轴：300°/s、航向轴：100°/s', + 最大俯仰角度: '30° （P模式且前视视觉系统启用：25°）', + 最大上升速度: 'S 模式：6 m/s、P 模式：5 m/s', + '最大下降速度（垂直）': 'S 模式：5 m/s、P 模式：4 m/s', + 最大倾斜下降速度: 'S 模式：7 m/s', + 最大水平飞行速度: 'S 模式：23 m/s、P 模式：17 m/s', + 最大飞行海拔高度: + '5000 m（2110 桨叶，起飞重量≤7 kg）/ 7000 m（2195 高原静音桨叶，起飞重量≤7 kg）', + 最大可承受风速: '15m/s（起飞及降落阶段为12m/s）', + 最大飞行时间: '55 min', + '适配 DJI 云台': + '禅思 XT2、禅思 XT S、禅思 Z30、禅思 H20、禅思 H20T、DJI P1、DJI L1', + 支持云台安装方式: + '下置单云台、上置单云台、下置双云台、下置单云台+上置单云台、下置双云台+上置单云台', + 'IP 防护等级': 'IP45', + GNSS: 'GPS+GLONASS+BeiDou+Galileo', + 工作环境温度: '-20°C 至 50°C', + }, + }, + { + name: '遥控器', + attribute: { + 工作频率: '2.4000-2.4835 GHz、5.725-5.850 GHz', + '最大信号有效距离（无干扰、无遮挡）': + 'NCC/FCC：15 km、CE/MIC：8 km、SRRC：8 km', + '等效全向辐射功率（EIRP）': + '2.4000-2.4835 GHz：29.5 dBm（FCC）；18.5dBm（CE）、18.5 dBm（SRRC）；18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）；12.5dBm（CE）、20.5 dBm（SRRC）', + 外置电池: + '名称：WB37 智能电池；容量：4920 mAh；电压：7.6 V；电池类型：LiPo；能量：37.39 Wh；充电时间（使用 BS60 智能电池箱）：70 分钟（15°C 至 45°C）；130 分钟（0°C 至 15°C）', + 内置电池: + '类型：18650 锂离子电池 （5000 mAh @ 7.2 V）；充电方式：使用规格为 12V/2A 的 USB 充电器；额定功率：17 W；充电时间：2 小时 15 分钟（使用规格为12V/2A 的 USB 充电器）', + 续航时间: '内置电池：约 2.5 小时内置电池+外置电池：约 4.5 小时', + 'USB-A 接口供电电压/电流': '5 V / 1.5 A', + 工作环境温度: '-20° 至 40° C', + }, + }, + { + name: '视觉系统', + attribute: { + 障碍物感知范围: '前后左右：0.7-40 m、上下：0.6-30 m', + FOV: '前后下：65°（H），50°（V）、左右上：75°（H），60°（V）', + 使用环境: + '表面有丰富纹理，光照条件充足（>15 lux，室内日光灯正常照射环境）', + }, + }, + { + name: '红外感知系统', + attribute: { + 障碍物感知范围: '0.1-8 m', + FOV: '30°（±15°）', + 使用环境: '漫反射，大尺寸，高反射率（反射率>10%）障碍物', + }, + }, + { + name: '上下补光灯', + attribute: { + 有效照明距离: '5 m', + }, + }, + { + name: 'FPV摄像头', + attribute: { + 分辨率: '960p', + FOV: '145°', + 帧率: '30 fps', + }, + }, + { + name: '智能飞行电池', + attribute: { + 型号: 'TB60', + 容量: '5935 mAh', + 电压: '52.8 V', + 电池类型: 'LiPo 12S', + 能量: '274 Wh', + 电池整体重量: '约 1.35 kg', + 工作环境温度: '-20℃ 至 50℃', + 理想存放环境温度: '22℃ 至 30℃', + 充电环境温度: + '-20°C 至 40°C（当环境温度低于 5°C时，电池会启动自加热功能，在低温环境下充电有可能会降低电池使用寿命）', + 充电时间: + '使用 BS60 智能电池箱时，使用 220 V 电源：完全充满两块 TB60 智能飞行电池约需 60 分钟，从 20% 充到 90% 约需 30 分钟；使用 110 V 电源：完全充满两块 TB60 智能飞行电池约需 70 分钟，从 20% 充到 90% 约需 40 分钟', + }, + }, + { + name: 'BS60智能电池箱', + attribute: { + 外形尺寸: '501×403×252 mm', + 空箱重量: '8.37 kg', + 可放置物品: 'TB60 智能飞行电池 8 块、WB37 智能电池 4 块', + 输入电压: '100-120 VAC，50-60 Hz / 220-240 VAC，50-60 Hz', + 最大输入功率: '1070 W', + 输出功率: '100-120 V：750 W、220-240 V：992 W', + 工作环境温度: '-20℃ 至 40℃', + }, + }, + ], + }, + { + name: '经纬 M300 RTK-2', + url: '', + details: [ + { + name: '飞行器', + attribute: { + 尺寸: '尺寸（展开，不包含桨叶）：810×670×430 mm（长×宽×高）；尺寸（折叠，包含桨叶）：430×420×430 mm（长×宽×高）', + 对称电机轴距: '895 mm', + '重量（含下置单云台支架）:空机重量（不含电池）': + '3.6 kg；空机重量（含双电池）：6.3 kg', + 单云台减震球最大负重: '930g', + 最大起飞重量: '9 kg', + 工作频率: '2.4000-2.4835 GHz；5.725-5.850 GHz', + '发射功率（EIRP）': + '2.4000-2.4835 GHz：29.5 dBm（FCC）、18.5dBm（CE）、18.5 dBm（SRRC）、18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）、12.5dBm（CE）、28.5 dBm（SRRC）', + '悬停精度（P-GPS）': + '垂直：±0.1 m（视觉定位正常工作时）、±0.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）；水平：±0.3 m（视觉定位正常工作时）、±1.5 m（GPS 正常工作时）、±0.1 m（RTK 定位正常工作时）', + 'RTK 位置精度': + '在 RTK FIX 时：1 cm+1 ppm（水平）、1.5 cm + 1 ppm（垂直）', + 最大旋转角速度: '俯仰轴：300°/s、航向轴：100°/s', + 最大俯仰角度: '30° （P模式且前视视觉系统启用：25°）', + 最大上升速度: 'S 模式：6 m/s、P 模式：5 m/s', + '最大下降速度（垂直）': 'S 模式：5 m/s、P 模式：4 m/s', + 最大倾斜下降速度: 'S 模式：7 m/s', + 最大水平飞行速度: 'S 模式：23 m/s、P 模式：17 m/s', + 最大飞行海拔高度: + '5000 m（2110 桨叶，起飞重量≤7 kg）/ 7000 m（2195 高原静音桨叶，起飞重量≤7 kg）', + 最大可承受风速: '15m/s（起飞及降落阶段为12m/s）', + 最大飞行时间: '55 min', + '适配 DJI 云台': + '禅思 XT2、禅思 XT S、禅思 Z30、禅思 H20、禅思 H20T、DJI P1、DJI L1', + 支持云台安装方式: + '下置单云台、上置单云台、下置双云台、下置单云台+上置单云台、下置双云台+上置单云台', + 'IP 防护等级': 'IP45', + GNSS: 'GPS+GLONASS+BeiDou+Galileo', + 工作环境温度: '-20°C 至 50°C', + }, + }, + { + name: '遥控器', + attribute: { + 工作频率: '2.4000-2.4835 GHz、5.725-5.850 GHz', + '最大信号有效距离（无干扰、无遮挡）': + 'NCC/FCC：15 km、CE/MIC：8 km、SRRC：8 km', + '等效全向辐射功率（EIRP）': + '2.4000-2.4835 GHz：29.5 dBm（FCC）；18.5dBm（CE）、18.5 dBm（SRRC）；18.5dBm（MIC）；5.725-5.850 GHz：28.5 dBm（FCC）；12.5dBm（CE）、20.5 dBm（SRRC）', + 外置电池: + '名称：WB37 智能电池；容量：4920 mAh；电压：7.6 V；电池类型：LiPo；能量：37.39 Wh；充电时间（使用 BS60 智能电池箱）：70 分钟（15°C 至 45°C）；130 分钟（0°C 至 15°C）', + 内置电池: + '类型：18650 锂离子电池 （5000 mAh @ 7.2 V）；充电方式：使用规格为 12V/2A 的 USB 充电器；额定功率：17 W；充电时间：2 小时 15 分钟（使用规格为12V/2A 的 USB 充电器）', + 续航时间: '内置电池：约 2.5 小时内置电池+外置电池：约 4.5 小时', + 'USB-A 接口供电电压/电流': '5 V / 1.5 A', + 工作环境温度: '-20° 至 40° C', + }, + }, + { + name: '视觉系统', + attribute: { + 障碍物感知范围: '前后左右：0.7-40 m、上下：0.6-30 m', + FOV: '前后下：65°（H），50°（V）、左右上：75°（H），60°（V）', + 使用环境: + '表面有丰富纹理，光照条件充足（>15 lux，室内日光灯正常照射环境）', + }, + }, + { + name: '红外感知系统', + attribute: { + 障碍物感知范围: '0.1-8 m', + FOV: '30°（±15°）', + 使用环境: '漫反射，大尺寸，高反射率（反射率>10%）障碍物', + }, + }, + { + name: '上下补光灯', + attribute: { + 有效照明距离: '5 m', + }, + }, + { + name: 'FPV摄像头', + attribute: { + 分辨率: '960p', + FOV: '145°', + 帧率: '30 fps', + }, + }, + { + name: '智能飞行电池', + attribute: { + 型号: 'TB60', + 容量: '5935 mAh', + 电压: '52.8 V', + 电池类型: 'LiPo 12S', + 能量: '274 Wh', + 电池整体重量: '约 1.35 kg', + 工作环境温度: '-20℃ 至 50℃', + 理想存放环境温度: '22℃ 至 30℃', + 充电环境温度: + '-20°C 至 40°C（当环境温度低于 5°C时，电池会启动自加热功能，在低温环境下充电有可能会降低电池使用寿命）', + 充电时间: + '使用 BS60 智能电池箱时，使用 220 V 电源：完全充满两块 TB60 智能飞行电池约需 60 分钟，从 20% 充到 90% 约需 30 分钟；使用 110 V 电源：完全充满两块 TB60 智能飞行电池约需 70 分钟，从 20% 充到 90% 约需 40 分钟', + }, + }, + { + name: 'BS60智能电池箱', + attribute: { + 外形尺寸: '501×403×252 mm', + 空箱重量: '8.37 kg', + 可放置物品: 'TB60 智能飞行电池 8 块、WB37 智能电池 4 块', + 输入电压: '100-120 VAC，50-60 Hz / 220-240 VAC，50-60 Hz', + 最大输入功率: '1070 W', + 输出功率: '100-120 V：750 W、220-240 V：992 W', + 工作环境温度: '-20℃ 至 40℃', + }, + }, + ], + }, + ] + uavAndIndividualSoldier.individualSoldier = [ + { + name: 'T950天通-1', + type: '单兵设备', + details: { + 基本信息: { + 外观设计: '172X81X15.7(不含天线)，336g', + 操作系统: 'Android P', + CPU: '展锐 Makalu T7510;虎贲T710+春藤IVY510', + 存储: '标配:6GB ROM +128G RAM', + 显示屏: '6.52吋水滴屏;HD+，1600*720(20:9)', + 后置摄像头: + '后置为4800万主摄+200万微距+200万红外三摄组合，支持闪光灯', + 前置摄像头: '1600万', + 传感器相关: + '指纹|光线传感器|距离传感器|加速度传感器|地磁传感器|陀螺仪|气压传感器', + WLAN: '802.11a/b/g/n/AC 支持MIMO', + 电池: '6000mAh@3.8V，内置不可拆卸，支持18W快充', + 工作时间: '待机时长180h，卫星通话时长16h', + }, + 制式频段: { + 卫星频段: '天通一号卫星', + 频段: '2G:GSM 850/900/1800/1900;3G:WCDMA850/900/1900/2100;4G:TD-LTE B38/39/40/41;4G:FDD-LTE B1/3/5/7/8;5G: N1，N28，N41, N78，N79', + 双卡: '双nano卡(卫星卡+运营商全网通卡)', + CA: 'B1+B3 下行 2CA(电信);B40/41带内上下行 2CA', + VOLTE: '支持', + }, + IO接口: { + USB接口类型: 'TYPE-C USB3.0，支持OTG功能', + 耳机接口: '3.5mm，美标', + 存储卡: '支持TF卡扩展', + }, + 其它功能: { + 蓝牙: 'V5.0', + 定位: 'GPS、北斗混合定位、单北斗模式', + NFC: '支持', + 充电方式: '三种充电方式(线充、座充、磁吸充电)', + 按键: '开机键、音量+/-、 SOS(侧面)、PTT按键', + }, + 环境适应性: { + 工作温度: '-20°~ 60°', + 存储温度: '-40°~ 80°', + 高温高湿: '(95±3)%(≧40°)，24小时', + 防护等级: 'IP68', + }, + }, + }, + { + name: 'T950天通-2', + type: '单兵设备', + details: { + 基本信息: { + 外观设计: '172X81X15.7(不含天线)，336g', + 操作系统: 'Android P', + CPU: '展锐 Makalu T7510;虎贲T710+春藤IVY510', + 存储: '标配:6GB ROM +128G RAM', + 显示屏: '6.52吋水滴屏;HD+，1600*720(20:9)', + 后置摄像头: + '后置为4800万主摄+200万微距+200万红外三摄组合，支持闪光灯', + 前置摄像头: '1600万', + 传感器相关: + '指纹|光线传感器|距离传感器|加速度传感器|地磁传感器|陀螺仪|气压传感器', + WLAN: '802.11a/b/g/n/AC 支持MIMO', + 电池: '6000mAh@3.8V，内置不可拆卸，支持18W快充', + 工作时间: '待机时长180h，卫星通话时长16h', + }, + 制式频段: { + 卫星频段: '天通一号卫星', + 频段: '2G:GSM 850/900/1800/1900;3G:WCDMA850/900/1900/2100;4G:TD-LTE B38/39/40/41;4G:FDD-LTE B1/3/5/7/8;5G: N1，N28，N41, N78，N79', + 双卡: '双nano卡(卫星卡+运营商全网通卡)', + CA: 'B1+B3 下行 2CA(电信);B40/41带内上下行 2CA', + VOLTE: '支持', + }, + IO接口: { + USB接口类型: 'TYPE-C USB3.0，支持OTG功能', + 耳机接口: '3.5mm，美标', + 存储卡: '支持TF卡扩展', + }, + 其它功能: { + 蓝牙: 'V5.0', + 定位: 'GPS、北斗混合定位、单北斗模式', + NFC: '支持', + 充电方式: '三种充电方式(线充、座充、磁吸充电)', + 按键: '开机键、音量+/-、 SOS(侧面)、PTT按键', + }, + 环境适应性: { + 工作温度: '-20°~ 60°', + 存储温度: '-40°~ 80°', + 高温高湿: '(95±3)%(≧40°)，24小时', + 防护等级: 'IP68', + }, + }, + }, + ] navListManagement.navList = [ { name: '共享门户', key: 'home' }, { name: '能力集市', key: 'DetailsPageconetent' }, @@ -164,7 +501,7 @@ else if (newLocation === 'xihaian') { footerDataList.footerList = { company: { left: '青岛西海岸新区大数据发展促进局建设', - right: 'v0.8.1.5', + right: 'v0.8.3.3', }, address: [ { diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue index 837b6885..17451ecf 100644 --- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue +++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue @@ -122,6 +122,9 @@ }) break case '基础设施': + if (uavAndIndividualSoldier.num) { + val.count = val.count - 0 + uavAndIndividualSoldier.num + } dataList.value.dataList.push({ organization: '个', type: '基础设施', diff --git a/front/src/views/capabilityCloud/components/Infrastructure.vue b/front/src/views/capabilityCloud/components/Infrastructure.vue index 52c472ee..9967bf58 100644 --- a/front/src/views/capabilityCloud/components/Infrastructure.vue +++ b/front/src/views/capabilityCloud/components/Infrastructure.vue @@ -1,8 +1,8 @@ diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue index 9e3833ac..fc55d089 100644 --- a/back/src/views/modules/ability/bsabilityai.vue +++ b/back/src/views/modules/ability/bsabilityai.vue @@ -755,6 +755,9 @@ export default { if (!this.submitFrom.deptContacts) { this.notFilled.push('部门联系人') } + if (!this.submitFrom.deptId) { + this.notFilled.push('归属部门') + } if (!this.submitFrom.deptPhone) { this.notFilled.push('部门联系人电话') } diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue index 84874bc2..56412788 100644 --- a/back/src/views/modules/ability/bsabilityservice.vue +++ b/back/src/views/modules/ability/bsabilityservice.vue @@ -680,6 +680,9 @@ export default { if (!this.submitFrom.shareCondition) { this.notFilled.push('共享条件') } + if (!this.submitFrom.deptId) { + this.notFilled.push('归属部门') + } if (!this.submitFrom.deptContacts) { this.notFilled.push('部门联系人') } diff --git a/front/public/index.html b/front/public/index.html index 09778cff..946baa4a 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-03-29 16:45:25 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-30 19:11:54 + * @LastEditTime: 2022-08-01 11:15:53 * @Description: 告诉大家这是什么 --> @@ -59,12 +59,11 @@ // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin'; // window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin'; // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; - window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; - window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/'; - window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/'; - // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin'; - window.SITE_CONFIG['apiURL'] = 'http://192.168.124.5:8888/renren-admin'; - window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; + window.SITE_CONFIG['backUrl'] = 'http://192.168.124.236:9797'; + window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/'; + window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/'; + window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin'; + window.SITE_CONFIG['POI_URL'] = 'http://192.168.124.236:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // 穿透版本 // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/'; From 2bf1249913c446006b94f4c0a4eba176bc8632ac Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Mon, 1 Aug 2022 14:42:08 +0800 Subject: [PATCH 21/34] =?UTF-8?q?=E7=AE=97=E6=B3=95=E4=BB=93=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/public/index.html | 8 ++++---- back/src/views/modules/algorithm/task-monitoring.vue | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/back/public/index.html b/back/public/index.html index 8d895721..22701d35 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -1,8 +1,8 @@ @@ -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://192.168.124.236:8888/renren-admin'; window.SITE_CONFIG['previewUrl'] = 'http://localhost:8080/'; - window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/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'; diff --git a/back/src/views/modules/algorithm/task-monitoring.vue b/back/src/views/modules/algorithm/task-monitoring.vue index ca81ea61..0f3f95ac 100644 --- a/back/src/views/modules/algorithm/task-monitoring.vue +++ b/back/src/views/modules/algorithm/task-monitoring.vue @@ -13,6 +13,7 @@ 查询 重置 + 任务新增 @@ -129,7 +130,9 @@ export default { return '未知状态' }, - + addTask () { + window.open('http://10.132.191.54:10219/skyline/auth/third/client/view') + }, // 重置 resetTableData () { this.queryData.keyworld = '' From 52c1850cfbecd99a53a456459c15cc28bbe70a1e Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Mon, 1 Aug 2022 14:53:03 +0800 Subject: [PATCH 22/34] =?UTF-8?q?=E5=BD=92=E5=B1=9E=E9=83=A8=E9=97=A8?= =?UTF-8?q?=EF=BC=8C=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/capacityOnTheShelf/Algorithm.vue | 3 +++ front/src/views/capacityOnTheShelf/Application.vue | 3 +++ front/src/views/capacityOnTheShelf/BusinessComponent.vue | 3 +++ front/src/views/capacityOnTheShelf/DevelopmentComponents.vue | 3 +++ front/src/views/capacityOnTheShelf/LayerServices.vue | 3 +++ 5 files changed, 15 insertions(+) diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue index 893d73dd..baba1447 100644 --- a/front/src/views/capacityOnTheShelf/Algorithm.vue +++ b/front/src/views/capacityOnTheShelf/Algorithm.vue @@ -429,6 +429,9 @@ if (!dataFrom.value.shareCondition) { notFilled.value.push('共享条件') } + if (!dataFrom.value.deptId) { + notFilled.value.push('归属部门') + } if (!dataFrom.value.deptContacts) { notFilled.value.push('部门联系人') } diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue index 5edbd35a..67dafac2 100644 --- a/front/src/views/capacityOnTheShelf/Application.vue +++ b/front/src/views/capacityOnTheShelf/Application.vue @@ -323,6 +323,9 @@ if (!dataFrom.value.description) { notFilled.value.push('应用描述') } + if (!dataFrom.value.deptId) { + notFilled.value.push('归属部门') + } if (!dataFrom.value.deptContacts) { notFilled.value.push('部门联系人') } diff --git a/front/src/views/capacityOnTheShelf/BusinessComponent.vue b/front/src/views/capacityOnTheShelf/BusinessComponent.vue index 45cd0117..374976b5 100644 --- a/front/src/views/capacityOnTheShelf/BusinessComponent.vue +++ b/front/src/views/capacityOnTheShelf/BusinessComponent.vue @@ -399,6 +399,9 @@ if (!dataFrom.value.shareCondition) { notFilled.value.push('共享条件') } + if (!dataFrom.value.deptId) { + notFilled.value.push('归属部门') + } if (!dataFrom.value.deptContacts) { notFilled.value.push('部门联系人') } diff --git a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue index c4faeb25..26c764ee 100644 --- a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue +++ b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue @@ -398,6 +398,9 @@ if (!dataFrom.value.shareCondition) { notFilled.value.push('共享条件') } + if (!dataFrom.value.deptId) { + notFilled.value.push('归属部门') + } if (!dataFrom.value.deptContacts) { notFilled.value.push('部门联系人') } diff --git a/front/src/views/capacityOnTheShelf/LayerServices.vue b/front/src/views/capacityOnTheShelf/LayerServices.vue index 9aef15d7..9f5e0b9a 100644 --- a/front/src/views/capacityOnTheShelf/LayerServices.vue +++ b/front/src/views/capacityOnTheShelf/LayerServices.vue @@ -298,6 +298,9 @@ if (!dataFrom.value.shareCondition) { notFilled.value.push('共享条件') } + if (!dataFrom.value.deptId) { + notFilled.value.push('归属部门') + } if (!dataFrom.value.deptContacts) { notFilled.value.push('部门联系人') } From 636318536b86a4ff6698a5f85f36e50dea462847 Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Mon, 1 Aug 2022 15:57:09 +0800 Subject: [PATCH 23/34] =?UTF-8?q?765bug=EF=BC=8C=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=BB=84=E4=BB=B6=E6=97=B6=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../capacityOnTheShelf/components/PutOnTheShelf.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue index db50a51e..d8832e02 100644 --- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue +++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue @@ -477,6 +477,8 @@ :render="(item) => item.title" @change="handleChangeOther" @selectChange="handleSelectChangeOther" + show-search + :filter-option="filterOptionTransfer" /> @@ -927,7 +929,7 @@ mockDataOther.value.push({ key: val.id, title: val.name, - description: val.id, + description: val.name, }) }) }) @@ -948,7 +950,7 @@ mockDataOther.value.push({ key: val.id, title: val.name, - description: val.id, + description: val.name, }) }) }) @@ -978,6 +980,11 @@ console.log('targetSelectedKeys: ', targetSelectedKeys, sourceSelectedKeys) } + const filterOptionTransfer = (inputValue, option) => { + console.log(option, 'option') + return option.description.indexOf(inputValue) > -1 + } + const handleOk = (e) => { console.log(e) visibleAssociatedApplicationOther.value = false From 1ccd81cd6687ae68bdc62f25c19ec7a46f4747c5 Mon Sep 17 00:00:00 2001 From: guoyue Date: Mon, 1 Aug 2022 16:16:16 +0800 Subject: [PATCH 24/34] =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E4=B8=80=E9=94=AE=E7=94=B3=E8=AF=B7--=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E8=AE=BE=E6=96=BD=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/AbilityToApplyFor.vue | 4 +- front/src/views/home/apply.vue | 1306 ++++++++--------- .../home/components/searchResultList.vue | 97 +- front/src/views/home/packagingDetails.vue | 107 +- 4 files changed, 799 insertions(+), 715 deletions(-) diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue index 7a863bd2..fa791bc4 100644 --- a/front/src/views/home/AbilityToApplyFor.vue +++ b/front/src/views/home/AbilityToApplyFor.vue @@ -49,8 +49,8 @@
{{ val.description || - (val.note1 && - JSON.parse(val.note1)[0].channelName + + ((val.note1 || '') && + ( JSON.parse(val.note1)[0].channelName || '--') + '等' + JSON.parse(val.note1).length + '个摄像头') || diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue index 74cfa2f4..26d1c68a 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -11,150 +11,61 @@
- +
- - + +
- - + + - - + + - - + +
- - + + - - + +
- - + +
- - + +
- - - + + + "> 文件上传 @@ -181,8 +91,7 @@
- + " type="primary" html-type="cancle" @click="resetFields()"> 退出申请 - + " type="primary" html-type="submit" @click="processStartHandle()"> 提交申请
@@ -234,294 +134,268 @@ diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index 531885ad..f755cb77 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -588,33 +588,88 @@ export default { } // 融合服务--一键申请 - const handleAKeyApplication = (item) => { - let _applyList = [] - ; (item.fuseResourceList || []).map((v) => { - let resource = v.resource || {} - let obj = { - arr: [ - { - delFlag: resource.delFlag, - description: resource.description, - resourceId: resource.id, - resourceName: resource.name, - time: resource.createDate, - type: resource.type, - }, - ], - deptId: resource.deptId, - deptName: resource.deptName, - } - _applyList.push(obj) - }) - + // 一键申请 + const handleAKeyApplication = (item ) => { + let _applyList = []; + let fuseResourceList = item.fuseResourceList || [] + let jcssArray = fuseResourceList.filter(v => v.type === '基础设施') + let otherArray = fuseResourceList.filter(v => v.type !== '基础设施') + jcssArray = jcssArray.map(v => { + v = Object.assign(v, v.resource) + return v + }) + let jcss = [ + { + arr: [ + { + description: '', + note1: JSON.stringify(jcssArray), + resourceId: '1522550195055828996', + resourceName: '摄像头列表', + type: '基础设施', + }, + ], + deptId: '', + deptName: '', + }, + ] + if (infrastructure) { + jcss[0].deptId = infrastructure.deptId + jcss[0].deptName = infrastructure.deptName + } + otherArray.map((v) => { + let resource = v.resource || {} + console.log('resource------------>', resource); + let obj = { + arr: [ + { + delFlag: resource.delFlag, + description: resource.description, + resourceId: resource.id, + resourceName: resource.name, + time: resource.createDate, + type: resource.type, + }, + ], + deptId: resource.deptId, + deptName: resource.deptName, + } + _applyList.push(obj) + }) + _applyList = jcss.concat(_applyList) localStorage.setItem('applyList', JSON.stringify(_applyList)) router.push({ path: '/apply', }) } + // const handleAKeyApplication = (item) => { + // let _applyList = [] + // ; (item.fuseResourceList || []).map((v) => { + // let resource = v.resource || {} + // let obj = { + // arr: [ + // { + // delFlag: resource.delFlag, + // description: resource.description, + // resourceId: resource.id, + // resourceName: resource.name, + // time: resource.createDate, + // type: resource.type, + // }, + // ], + // deptId: resource.deptId, + // deptName: resource.deptName, + // } + // _applyList.push(obj) + // }) + + // localStorage.setItem('applyList', JSON.stringify(_applyList)) + // router.push({ + // path: '/apply', + // }) + // } + mybus.on('chongzhi', (typeObj) => { console.log('typeObj------------>', typeObj) if (!typeObj) { diff --git a/front/src/views/home/packagingDetails.vue b/front/src/views/home/packagingDetails.vue index 29f6282a..6cf964cc 100644 --- a/front/src/views/home/packagingDetails.vue +++ b/front/src/views/home/packagingDetails.vue @@ -23,13 +23,14 @@
描述：{{ detailInfoObj.description || '--' }}
- + 申请使用 - + @@ -67,6 +68,7 @@ import packageAbilityList from '@/views/home/components/packageAbilityList.vue' import { message } from 'ant-design-vue' import { getIntegrationDetail } from '@/api/home' import HomeHeader from '@/views/home/components/header' +import { scInsert, scDel } from '@/api/personalCenter' const router = useRouter() const id = router.currentRoute.value.query.id @@ -102,6 +104,8 @@ const getIntegrationServicesDeatil = (id) => { 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) || []; @@ -116,6 +120,104 @@ const getIntegrationServicesDeatil = (id) => { } ) } + +// 一键申请 +const handleAKeyApplication = () => { + let _applyList = []; + let fuseResourceList = detailInfoObj.value.fuseResourceList || [] + let jcssArray = fuseResourceList.filter(v => v.type === '基础设施') + let otherArray = fuseResourceList.filter(v => v.type !== '基础设施') + jcssArray = jcssArray.map(v => { + v = Object.assign(v, v.resource) + return v + }) + let jcss = [ + { + arr: [ + { + description: '', + note1: JSON.stringify(jcssArray), + resourceId: '1522550195055828996', + resourceName: '摄像头列表', + type: '基础设施', + }, + ], + deptId: '', + deptName: '', + }, + ] + if (infrastructure) { + jcss[0].deptId = infrastructure.deptId + jcss[0].deptName = infrastructure.deptName + } + otherArray.map((v) => { + let resource = v.resource || {} + console.log('resource------------>', resource); + let obj = { + arr: [ + { + delFlag: resource.delFlag, + description: resource.description, + resourceId: resource.id, + resourceName: resource.name, + time: resource.createDate, + type: resource.type, + }, + ], + deptId: resource.deptId, + deptName: resource.deptName, + } + _applyList.push(obj) + }) + _applyList = jcss.concat(_applyList) + localStorage.setItem('applyList', JSON.stringify(_applyList)) + router.push({ + path: '/apply', + }) +} + +const dataPosting = ref(true) +const addCollect = () => { + if (dataPosting.value && detailInfoObj.value.id) { + dataPosting.value = false + if (detailInfoObj.value.isCollect == 'true') { + scDel([detailInfoObj.value.id]).then((res) => { + if (res.data.msg === 'success') { + message.success('取消成功') + detailInfoObj.value.isCollect = 'false' + detailInfoObj.value.collectCount-- + dataPosting.value = true + console.log('收藏2===============>', res.data, dataPosting.value) + getIntegrationServicesDeatil(id) + } + }) + .catch(err => { + console.log('err------------>', err); + message.success(err) + }) + } else { + scInsert([ + { + resourceId: detailInfoObj.value.id, + }, + ]).then((res) => { + if (res.data.msg === 'success') { + message.success('添加收藏成功！') + detailInfoObj.value.isCollect = 'true' + detailInfoObj.value.collectCount++ + dataPosting.value = true + console.log('收藏2===============>', res.data, dataPosting.value) + getIntegrationServicesDeatil(id) + } + }) + .catch(err => { + console.log('err------------>', err); + message.success(err) + }) + } + } +} + getIntegrationServicesDeatil(id) @@ -239,4 +341,5 @@ getIntegrationServicesDeatil(id) .list-box { padding: 0.4rem; } + From 035a600a3cb58a7afb8aa74d0a1b2cb525da7939 Mon Sep 17 00:00:00 2001 From: lizhicheng2 Date: Mon, 1 Aug 2022 16:43:44 +0800 Subject: [PATCH 25/34] =?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=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/home/integrationServicesDetails.vue | 65 ++++++++++--------- 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue index 73c3f3cb..c792ace5 100644 --- a/front/src/views/home/integrationServicesDetails.vue +++ b/front/src/views/home/integrationServicesDetails.vue @@ -63,37 +63,38 @@
-
@@ -105,14 +106,11 @@
-
- - - -
+ + +
- @@ -271,7 +269,7 @@ })) }else if(item.title==='数据资源'){ arr=resource.map(res=>({ - id: res.resource.zycode, name: res.resource.zyname, dept: res.resource.TGBM, platform: 'UCS' + id: res.resource.zycode, name: res.resource.zyname, dept: res.resource.TGBM, platform: '共享交换平台' })) } } @@ -288,10 +286,6 @@ } getIntegrationServicesDeatil(id) - function openResourceDetail(row, column, event){ - console.log(row) - } - function handleOpenUrl(type) { let obj = (detailInfoObj.value.fuseAttrList || []).find( @@ -467,17 +461,20 @@ padding: 0.8rem 0; background: rgb(247, 248, 250); .bg { - height: 2rem; - width: 2rem; + height: 3rem; + width: 3rem; background: url('~@/assets/home/rhfw_square.png') no-repeat; background-size: 100%; margin-top: 0.3rem; } .content { - height: 2rem; + overflow: auto; + height: 3rem; width: 6rem; + margin-top: 0.3rem; .content-item { - margin: 0.1rem; + font-size: 16px; + margin: 0rem 0rem 0.1rem 0.1rem; } } } @@ -486,9 +483,9 @@ padding: 0.8rem 0; background: rgb(247, 248, 250); .content { - height: 2rem; - width: 8rem; + width: 9rem; .content-item { + font-size: 16px; margin: 0.3rem; } } @@ -499,6 +496,12 @@ background: rgb(247, 248, 250); .step-content { margin-top: 0.3rem; + /deep/ .el-step__title { + font-size: 16px; + } + /deep/ .el-step__description { + font-size: 14px; + } } } @@ -514,12 +517,16 @@ margin-top: 0.3rem; align-items: flex-start; .title { - height: 2rem; - width: 2rem; + height: 3rem; + width: 3rem; margin-right: 0.5rem; background: url('~@/assets/home/rhfw_square.png') no-repeat; background-size: 100%; } + .table { + width: 100%; + font-size: 16px + } } .name-box { From ae2e32376980cbf45181811a3204634fa07e5189 Mon Sep 17 00:00:00 2001 From: lizhicheng2 Date: Mon, 1 Aug 2022 17:05:40 +0800 Subject: [PATCH 26/34] =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/components/searchResultList.vue | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index f755cb77..7e97ba24 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -10,7 +10,7 @@ }}
-
    +
    • {{ item.name }} @@ -42,7 +42,7 @@
+ v-else-if="(selectCardsname === '融合服务' || selectCardsname === '赋能场景') && item.fuseAttrList && item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]">
@@ -72,10 +72,10 @@ ? 'ywzj' : '' " v-else-if=" - selectCardsname !== '基础设施' && selectCardsname !== '融合服务' + selectCardsname !== '基础设施' && selectCardsname !== '融合服务' && selectCardsname !== '赋能场景' ">
-
+
@@ -95,7 +95,7 @@
-
+