From 0bf0722e53899513517ec2c72c007b00982dd7f8 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Fri, 15 Jul 2022 14:12:04 +0800 Subject: [PATCH 1/5] bug577 --- .../Algorithm/AlgorithmTopDetails.vue | 27 ++++++++++++++-- .../Business/BusinessTopDetails.vue | 32 +++++++++++++++---- .../Developer/DeveloperTopDetails.vue | 27 ++++++++++++++-- .../LayerService/LayerServiceTopDetails.vue | 27 ++++++++++++++-- 4 files changed, 101 insertions(+), 12 deletions(-) diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue index 24869e6f..a642d8e9 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue @@ -21,12 +21,18 @@ {{ props.dataList.type }} + + {{ componentType }} + {{ props.dataList.shareType }} {{ props.dataList.shareCondition }} + + {{ deploymentLocation }} +

@@ -71,6 +77,7 @@ }) const router = useRouter() const applicationArea = ref('') + const deploymentLocation = ref('') //部署位置 //加入申购车 const addShoppingCart = () => { console.log('加入申购车==================>', props.dataList) @@ -128,6 +135,13 @@ let obj = props.dataList.infoList.filter( (val) => val.attrType === '组件类型' )[0] + if ( + props.dataList.infoList.filter((val) => val.attrType === '部署位置')[0] + ) { + deploymentLocation.value = props.dataList.infoList.filter( + (val) => val.attrType === '部署位置' + )[0].attrValue + } if (obj) { componentType.value = obj.attrValue } @@ -142,6 +156,15 @@ let obj = props.dataList.infoList.filter( (val) => val.attrType === '组件类型' )[0] + if ( + props.dataList.infoList.filter( + (val) => val.attrType === '部署位置' + )[0] + ) { + deploymentLocation.value = props.dataList.infoList.filter( + (val) => val.attrType === '部署位置' + )[0].attrValue + } if (obj) { componentType.value = obj.attrValue } @@ -189,8 +212,8 @@ } .lable-father { position: absolute; - min-width: 3.5rem; - right: -3.5rem; + min-width: 5.5rem; + right: -5.5rem; top: 0; } .label { diff --git a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue index bd29eef3..a2c91071 100644 --- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue +++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue @@ -21,12 +21,18 @@ {{ props.dataList.type }} + + {{ componentType }} + {{ props.dataList.shareType }} {{ props.dataList.shareCondition }} + + {{ deploymentLocation }} +

@@ -75,6 +81,8 @@ }) const router = useRouter() const businessArea = ref('') + const deploymentLocation = ref('') //部署位置 + const componentType = ref('') //组件类型 // // 加入申购车 const addShoppingCart = () => { console.log('加入申购车==================>', props.dataList) @@ -124,14 +132,17 @@ message.success('收藏成功') }) } - const componentType = ref('') if (props.dataList.infoList) { businessArea.value = props.dataList.infoList.filter( (val) => val.attrType === '应用领域' )[0].attrValue - let obj = props.dataList.infoList.filter( - (val) => val.attrType === '组件类型' - )[0] + if ( + props.dataList.infoList.filter((val) => val.attrType === '部署位置')[0] + ) { + deploymentLocation.value = props.dataList.infoList.filter( + (val) => val.attrType === '部署位置' + )[0].attrValue + } if (obj) { componentType.value = obj.attrValue } @@ -146,6 +157,15 @@ let obj = props.dataList.infoList.filter( (val) => val.attrType === '组件类型' )[0] + if ( + props.dataList.infoList.filter( + (val) => val.attrType === '部署位置' + )[0] + ) { + deploymentLocation.value = props.dataList.infoList.filter( + (val) => val.attrType === '部署位置' + )[0].attrValue + } if (obj) { componentType.value = obj.attrValue } @@ -197,8 +217,8 @@ .lable-father { position: absolute; - min-width: 3.5rem; - right: -3.5rem; + min-width: 5.5rem; + right: -5.5rem; top: 0; } diff --git a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue index fd75008e..ca1c5777 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue @@ -21,12 +21,18 @@ {{ props.dataList.type }} + + {{ componentType }} + {{ props.dataList.shareType }} {{ props.dataList.shareCondition }} + + {{ deploymentLocation }} +

