diff --git a/back/public/index.html b/back/public/index.html index 5105ee33..8d895721 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.liangjunhua - * @LastEditTime: 2022-07-28 20:10:28 + * @LastEditTime: 2022-08-01 09:23:52 * @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'; 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); diff --git a/back/src/views/modules/activiti/demo/putaway-process3.vue b/back/src/views/modules/activiti/demo/putaway-process3.vue index 4f1e12cc..659b4720 100644 --- a/back/src/views/modules/activiti/demo/putaway-process3.vue +++ b/back/src/views/modules/activiti/demo/putaway-process3.vue @@ -4,7 +4,7 @@
能力下架审批
- 基本1111信息 + 基本信息

@@ -429,7 +429,7 @@ export default { .data-list-left { width: 80px; height: 110px; - background: url('~@/assets/img/Capabilitydiagram.png') no-repeat; + background: url("~@/assets/img/Capabilitydiagram.png") no-repeat; background-size: 80px 80px; background-position: center; margin-left: 10px; diff --git a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue index 75305f2e..776dc574 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 }}
+
浏览
@@ -207,6 +235,10 @@ export default { this.dataView.children[indexView].children[indexViewSon].children[ indexSon ].note1 = this.dataForm.type + } else if (itemSon.name.indexOf('共享条件') != -1) { + this.dataView.children[indexView].children[indexViewSon].children[ + indexSon + ].note1 = this.dataForm.shareCondition } else if (itemSon.name === '部门联系人') { console.log('itemSon.name', itemSon.name) this.dataView.children[indexView].children[indexViewSon].children[ @@ -432,6 +464,11 @@ export default { } } + \ 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/assets/home/integration/jcssDetail.png b/front/src/assets/home/integration/jcssDetail.png new file mode 100644 index 00000000..4ea77922 Binary files /dev/null and b/front/src/assets/home/integration/jcssDetail.png differ diff --git a/front/src/assets/home/integration/sjzyDetail.png b/front/src/assets/home/integration/sjzyDetail.png new file mode 100644 index 00000000..d6575499 Binary files /dev/null and b/front/src/assets/home/integration/sjzyDetail.png differ diff --git a/front/src/assets/home/integration/zjfwDetail.png b/front/src/assets/home/integration/zjfwDetail.png new file mode 100644 index 00000000..7eaa5108 Binary files /dev/null and b/front/src/assets/home/integration/zjfwDetail.png differ diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue index 17451ecf..4ef65f01 100644 --- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue +++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue @@ -240,7 +240,7 @@ type: 'pie', selectedMode: 'single', radius: ['50%', '30%'], - color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#fe8455'], + color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#FAC858'], top: '0', label: { normal: { 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/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) diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue index 530234ad..a9cd566a 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 }}
@@ -170,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/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/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/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/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/Application/ApplicationTopDetails.vue b/front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue index d2216eec..19ecc008 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' ? '已' : '' }}收藏 @@ -257,7 +261,7 @@ margin-right: 0.2rem; font-size: 0.4rem; margin-right: 0.2rem; - max-width: 7rem; + max-width: 6rem; text-overflow: -o-ellipsis-lastline; overflow: hidden; text-overflow: ellipsis; diff --git a/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue b/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue index 99b15adf..4790ca75 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 }}
@@ -170,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/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/Business/BusinessFunctionIntorduction.vue b/front/src/views/detailsAll/components/Business/BusinessFunctionIntorduction.vue index 3446025f..3195b456 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 }}
@@ -150,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/Business/BusinessTopDetails.vue b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue index 3ba478df..8b035940 100644 --- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue +++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue @@ -243,7 +243,7 @@ // white-space: nowrap; font-size: 0.4rem; margin-right: 0.2rem; - max-width: 7rem; + max-width: 6rem; text-overflow: -o-ellipsis-lastline; overflow: hidden; text-overflow: ellipsis; 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..4790ca75 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 }}
@@ -170,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/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/Developer/DeveloperFunctionIntorduction.vue b/front/src/views/detailsAll/components/Developer/DeveloperFunctionIntorduction.vue index ff5f8297..24064c7b 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 }}
@@ -149,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/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/Developer/DeveloperTopDetails.vue b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue index 752b715d..b4354020 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue @@ -246,7 +246,7 @@ // white-space: nowrap; font-size: 0.4rem; margin-right: 0.2rem; - max-width: 7rem; + max-width: 6rem; text-overflow: -o-ellipsis-lastline; overflow: hidden; text-overflow: ellipsis; diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue index 99b15adf..4790ca75 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 }}
@@ -170,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/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/detailsAll/components/LayerService/LayerServiceTopDetails.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue index 5f3175cd..4feddb1e 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue @@ -239,7 +239,7 @@ // white-space: nowrap; font-size: 0.4rem; margin-right: 0.2rem; - max-width: 7rem; + max-width: 6rem; text-overflow: -o-ellipsis-lastline; overflow: hidden; text-overflow: ellipsis; 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; diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue index bb59648a..a67954ed 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -151,6 +151,8 @@ // eslint-disable-next-line no-undef const navList = ref(navListManagement.navList) + console.log('navList------------>', navList) + const props = defineProps({ showView: { type: String, default: '' }, }) @@ -420,6 +422,9 @@ padding: 0 0.04rem 0 0.1rem; border-left: 0.01rem solid #666; } + .icon { + cursor: pointer; + } } } .white { @@ -428,6 +433,9 @@ .name { color: #0058e1; } + .icon { + cursor: pointer; + } .nav { color: #000; } diff --git a/front/src/views/home/components/packageAbilityList.vue b/front/src/views/home/components/packageAbilityList.vue new file mode 100644 index 00000000..d72eeaa8 --- /dev/null +++ b/front/src/views/home/components/packageAbilityList.vue @@ -0,0 +1,64 @@ + + + \ No newline at end of file diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue index ca2033eb..73c3f3cb 100644 --- a/front/src/views/home/integrationServicesDetails.vue +++ b/front/src/views/home/integrationServicesDetails.vue @@ -1,6 +1,7 @@ + + 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; diff --git a/front/src/views/instructionManual/components/menuBook.vue b/front/src/views/instructionManual/components/menuBook.vue new file mode 100644 index 00000000..839c4128 --- /dev/null +++ b/front/src/views/instructionManual/components/menuBook.vue @@ -0,0 +1,17 @@ + + + \ No newline at end of file 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 { 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 @@ /> 批量删除 + + 批量删除 +