diff --git a/front/public/static/config/footerData.js b/front/public/static/config/footerData.js index d7683c21..87f76588 100644 --- a/front/public/static/config/footerData.js +++ b/front/public/static/config/footerData.js @@ -6,43 +6,43 @@ * @FilePath: \qiantai\front\public\static\config\footerData.js * @Description: 底部菜单数据配置配置 */ -const footerDataList = { - // 市局 - // company: { - // left: '青岛市大数据发展管理局建设', - // right: '海信网络科技股份有限公司' - // }, - // address: [ - // { - // name: '鲁IC备00000000号', - // value: '政府标识码3702000106', - // }, - // { - // name: '版权所有:青岛市大数据发展管理局', - // value: '地址:山东省青岛市香港中路17号市级机关办公楼', - // }, - // { - // name: '电话:0532-8561234', - // value: '传真:0532-2145122', - // }, - // ] - // 西海岸 - company: { - left: '青岛西海岸新区大数据发展促进局建设', - right: 'v0.81' - }, - address: [ - { - name: '鲁IC备00000000号', - value: '政府标识码3702000106', - }, - { - name: '版权所有:青岛西海岸新区大数据发展促进局', - value: '地址:青岛市西海岸新区长江中路369号', - }, - { - name: '电话:0532-86986596', - value: '传真:0532-86986596', - }, - ] -} +// const footerDataList = { +// 市局 +// company: { +// left: '青岛市大数据发展管理局建设', +// right: '海信网络科技股份有限公司' +// }, +// address: [ +// { +// name: '鲁IC备00000000号', +// value: '政府标识码3702000106', +// }, +// { +// name: '版权所有:青岛市大数据发展管理局', +// value: '地址:山东省青岛市香港中路17号市级机关办公楼', +// }, +// { +// name: '电话:0532-8561234', +// value: '传真:0532-2145122', +// }, +// ] +// 西海岸 +// company: { +// left: '青岛西海岸新区大数据发展促进局建设', +// right: 'v0.81' +// }, +// address: [ +// { +// name: '鲁IC备00000000号', +// value: '政府标识码3702000106', +// }, +// { +// name: '版权所有:青岛西海岸新区大数据发展促进局', +// value: '地址:青岛市西海岸新区长江中路369号', +// }, +// { +// name: '电话:0532-86986596', +// value: '传真:0532-86986596', +// }, +// ] +// } diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index 6c2328dc..f4ff914d 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-06-22 15:25:14 + * @LastEditTime: 2022-06-22 16:18:47 * @Description: 数据资源参数配置 */ // const newLocation = 'qingdao' @@ -14,11 +14,11 @@ const whoShow = {} const launchedDataNumObject = {} // 导航数据 const navListManagement = {} +// 底部数据 +const footerDataList = {} // qingdao if (newLocation === 'qingdao') { - // 数据资源数据 whoShow.itShowQingDao = true - // 导航数据 navListManagement.navList = [ { name: '共享门户', key: 'home' }, { name: '能力集市', key: 'DetailsPageconetent' }, @@ -31,10 +31,29 @@ if (newLocation === 'qingdao') { // { name: '后台管理', key: 'houtaiguanli' }, { name: '赋能案例', key: 'assignCase' }, ] + footerDataList.footerList = { + company: { + left: '青岛市大数据发展管理局建设', + right: '海信网络科技股份有限公司', + }, + address: [ + { + name: '鲁IC备00000000号', + value: '政府标识码3702000106', + }, + { + name: '版权所有:青岛市大数据发展管理局', + value: '地址:山东省青岛市香港中路17号市级机关办公楼', + }, + { + name: '电话:0532-8561234', + value: '传真:0532-2145122', + }, + ], + } } // baotou else if (newLocation === 'baotou') { - // 数据资源数据 whoShow.itShowBaoTou = true launchedDataNumObject.launchedDataNum = [ { @@ -47,7 +66,6 @@ else if (newLocation === 'baotou') { num: 976, }, ] - // 导航数据 navListManagement.navList = [ { name: '共享门户', key: 'home' }, { name: '能力集市', key: 'DetailsPageconetent' }, @@ -60,12 +78,30 @@ else if (newLocation === 'baotou') { // { name: '后台管理', key: 'houtaiguanli' }, { name: '赋能案例', key: 'assignCase' }, ] + footerDataList.footerList = { + company: { + left: '青岛西海岸新区大数据发展促进局建设', + right: 'v0.81', + }, + address: [ + { + name: '鲁IC备00000000号', + value: '政府标识码3702000106', + }, + { + name: '版权所有:青岛西海岸新区大数据发展促进局', + value: '地址:青岛市西海岸新区长江中路369号', + }, + { + name: '电话:0532-86986596', + value: '传真:0532-86986596', + }, + ], + } } // xihaian else if (newLocation === 'xihaian') { - // 数据资源数据 whoShow.itShowXiHaiAn = true - // 导航数据 navListManagement.navList = [ { name: '共享门户', key: 'home' }, { name: '能力集市', key: 'DetailsPageconetent' }, @@ -78,4 +114,24 @@ else if (newLocation === 'xihaian') { // { name: '后台管理', key: 'houtaiguanli' }, { name: '赋能案例', key: 'assignCase' }, ] + footerDataList.footerList = { + company: { + left: '青岛西海岸新区大数据发展促进局建设', + right: 'v0.81', + }, + address: [ + { + name: '鲁IC备00000000号', + value: '政府标识码3702000106', + }, + { + name: '版权所有:青岛西海岸新区大数据发展促进局', + value: '地址:青岛市西海岸新区长江中路369号', + }, + { + name: '电话:0532-86986596', + value: '传真:0532-86986596', + }, + ], + } } diff --git a/front/src/assets/detailsAll/layer-service/layer-apply-using.png b/front/src/assets/detailsAll/layer-service/layer-apply-using.png new file mode 100644 index 00000000..c3a2e867 Binary files /dev/null and b/front/src/assets/detailsAll/layer-service/layer-apply-using.png differ diff --git a/front/src/assets/detailsAll/layer-service/layer-bg.png b/front/src/assets/detailsAll/layer-service/layer-bg.png new file mode 100644 index 00000000..f4d8bce5 Binary files /dev/null and b/front/src/assets/detailsAll/layer-service/layer-bg.png differ diff --git a/front/src/assets/detailsAll/layer-service/layer-bgShow.png b/front/src/assets/detailsAll/layer-service/layer-bgShow.png new file mode 100644 index 00000000..763ba6a7 Binary files /dev/null and b/front/src/assets/detailsAll/layer-service/layer-bgShow.png differ diff --git a/front/src/assets/detailsAll/layer-service/layer-icon.png b/front/src/assets/detailsAll/layer-service/layer-icon.png new file mode 100644 index 00000000..4550574a Binary files /dev/null and b/front/src/assets/detailsAll/layer-service/layer-icon.png differ diff --git a/front/src/assets/detailsAll/layer-service/layer-shopping-car.png b/front/src/assets/detailsAll/layer-service/layer-shopping-car.png new file mode 100644 index 00000000..930fd77d Binary files /dev/null and b/front/src/assets/detailsAll/layer-service/layer-shopping-car.png differ diff --git a/front/src/assets/detailsAll/layer-service/layer-top-bg.png b/front/src/assets/detailsAll/layer-service/layer-top-bg.png new file mode 100644 index 00000000..cfb09d6d Binary files /dev/null and b/front/src/assets/detailsAll/layer-service/layer-top-bg.png differ diff --git a/front/src/views/detailsAll/LayerService.vue b/front/src/views/detailsAll/LayerService.vue new file mode 100644 index 00000000..1eec31a7 --- /dev/null +++ b/front/src/views/detailsAll/LayerService.vue @@ -0,0 +1,163 @@ + + + + diff --git a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue index 0571e328..1b698174 100644 --- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue +++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue @@ -120,11 +120,11 @@ if (item.attrType === '组件地址') { dataFrom.value.content[0].linkValue = item.attrValue || '--' } else if (item.attrType === '服务商') { - dataFrom.value.content[0].facilitator.value = item.attrValue || '--' + dataFrom.value.content[0].facilitator2.value = item.attrValue || '--' } else if (item.attrType === '服务商联系人') { - dataFrom.value.content[0].people.value = item.attrValue || '--' + dataFrom.value.content[0].people2.value = item.attrValue || '--' } else if (item.attrType === '服务商联系电话') { - dataFrom.value.content[0].phone.value = item.attrValue || '--' + dataFrom.value.content[0].phone2.value = item.attrValue || '--' } }) } @@ -144,12 +144,12 @@ if (item.attrType === '组件地址') { dataFrom.value.content[0].linkValue = item.attrValue || '--' } else if (item.attrType === '服务商') { - dataFrom.value.content[0].facilitator.value = + dataFrom.value.content[0].facilitator2.value = item.attrValue || '--' } else if (item.attrType === '服务商联系人') { - dataFrom.value.content[0].people.value = item.attrValue || '--' + dataFrom.value.content[0].people2.value = item.attrValue || '--' } else if (item.attrType === '服务商联系电话') { - dataFrom.value.content[0].phone.value = item.attrValue || '--' + dataFrom.value.content[0].phone2.value = item.attrValue || '--' } }) } diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationCase.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationCase.vue new file mode 100644 index 00000000..a0017137 --- /dev/null +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationCase.vue @@ -0,0 +1,303 @@ + + + + + + diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue new file mode 100644 index 00000000..4ba703cb --- /dev/null +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue @@ -0,0 +1,254 @@ + + + + + + diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceCommonProblem.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceCommonProblem.vue new file mode 100644 index 00000000..0345e0cd --- /dev/null +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceCommonProblem.vue @@ -0,0 +1,123 @@ + + + + + diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue new file mode 100644 index 00000000..f90305c8 --- /dev/null +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue @@ -0,0 +1,206 @@ + + + + + diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue new file mode 100644 index 00000000..a9b12bf3 --- /dev/null +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue @@ -0,0 +1,195 @@ + + + + diff --git a/front/src/views/detailsAll/components/LayerService/LayerServicePresentation.vue b/front/src/views/detailsAll/components/LayerService/LayerServicePresentation.vue new file mode 100644 index 00000000..64e80108 --- /dev/null +++ b/front/src/views/detailsAll/components/LayerService/LayerServicePresentation.vue @@ -0,0 +1,81 @@ + + + + diff --git a/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue b/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue new file mode 100644 index 00000000..bfd4aaac --- /dev/null +++ b/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue @@ -0,0 +1,67 @@ + + + + diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue new file mode 100644 index 00000000..4e20e88e --- /dev/null +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceTopDetails.vue @@ -0,0 +1,233 @@ + + + + diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue new file mode 100644 index 00000000..49e8bc44 --- /dev/null +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue @@ -0,0 +1,288 @@ + + + + + diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index a22ec5d5..7f17ae98 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -607,12 +607,12 @@ :resourceTotal="resourceTotal" > -
+
diff --git a/front/src/views/home/details.vue b/front/src/views/home/details.vue index e8929ec7..4504988d 100644 --- a/front/src/views/home/details.vue +++ b/front/src/views/home/details.vue @@ -22,6 +22,7 @@ + @@ -36,6 +37,7 @@ import ApplicationDetails from '@/views/detailsAll/ApplicationDetails' import DeveloperComponents from '@/views/detailsAll/DeveloperComponents' import BusinessDetails from '@/views/detailsAll/BusinessDetails' + import LayerService from '@/views/detailsAll/LayerService' import { selectOne } from '@/api/home' import { useRouter } from 'vue-router' export default defineComponent({ @@ -49,6 +51,7 @@ ApplicationDetails, DeveloperComponents, BusinessDetails, + LayerService, }, setup() { const formState = reactive({ @@ -88,7 +91,7 @@ const router = useRouter() const id = router.currentRoute.value.query.id const obj = JSON.parse(window.sessionStorage.getItem('preview')) - let showView = ref('developer-components') + let showView = ref('details-view') const init = () => { if (id) { selectOne(id).then((res) => { @@ -109,6 +112,9 @@ case '业务组件': showView.value = 'business-details' break + case 'GIS图层': + showView.value = 'layer-service' + break default: break } @@ -140,6 +146,9 @@ case '业务组件': showView.value = 'business-details' break + case 'GIS图层': + showView.value = 'layer-service' + break default: break } diff --git a/front/src/views/newHome/components/Footer.vue b/front/src/views/newHome/components/Footer.vue index fa5362ca..2baf31ec 100644 --- a/front/src/views/newHome/components/Footer.vue +++ b/front/src/views/newHome/components/Footer.vue @@ -26,10 +26,10 @@