@@ -71,6 +77,7 @@ }) const router = useRouter() const applicationArea = ref('') + const deploymentLocation = ref('') //部署位置 // 加入申购车 const addShoppingCart = () => { console.log('加入申购车==================>', props.dataList) @@ -128,6 +135,13 @@ let obj = props.dataList.infoList.filter( (val) => val.attrType === '组件类型' )[0] + if ( + props.dataList.infoList.filter((val) => val.attrType === '部署位置')[0] + ) { + deploymentLocation.value = props.dataList.infoList.filter( + (val) => val.attrType === '部署位置' + )[0].attrValue + } if (obj) { componentType.value = obj.attrValue } @@ -142,6 +156,15 @@ let obj = props.dataList.infoList.filter( (val) => val.attrType === '组件类型' )[0] + if ( + props.dataList.infoList.filter( + (val) => val.attrType === '部署位置' + )[0] + ) { + deploymentLocation.value = props.dataList.infoList.filter( + (val) => val.attrType === '部署位置' + )[0].attrValue + } if (obj) { componentType.value = obj.attrValue } @@ -188,8 +211,8 @@ } .lable-father { position: absolute; - min-width: 3.5rem; - right: -3.5rem; + min-width: 5.5rem; + right: -5.5rem; top: 0; } .label { diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue index 336bc5ff..e59bdde4 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue @@ -21,12 +21,18 @@ {{ props.dataList.type }} + + {{ componentType }} + {{ props.dataList.shareType }} {{ props.dataList.shareCondition }} + + {{ deploymentLocation }} +

