From 111aa1669265fde6062d4cb15bc5f0792441f44f Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Wed, 29 Jun 2022 10:06:00 +0800 Subject: [PATCH 01/13] bug269 --- .../components/ComponentServices.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/front/src/views/capabilityCloud/components/ComponentServices.vue b/front/src/views/capabilityCloud/components/ComponentServices.vue index 45b9d294..32fdaf2e 100644 --- a/front/src/views/capabilityCloud/components/ComponentServices.vue +++ b/front/src/views/capabilityCloud/components/ComponentServices.vue @@ -127,7 +127,12 @@ let dataclick = ref('total') let dataList = ref([]) let timeSwitchindex = ref('周') - let servicesSnum = ref([]) + let servicesSnum = ref([ + { amount: '', type: '智能算法' }, + { amount: '', type: '图层服务' }, + { amount: '', type: '开发组件' }, + { amount: '', type: '业务组件' }, + ]) let callTheTrendData = ref({ time: [], snum: [] }) //年月切换 const timeSwitch = (name) => { @@ -302,7 +307,11 @@ snum.value[0].num = res.data.data[0].amount res.data.data.map((item, index) => { if (index != 0) { - servicesSnum.value.push(item) + servicesSnum.value.map((servicesSnumitem, servicesSnumindex) => { + if (servicesSnumitem.type == item.type) { + servicesSnum.value[servicesSnumindex].amount = item.amount + } + }) } }) }) From dc57556a6c7cccb333b2560a4c18c8da8e4b5283 Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Wed, 29 Jun 2022 10:18:26 +0800 Subject: [PATCH 02/13] =?UTF-8?q?319=E5=9B=BE=E5=B1=82=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LayerService/LayerServiceInformation.vue | 26 ++++++- .../LayerService/LayerServiceNavigation.vue | 6 +- .../LayerService/LayerServiceUsageMode.vue | 69 ++++++++++++------- 3 files changed, 71 insertions(+), 30 deletions(-) diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue index 4be1bfff..5887693d 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue @@ -93,7 +93,16 @@ const flag = ref(true) if (props.dataList.infoList) { let obj = props.dataList.infoList.filter( - (item) => item.attrType === '技术文档' + (item) => + item.attrType === '服务类型' || + item.attrType === '覆盖区域' || + item.attrType === '切片策略' || + item.attrType === '坐标系' || + item.attrType === '切片尺寸' || + item.attrType === '最小级别' || + item.attrType === '数据范围' || + item.attrType === '图层类型' || + item.attrType === '最大级别' )[0] if (!obj) { flag.value = false @@ -128,7 +137,18 @@ () => props.dataList, (val) => { if (val) { - let obj = val.infoList.filter((item) => item.attrType === '技术文档')[0] + let obj = val.infoList.filter( + (item) => + item.attrType === '服务类型' || + item.attrType === '覆盖区域' || + item.attrType === '切片策略' || + item.attrType === '坐标系' || + item.attrType === '切片尺寸' || + item.attrType === '最小级别' || + item.attrType === '数据范围' || + item.attrType === '图层类型' || + item.attrType === '最大级别' + )[0] if (!obj) { flag.value = false } else { @@ -211,7 +231,7 @@ font-size: 0.2rem; color: #666666; display: block; - margin-right: 0.8rem; + margin-right: 0.5rem; width: 120px; } p { diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue index 9e120f43..fcbc0846 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue @@ -89,14 +89,13 @@ list.value.push(item.attrType) } else if (item.attrType === '图层缩略图') { list.value.push('图层展示') - } else if (item.attrType === '坐标系') { - list.value.push('图层信息') } else if (item.attrType === '是否可预览') { if (item.attrValue === '是') { list.value.push('图层预览') } } }) + list.value.push('图层信息') list.value.push('使用方式') navList.value.forEach((item) => { console.log(item) @@ -144,14 +143,13 @@ list.value.push(item.attrType) } else if (item.attrType === '图层缩略图') { list.value.push('图层展示') - } else if (item.attrType === '坐标系') { - list.value.push('图层信息') } else if (item.attrType === '是否可预览') { if (item.attrValue === '是') { list.value.push('图层预览') } } }) + list.value.push('图层信息') list.value.push('使用方式') navList.value.forEach((item) => { console.log(item) diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue index 748248d9..fee4027e 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue @@ -17,7 +17,7 @@

样式服务地址： - {{ item.linkValue }} + {{ item.csslnkValue }}

@@ -27,7 +27,9 @@
-
{{ item.contact }}
+
+ {{ item.contact }}：{{ item.facilitator.values }} +

{{ item.people.name }} @@ -54,6 +56,7 @@ import { pinyin } from 'pinyin-pro' import { ref, defineProps, watch } from 'vue' let dataFrom = ref({ + link: '', title: '使用方式', englishTitle: 'USAGE', content: [ @@ -81,25 +84,32 @@ const flag = ref(true) if (props.dataList.infoList) { let obj = props.dataList.infoList.filter( - (item) => item.attrType === '技术文档' + (item) => + item.attrType === '技术文档' || + item.attrType === '服务商' || + item.attrType === '服务商联系人' || + item.attrType === '服务商联系电话' )[0] if (!obj) { flag.value = false } else { // eslint-disable-next-line vue/no-setup-props-destructure - dataFrom.value.content[0].link.value = props.dataList.apiUrl - dataFrom.value.content[0].facilitator.values = props.dataList.deptContacts + // dataFrom.value.content[0].link.value = props.dataList.apiUrl + dataFrom.value.content[0].facilitator.values = props.dataList.deptName + dataFrom.value.content[0].people.value = props.dataList.deptContacts + dataFrom.value.content[0].phone.value = props.dataList.deptPhone console.log('dataList', props.dataList) props.dataList.infoList.map((item) => { - if (item.attrType === '组件地址') { + if (item.attrType === '使用手册') { + dataFrom.value.link = item.attrValue || '--' + } else if (item.attrType === '服务地址') { dataFrom.value.content[0].linkValue = item.attrValue || '--' - } else if (item.attrType === '服务商') { - dataFrom.value.content[0].facilitator.value = item.attrValue || '--' - } else if (item.attrType === '服务商联系人') { - dataFrom.value.content[0].people.value = item.attrValue || '--' - } else if (item.attrType === '服务商联系电话') { - dataFrom.value.content[0].phone.value = item.attrValue || '--' + } else if (item.attrType === '样式服务地址') { + dataFrom.value.content[0].csslnkValue = item.attrValue || '--' } + // else if (item.attrType === '服务商联系电话') { + // dataFrom.value.content[0].phone.value = item.deptPhone || '--' + // } }) } } @@ -107,24 +117,37 @@ () => props.dataList, (val) => { if (val) { - let obj = val.infoList.filter((item) => item.attrType === '技术文档')[0] + let obj = val.infoList.filter( + (item) => + item.attrType === '技术文档' || + item.attrType === '服务商' || + item.attrType === '服务商联系人' || + item.attrType === '服务商联系电话' + )[0] if (!obj) { flag.value = false } else { - dataFrom.value.content[0].link.value = val.apiUrl - dataFrom.value.content[0].facilitator.value = val.deptContacts + // dataFrom.value.content[0].link.value = val.apiUrl + dataFrom.value.content[0].facilitator.values = val.deptName + dataFrom.value.content[0].people.value = val.deptContacts + dataFrom.value.content[0].phone.value = val.deptPhone console.log('dataList', val) val.infoList.map((item) => { - if (item.attrType === '组件地址') { + if (item.attrType === '使用手册') { + dataFrom.value.link = item.attrValue || '--' + } else if (item.attrType === '服务地址') { dataFrom.value.content[0].linkValue = item.attrValue || '--' - } else if (item.attrType === '服务商') { - dataFrom.value.content[0].facilitator.value = - item.attrValue || '--' - } else if (item.attrType === '服务商联系人') { - dataFrom.value.content[0].people.value = item.attrValue || '--' - } else if (item.attrType === '服务商联系电话') { - dataFrom.value.content[0].phone.value = item.attrValue || '--' + } else if (item.attrType === '样式服务地址') { + dataFrom.value.content[0].csslnkValue = item.attrValue || '--' } + // else if (item.attrType === '服务商') { + // dataFrom.value.content[0].facilitator.value = + // item.attrValue || '--' + // } else if (item.attrType === '服务商联系人') { + // dataFrom.value.content[0].people.value = item.attrValue || '--' + // } else if (item.attrType === '服务商联系电话') { + // dataFrom.value.content[0].phone.value = item.attrValue || '--' + // } }) } } From eb02d71771da124376e7440c59f594b78722d5ca Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Wed, 29 Jun 2022 10:24:12 +0800 Subject: [PATCH 03/13] =?UTF-8?q?317=E8=83=BD=E5=8A=9B=E9=9B=86=E5=B8=82?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=8A=98=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/components/searchResultList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index 4b5b212f..53aea18c 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -46,7 +46,7 @@

- + {{ item.name }} Date: Wed, 29 Jun 2022 10:47:03 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E9=9B=86=E5=B8=82?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0pagenum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/DetailsPageconetent.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index 17616056..2082dd47 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -1039,6 +1039,7 @@ const videoList = reactive({ data: [] }) const resourceTotal = ref('') const getAppResources = () => { + paramsGetResources.pageNum = 1 paramsGetResources.name = searchValue.value paramsGetResources.type = Cardsname.value console.log( From 3fb7474426ad4f0d5518a511f282a56c9cbf227e Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Wed, 29 Jun 2022 11:31:25 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E5=9B=BE=E5=B1=82=E6=9C=8D=E5=8A=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LayerService/LayerServiceNavigation.vue | 47 ++++++++++++++++++- .../LayerService/LayerServicePreview.vue | 14 ++++-- .../LayerService/LayerServiceUsageMode.vue | 6 +++ 3 files changed, 62 insertions(+), 5 deletions(-) diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue index fcbc0846..b6c96318 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue @@ -93,10 +93,31 @@ if (item.attrValue === '是') { list.value.push('图层预览') } + } else if ( + item.attrType === '服务类型' || + item.attrType === '覆盖区域' || + item.attrType === '切片策略' || + item.attrType === '坐标系' || + item.attrType === '切片尺寸' || + item.attrType === '最小级别' || + item.attrType === '数据范围' || + item.attrType === '图层类型' || + item.attrType === '最大级别' + ) { + list.value.push('图层信息') + } else if ( + item.attrType === '技术文档' || + item.attrType === '服务商' || + item.attrType === '服务商联系人' || + item.attrType === '使用手册' || + item.attrType === '服务地址' || + item.attrType === '样式服务地址' || + item.attrType === '服务商联系电话' + ) { + list.value.push('使用方式') } }) - list.value.push('图层信息') - list.value.push('使用方式') + navList.value.forEach((item) => { console.log(item) if (list.value.indexOf(item.name) > -1) { @@ -147,6 +168,28 @@ if (item.attrValue === '是') { list.value.push('图层预览') } + } else if ( + item.attrType === '服务类型' || + item.attrType === '覆盖区域' || + item.attrType === '切片策略' || + item.attrType === '坐标系' || + item.attrType === '切片尺寸' || + item.attrType === '最小级别' || + item.attrType === '数据范围' || + item.attrType === '图层类型' || + item.attrType === '最大级别' + ) { + list.value.push('图层信息') + } else if ( + item.attrType === '技术文档' || + item.attrType === '服务商' || + item.attrType === '服务商联系人' || + item.attrType === '使用手册' || + item.attrType === '服务地址' || + item.attrType === '样式服务地址' || + item.attrType === '服务商联系电话' + ) { + list.value.push('使用方式') } }) list.value.push('图层信息') diff --git a/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue b/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue index c0f50a4d..8611e43d 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue @@ -8,7 +8,7 @@
-
+