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.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 || '--' + // } }) } }