@@ -71,6 +77,7 @@ }) const router = useRouter() const businessArea = ref('') + const deploymentLocation = ref('') //部署位置 // 加入申购车 const addShoppingCart = () => { console.log('加入申购车==================>', props.dataList) @@ -129,6 +136,13 @@ let obj = props.dataList.infoList.filter( (val) => val.attrType === '组件类型' )[0] + if ( + props.dataList.infoList.filter((val) => val.attrType === '部署位置')[0] + ) { + deploymentLocation.value = props.dataList.infoList.filter( + (val) => val.attrType === '部署位置' + )[0].attrValue + } if (obj) { componentType.value = obj.attrValue } @@ -145,6 +159,15 @@ let obj = props.dataList.infoList.filter( (item) => item.attrType === '组件类型' )[0] + if ( + props.dataList.infoList.filter( + (val) => val.attrType === '部署位置' + )[0] + ) { + deploymentLocation.value = props.dataList.infoList.filter( + (val) => val.attrType === '部署位置' + )[0].attrValue + } if (obj) { componentType.value = obj.attrValue } @@ -191,8 +214,8 @@ } .lable-father { position: absolute; - min-width: 3.5rem; - right: -3.5rem; + min-width: 5.5rem; + right: -5.5rem; top: 0; } .label { From acd4bdae9f84ac15ddf13084fb491f4c18705b93 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Fri, 15 Jul 2022 14:36:13 +0800 Subject: [PATCH 2/5] bug523 --- .../views/capacityOnTheShelf/Algorithm.vue | 2 +- .../views/capacityOnTheShelf/Application.vue | 2 +- .../capacityOnTheShelf/BusinessComponent.vue | 2 +- .../DevelopmentComponents.vue | 2 +- .../capacityOnTheShelf/LayerServices.vue | 2 +- .../Algorithm/AlgorithmChargingStandard.vue | 94 ++----------------- 6 files changed, 13 insertions(+), 91 deletions(-) diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue index dc8a25ca..97b456c4 100644 --- a/front/src/views/capacityOnTheShelf/Algorithm.vue +++ b/front/src/views/capacityOnTheShelf/Algorithm.vue @@ -279,7 +279,7 @@ shangjiaapply(params).then((res3) => { console.log('res3', res3) if (res3.data.code == 0) { - message.success('上架成功！') + message.success('上架申请提交成功，请注意查看消息通知！') window.setTimeout(() => { window.close() submitFlag.value = true diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue index df8e24d3..dc0882d2 100644 --- a/front/src/views/capacityOnTheShelf/Application.vue +++ b/front/src/views/capacityOnTheShelf/Application.vue @@ -237,7 +237,7 @@ shangjiaapply(params).then((res3) => { console.log('res3', res3) if (res3.data.code == 0) { - message.success('上架成功！') + message.success('上架申请提交成功，请注意查看消息通知！') window.setTimeout(() => { window.close() submitFlag.value = true diff --git a/front/src/views/capacityOnTheShelf/BusinessComponent.vue b/front/src/views/capacityOnTheShelf/BusinessComponent.vue index 6d2f0892..015338ff 100644 --- a/front/src/views/capacityOnTheShelf/BusinessComponent.vue +++ b/front/src/views/capacityOnTheShelf/BusinessComponent.vue @@ -261,7 +261,7 @@ shangjiaapply(params).then((res3) => { console.log('res3', res3) if (res3.data.code == 0) { - message.success('上架成功！') + message.success('上架申请提交成功，请注意查看消息通知！') window.setTimeout(() => { window.close() submitFlag.value = true diff --git a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue index 8e5a6b18..94bd7ee7 100644 --- a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue +++ b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue @@ -261,7 +261,7 @@ shangjiaapply(params).then((res3) => { console.log('res3', res3) if (res3.data.code == 0) { - message.success('上架成功！') + message.success('上架申请提交成功，请注意查看消息通知！') window.setTimeout(() => { window.close() submitFlag.value = true diff --git a/front/src/views/capacityOnTheShelf/LayerServices.vue b/front/src/views/capacityOnTheShelf/LayerServices.vue index 90da45de..03ffe283 100644 --- a/front/src/views/capacityOnTheShelf/LayerServices.vue +++ b/front/src/views/capacityOnTheShelf/LayerServices.vue @@ -209,7 +209,7 @@ shangjiaapply(params).then((res3) => { console.log('res3', res3) if (res3.data.code == 0) { - message.success('上架成功！') + message.success('上架申请提交成功，请注意查看消息通知！') window.setTimeout(() => { window.close() submitFlag.value = true diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmChargingStandard.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmChargingStandard.vue index 2768387e..0ebc73a1 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmChargingStandard.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmChargingStandard.vue @@ -12,9 +12,7 @@
{{ item.content }}
- {{ item.unit }} {{ item.value }} - {{ item.time }}
@@ -40,44 +38,10 @@ // dataFrom.value = obj obj.attrValue.map((item) => { let params = {} - switch (item.type) { - case '一次性买断': - params = { - title: item.type, - content: item.desc, - value: item.price, - time: '元', - unit: '￥', - } - break - case '按调用次数': - params = { - title: item.type, - content: item.desc, - value: item.price, - time: '/次', - unit: '￥', - } - break - - case '按并发路数': - params = { - title: item.type, - content: item.desc, - value: item.price, - time: '/路', - unit: '￥', - } - break - case '按年计费': - params = { - title: item.type, - content: item.desc, - value: item.price, - time: '/年', - unit: '￥', - } - break + params = { + title: item.type, + content: item.desc, + value: item.price, } dataFrom.value.push(params) }) @@ -97,44 +61,10 @@ // dataFrom.value = obj obj.attrValue.map((item) => { let params = {} - switch (item.type) { - case '一次性买断': - params = { - title: item.type, - content: item.desc, - value: item.price, - time: '元', - unit: '￥', - } - break - case '按调用次数': - params = { - title: item.type, - content: item.desc, - value: item.price, - time: '/次', - unit: '￥', - } - break - - case '按并发路数': - params = { - title: item.type, - content: item.desc, - value: item.price, - time: '/路', - unit: '￥', - } - break - case '按年计费': - params = { - title: item.type, - content: item.desc, - value: item.price, - time: '/年', - unit: '￥', - } - break + params = { + title: item.type, + content: item.desc, + value: item.price, } dataFrom.value.push(params) }) @@ -189,14 +119,6 @@ font-size: 22px; color: #ff8b55; } - span:nth-child(2) { - font-size: 32px; - color: #ff8b55; - } - span:last-child { - font-size: 22px; - color: #999999; - } } } .content-card:hover { From 8fda94f942c495a4eeb41edf8966ee308b8f9a07 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Fri, 15 Jul 2022 14:56:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/infrastructurePage.vue | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index a7de5707..52a511b2 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -414,11 +414,14 @@ // } const getCamera = () => { console.log('初始化调用') - getCameraByParentId(mapSearchParam.value).then((res) => { - console.log('RRRRRRRRRR', res.data.data) - dataSource.value = res.data.data - pagination.value.total = res.data.count - }) + console.log('不选左侧树的时候不调用接口', mapSearchParam.value) + if (mapSearchParam.value.parentId) { + getCameraByParentId(mapSearchParam.value).then((res) => { + console.log('RRRRRRRRRR', res.data.data) + dataSource.value = res.data.data + pagination.value.total = res.data.count + }) + } } //加入申购车 const addShoppingCart = () => { From d6e7324b8036a939e45daa0c0833a349b1b47e0d Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Fri, 15 Jul 2022 15:30:15 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=89=8D=E5=8F=B0-=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5-=E7=AE=97=E6=B3=95=E4=BC=98=E5=8A=BFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Algorithm/AlgorithmAdvantage.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue index 3e97e58d..7f35d9e9 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmAdvantage.vue @@ -12,7 +12,10 @@
-
{{ val.title }}
+ + +
{{ val.title }}
+
{{ val.text }}
@@ -92,7 +95,7 @@ align-items: center; .item { width: 424px; - height:306px; + height: 306px; padding: 35px; display: flex; flex-direction: column; @@ -119,7 +122,11 @@ .title { font-size: 22px; margin-top: 25px; + width: 2.6rem; text-align: center; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .text { height: 78px; From e7bfc7db36a3a9976c8f9e47da7599e9b9f61344 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Fri, 15 Jul 2022 16:06:36 +0800 Subject: [PATCH 5/5] bug566 --- ...operOwningDepartmentAndServiceProvider.vue | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue index 3d6f7e7b..56036349 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue @@ -102,24 +102,24 @@ if (!obj) { flag.value = false } else { - dataFrom.value.content[0].childrenContent[0].attrValue = - props.dataList.deptContacts dataFrom.value.content[0].childrenContent[1].attrValue = - props.dataList.deptPhone + props.dataList.deptContacts dataFrom.value.content[0].childrenContent[2].attrValue = + props.dataList.deptPhone + dataFrom.value.content[0].childrenContent[0].attrValue = props.dataList.deptName props.dataList.infoList.map((item) => { if (item.attrType == '组件地址') { dataFrom.value.link = item.attrValue } else if (item.attrType == '服务商联系人') { - dataFrom.value.content[1].childrenContent[0].attrValue = - item.attrValue - } else if (item.attrType == '服务商联系电话') { dataFrom.value.content[1].childrenContent[1].attrValue = item.attrValue - } else if (item.attrType == '服务商' || item.attrType == '服务商名') { + } else if (item.attrType == '服务商联系电话') { dataFrom.value.content[1].childrenContent[2].attrValue = item.attrValue + } else if (item.attrType == '服务商' || item.attrType == '服务商名') { + dataFrom.value.content[1].childrenContent[0].attrValue = + item.attrValue } }) } @@ -164,26 +164,26 @@ if (!obj) { flag.value = false } else { - dataFrom.value.content[0].childrenContent[0].attrValue = - props.dataList.deptContacts dataFrom.value.content[0].childrenContent[1].attrValue = - props.dataList.deptPhone + props.dataList.deptContacts dataFrom.value.content[0].childrenContent[2].attrValue = + props.dataList.deptPhone + dataFrom.value.content[0].childrenContent[0].attrValue = props.dataList.deptName props.dataList.infoList.map((item) => { if (item.attrType == '组件地址') { dataFrom.value.link = item.attrValue } else if (item.attrType == '服务商联系人') { - dataFrom.value.content[1].childrenContent[0].attrValue = + dataFrom.value.content[1].childrenContent[1].attrValue = item.attrValue } else if (item.attrType == '服务商联系电话') { - dataFrom.value.content[1].childrenContent[1].attrValue = + dataFrom.value.content[1].childrenContent[2].attrValue = item.attrValue } else if ( item.attrType == '服务商' || item.attrType == '服务商名' ) { - dataFrom.value.content[1].childrenContent[2].attrValue = + dataFrom.value.content[1].childrenContent[0].attrValue = item.attrValue } }) @@ -204,11 +204,11 @@ } .content { display: flex; - width: 13rem; + width: 14rem; justify-content: space-between; .content-card { height: 1.8rem; - width: 6.2rem; + width: 6.6rem; border-radius: 0.2rem; background: linear-gradient( to right, @@ -242,11 +242,18 @@ max-width: 2.8rem; div { max-width: 2.8rem; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 1; + // overflow: hidden; + // text-overflow: ellipsis; + // display: -webkit-box; + // -webkit-box-orient: vertical; + // -webkit-line-clamp: 1; + & > span:last-child { + display: inline-block; + width: 1.19rem; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } } } }