diff --git a/front/public/index.html b/front/public/index.html index a8a7a15f..5856f9b9 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -1,8 +1,8 @@ @@ -61,6 +61,8 @@ + + @@ -119,4 +121,4 @@ - \ No newline at end of file + diff --git a/front/public/static/config/footerData.js b/front/public/static/config/footerData.js new file mode 100644 index 00000000..f03e6e35 --- /dev/null +++ b/front/public/static/config/footerData.js @@ -0,0 +1,28 @@ +/* + * @Author: zhangfeihu + * @Date: 2022-06-16 16:37:31 + * @LastEditors: 851673013@qq.com 851673013@qq.com + * @LastEditTime: 2022-06-16 17:10:48 + * @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', + }, + ] +} diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index 47e2c06c..f1e53b56 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -22,8 +22,9 @@ {{ item.name }} +
@@ -117,16 +118,18 @@
+ + -
- - - + + +
+
+
+
+
+ 青岛市政务资源管理平台 +
+
+
+
+
{{ item.name }}
+
{{ item.value }}
+ {{ item.danwei }} +
+
+
+ 说明：数据资源目前通过青岛市政务信息网进行申请 +
+
-
- +
@@ -350,14 +385,15 @@ } from '@ant-design/icons-vue' import { selectDicStoreAll, pageWithAttrs, zywMessage } from '@/api/home.js' import { getSgcList } from '@/api/personalCenter' + import { getRecord } from '@/api/file' import { useRouter } from 'vue-router' // import { useStore } from 'vuex' import HomeHeader from '@/views/home/components/header' import detailsPageconetentTree from '@/views/home/detailsPageconetentTree.vue' import searchResultList from '@/views/home/components/searchResultList.vue' import KnowledgeBase from '@/views/home/components/KnowledgeBase.vue' - import VideoSurveillance from '@/views/home/videoSurveillance' import DetailsPageResource from '@/views/home/components/DetailsPageResource.vue' + // import VideoSurveillance from '@/views/home/videoSurveillance' export default defineComponent({ setup() { // const store = useStore() @@ -536,6 +572,7 @@ '港口', '高速', ]) + const selBqTags = ref([]) const handleChangeBqTags = (tag, checked) => { loading.value = true @@ -721,20 +758,146 @@ const resourceList = reactive({ data: [] }) const videoList = reactive({ data: [] }) const resourceTotal = ref('') + // 基础设施数据 + const infrastructure = ref({ + status: true, + message: '查询成功！', + data: { + total: 77, + records: [ + { + serviceId: '516224376401072128', + name: '电子警察数据', + description: '电子警察数据', + type: 'data', + createDate: '2020-10-26T06:45:42.000+0000', + requestNum: 1540003, + requestQuantity: 154060, + starNum: 5, + }, + { + serviceId: '553628641336680448', + name: '婚姻信息', + description: null, + type: 'data', + createDate: '2021-02-01T06:44:56.270+0000', + requestNum: 389562, + requestQuantity: 107211740, + starNum: 5, + }, + { + serviceId: '553628691060154368', + name: '联系信息', + description: null, + type: 'data', + createDate: '2021-02-01T06:44:53.368+0000', + requestNum: 365069, + requestQuantity: 68082160, + starNum: 5, + }, + { + serviceId: '515975914317189120', + name: '成都出租车GPS数据开放服务', + description: '成都出租车GPS数据开放服务', + type: 'data', + createDate: '2020-10-22T03:24:16.000+0000', + requestNum: 300044, + requestQuantity: 57500, + starNum: 5, + }, + { + serviceId: '516224453593042944', + name: '设施数据', + description: '设施数据', + type: 'data', + createDate: '2020-10-26T03:43:18.000+0000', + requestNum: 200000, + requestQuantity: 2000000, + starNum: 5, + }, + { + serviceId: '516224413768126464', + name: '车道数据', + description: '车道数据', + type: 'data', + createDate: '2020-10-26T03:43:26.000+0000', + requestNum: 195007, + requestQuantity: 1950140, + starNum: 5, + }, + { + serviceId: '514474782668898304', + name: '共享库数据', + description: '共享库数据', + type: 'data', + createDate: '2020-10-22T03:24:02.000+0000', + requestNum: 154048, + requestQuantity: 1578100, + starNum: 5, + }, + { + serviceId: '514474693493800960', + name: '出租车GPS数据', + description: '出租车GPS数据', + type: 'data', + createDate: '2020-10-22T03:24:14.000+0000', + requestNum: 154044, + requestQuantity: 1574100, + starNum: 5, + }, + { + serviceId: '514475042631860224', + name: '出租车运营数据', + description: '出租车运营数据', + type: 'data', + createDate: '2020-10-22T03:24:11.000+0000', + requestNum: 154042, + requestQuantity: 1572100, + starNum: 5, + }, + { + serviceId: '514474984528166912', + name: '环保数据', + description: '环保数据', + type: 'data', + createDate: '2020-10-22T03:23:59.000+0000', + requestNum: 154038, + requestQuantity: 1568100, + starNum: 5, + }, + ], + pageNum: 1, + pageSize: 10, + size: 10, + startRow: 1, + endRow: 10, + pages: 8, + prePage: 0, + nextPage: 2, + isFirstPage: true, + isLastPage: false, + hasPreviousPage: false, + hasNextPage: true, + navigatePages: 8, + navigatepageNums: [1, 2, 3, 4, 5, 6, 7, 8], + navigateFirstPage: 1, + navigateLastPage: 8, + }, + }) const getAppResources = () => { paramsGetResources.name = searchValue.value paramsGetResources.type = Cardsname.value - pageWithAttrs(paramsGetResources).then((res) => { - console.log('查询列表============>', resourceList, res.data.data) - resourceList.data = [] - videoList.data = [] - if (Cardsname.value === '基础设施') { - console.log('基础设施~~~~~~~~~~~') - videoList.data = res.data.data.records || [] - resourceTotal.value = res.data.data.total || '' - loading.value = false - } else { + if ( + paramsGetResources.type == '组件服务' || + paramsGetResources.type == '应用资源' || + paramsGetResources.type == '基础设施' + ) { + pageWithAttrs(paramsGetResources).then((res) => { + console.log('查询列表============>', resourceList, res.data.data) + resourceList.data = [] + videoList.data = [] // resourceList.data = res.data.data.records || [] + debugger resourceTotal.value = res.data.data.total || '' getShoppingCartList(res.data.data.records) console.log( @@ -742,8 +905,32 @@ resourceList.data, resourceTotal.value ) - } - }) + }) + } + // } else if (paramsGetResources.type == '基础设施') { + // // videoList.data = res.data.data.records || [] + // // resourceTotal.value = infrastructure.value.data.total || '' + // // getShoppingCartList(infrastructure.value.data.records) + // // console.log( + // // '基础设施~~~~~~~~~~~', + // // resourceTotal.value, + // // resourceList.data + // // ) + // const params = { + // name: searchValue.value || '', + // pageNo: paramsGetResources.pageNum, + // pageSize: paramsGetResources.pageSize, + // } + + // getVideoList(params).then((res) => { + // // 赋值 + // res.data.data.list.forEach((val) => { + // val.id = val.serviceId + // }) + // resourceTotal.value = res.data.data.total + // resourceList.data = res.data.data.list + // }) + // } } let shoppingCartList = ref([]) // 获取申购车列表 @@ -948,7 +1135,7 @@ DownOutlined, KnowledgeBase, // VideoCameraOutlined, - VideoSurveillance, + // VideoSurveillance, DetailsPageResource, }, beforeUnmount() { diff --git a/front/src/views/newHome/components/Footer.vue b/front/src/views/newHome/components/Footer.vue index 4609ed53..5bba928b 100644 --- a/front/src/views/newHome/components/Footer.vue +++ b/front/src/views/newHome/components/Footer.vue @@ -1,13 +1,21 @@ +