diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index fede4d93..ac149ed0 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -2,17 +2,17 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-11-04 14:48:01 + * @LastEditTime: 2022-11-05 21:38:13 * @Description: 系统静态参数配置 */ var _global = {} var CONFIGITEM = { // version: 'qingdao', //青岛 // version: 'xihaian', // 西海岸 - version: 'dev', // 开发 + // version: 'dev', // 开发 // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加) // version: 'qingdao', // 测试 - //version: 'frp', // 内网穿透 + version: 'frp', // 内网穿透 vNum: 'v0.8.15.2', configData: { // 青岛市大数据局 diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index 975e12f0..761a9317 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.wuhongjian - * @LastEditTime: 2022-10-13 20:53:24 + * @LastEditTime: 2022-11-05 22:24:53 * @Description: 数据资源参数配置 */ // eslint-disable-next-line no-undef @@ -47,23 +47,23 @@ if (newLocation !== 'baotou' && newLocation !== 'xihaian') { ] footerDataList.footerList = { company: { - left: '青岛市大数据发展管理局', - right: '政府标识码3702000106', + left: '山东省大数据局', + right: '政府标识码3700000097', }, - address: [ - { - name: '邮编: 266071', - value: 'Email: QDDSJJ@qingdao.shandong.cn', - }, - { - name: '版权所有:青岛市大数据发展管理局', - value: '地址:山东省青岛市香港中路17号市级机关三号办公楼', - }, - { - name: '电话:0532-85912587', - value: '传真:0532-85912181', - }, - ], + // address: [ + // { + // name: '邮编: 266071', + // value: 'Email: QDDSJJ@qingdao.shandong.cn', + // }, + // { + // name: '版权所有:青岛市大数据发展管理局', + // value: '地址:山东省青岛市香港中路17号市级机关三号办公楼', + // }, + // { + // name: '电话:0532-85912587', + // value: '传真:0532-85912181', + // }, + // ], } mapTestNum.lsNum = [ { diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue index e74d7dbd..83f49b34 100644 --- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue +++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue @@ -98,85 +98,124 @@ // }) // }) // } - selectTotal().then((res) => { - console.log('selectTotal===============>', res) - if (res.data.code !== 0) { - return message.error(res.data.msg) - } - let imgObj = { - GIS图层: require('../../../assets/abilityStatistics/banner-zj.png'), - 应用系统: require('../../../assets/abilityStatistics/banner-yy.png'), - 视频资源: require('../../../assets/abilityStatistics/banner-jc.png'), - 数据资源: require('../../../assets/abilityStatistics/banner-sj.png'), - 云网资源: require('../../../assets/abilityStatistics/banner-zs.png'), - } - res.data.data.total.forEach((val) => { - let _obj = { - organization: '项', - type: val.type, - photo: val.type && imgObj[val.type], - amount: val.count, - } - if (val.type == '视频资源') { - if (uavAndIndividualSoldier.num) { - _obj.amount = val.count - 0 + uavAndIndividualSoldier.num - } - } - if (val.type == '云网资源') { - _obj.organization = '条' - } - dataList.value.dataList.push(_obj) - // switch (val.type) { - // case 'GIS图层': - // dataList.value.dataList.push({ - // organization: '项', - // type: 'GIS图层', - // photo: require('../../../assets/abilityStatistics/banner-zj.png'), - // amount: val.count, - // }) - // break - // case '应用系统': - // dataList.value.dataList.push({ - // organization: '项', - // type: '应用系统', - // photo: require('../../../assets/abilityStatistics/banner-yy.png'), - // amount: val.count, - // }) - // break - // case '视频资源': - // if (uavAndIndividualSoldier.num) { - // val.count = val.count - 0 + uavAndIndividualSoldier.num - // } - // dataList.value.dataList.push({ - // organization: '项', - // type: '视频资源', - // photo: require('../../../assets/abilityStatistics/banner-jc.png'), - // amount: val.count, - // }) - // break - // case '数据资源': - // dataList.value.dataList.push({ - // organization: '项', - // type: '数据资源', - // photo: require('../../../assets/abilityStatistics/banner-sj.png'), - // amount: val.count, - // }) - // break - // case '云网资源': - // dataList.value.dataList.push({ - // organization: '项', - // type: '云网资源', - // photo: require('../../../assets/abilityStatistics/banner-zs.png'), - // amount: val.count, - // }) - // break - // } - }) - let arr = ['GIS图层', '应用系统', '视频资源', '数据资源', '云网资源'] - dataList.value.dataList.sort((a, b) => { - return arr.indexOf(a.type) - arr.indexOf(b.type) - }) - }) + // selectTotal().then((res) => { + // console.log('selectTotal===============>', res) + // if (res.data.code !== 0) { + // return message.error(res.data.msg) + // } + // let imgObj = { + // GIS图层: require('../../../assets/abilityStatistics/banner-zj.png'), + // 应用系统: require('../../../assets/abilityStatistics/banner-yy.png'), + // 视频资源: require('../../../assets/abilityStatistics/banner-jc.png'), + // 数据资源: require('../../../assets/abilityStatistics/banner-sj.png'), + // 云网资源: require('../../../assets/abilityStatistics/banner-zs.png'), + // } + // res.data.data.total.forEach((val) => { + // let _obj = { + // organization: '项', + // type: val.type, + // photo: val.type && imgObj[val.type], + // amount: val.count, + // } + // if (val.type == '视频资源') { + // if (uavAndIndividualSoldier.num) { + // _obj.amount = val.count - 0 + uavAndIndividualSoldier.num + // } + // } + // if (val.type == '云网资源') { + // _obj.organization = '条' + // } + // dataList.value.dataList.push(_obj) + // // switch (val.type) { + // // case 'GIS图层': + // // dataList.value.dataList.push({ + // // organization: '项', + // // type: 'GIS图层', + // // photo: require('../../../assets/abilityStatistics/banner-zj.png'), + // // amount: val.count, + // // }) + // // break + // // case '应用系统': + // // dataList.value.dataList.push({ + // // organization: '项', + // // type: '应用系统', + // // photo: require('../../../assets/abilityStatistics/banner-yy.png'), + // // amount: val.count, + // // }) + // // break + // // case '视频资源': + // // if (uavAndIndividualSoldier.num) { + // // val.count = val.count - 0 + uavAndIndividualSoldier.num + // // } + // // dataList.value.dataList.push({ + // // organization: '项', + // // type: '视频资源', + // // photo: require('../../../assets/abilityStatistics/banner-jc.png'), + // // amount: val.count, + // // }) + // // break + // // case '数据资源': + // // dataList.value.dataList.push({ + // // organization: '项', + // // type: '数据资源', + // // photo: require('../../../assets/abilityStatistics/banner-sj.png'), + // // amount: val.count, + // // }) + // // break + // // case '云网资源': + // // dataList.value.dataList.push({ + // // organization: '项', + // // type: '云网资源', + // // photo: require('../../../assets/abilityStatistics/banner-zs.png'), + // // amount: val.count, + // // }) + // // break + // // } + // }) + // let arr = ['GIS图层', '应用系统', '视频资源', '数据资源', '云网资源'] + // dataList.value.dataList.sort((a, b) => { + // return arr.indexOf(a.type) - arr.indexOf(b.type) + // }) + // }) + let imgObj = { + GIS图层: require('../../../assets/abilityStatistics/banner-zj.png'), + 应用系统: require('../../../assets/abilityStatistics/banner-yy.png'), + 视频资源: require('../../../assets/abilityStatistics/banner-jc.png'), + 数据资源: require('../../../assets/abilityStatistics/banner-sj.png'), + 云网资源: require('../../../assets/abilityStatistics/banner-zs.png'), + } + dataList.value.dataList = [ + { + organization: '项', + type: 'GIS图层', + photo: imgObj['GIS图层'], + amount: 434, + }, + { + organization: '项', + type: '应用系统', + photo: imgObj['应用系统'], + amount: 201, + }, + { + organization: '项', + type: '视频资源', + photo: imgObj['视频资源'], + amount: 7865, + }, + { + organization: '项', + type: '数据资源', + photo: imgObj['数据资源'], + amount: 10, + }, + { + organization: '项', + type: '云网资源', + photo: imgObj['云网资源'], + amount: 20, + }, + ] let datas = ref([]) let laiyuanDataList = ref([]) // let dataSourceNum = ref(0) diff --git a/front/src/views/detailsAll/ApplicationDetails.vue b/front/src/views/detailsAll/ApplicationDetails.vue index bb3fa865..6675d524 100644 --- a/front/src/views/detailsAll/ApplicationDetails.vue +++ b/front/src/views/detailsAll/ApplicationDetails.vue @@ -1,8 +1,8 @@