wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

演示版本修改

This commit is contained in:
wuhongjian 2022-11-08 17:09:46 +08:00
parent 2b972db97f
commit ce685dfb36
6 changed files with 182 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
front/public/static/config/basicConfig.js
View File

@ -2,17 +2,17 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23 * @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-11-04 14:48:01 * @LastEditTime: 2022-11-05 21:38:13
* @Description: 系统静态参数配置 * @Description: 系统静态参数配置
*/ */
var _global = {} var _global = {}
var CONFIGITEM = { var CONFIGITEM = {
// version: 'qingdao', //青岛 // version: 'qingdao', //青岛
// version: 'xihaian', // 西海岸 // version: 'xihaian', // 西海岸
version: 'dev', // 开发 // version: 'dev', // 开发
// version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加) // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
// version: 'qingdao', // 测试 // version: 'qingdao', // 测试
//version: 'frp', // 内网穿透 version: 'frp', // 内网穿透
vNum: 'v0.8.15.2', vNum: 'v0.8.15.2',
configData: { configData: {
// 青岛市大数据局 // 青岛市大数据局

34
front/public/static/config/location.js
View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23 * @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-10-13 20:53:24 * @LastEditTime: 2022-11-05 22:24:53
* @Description: 数据资源参数配置 * @Description: 数据资源参数配置
*/ */
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
@ -47,23 +47,23 @@ if (newLocation !== 'baotou' && newLocation !== 'xihaian') {
] ]
footerDataList.footerList = { footerDataList.footerList = {
company: { company: {
left: '青岛市大数据发展管理局', left: '山东省大数据局',
right: '政府标识码3702000106', right: '政府标识码3700000097',
}, },
address: [ // address: [
{ // {
name: '邮编: 266071', // name: '邮编: 266071',
value: 'Email: QDDSJJ@qingdao.shandong.cn', // value: 'Email: QDDSJJ@qingdao.shandong.cn',
}, // },
{ // {
name: '版权所有：青岛市大数据发展管理局', // name: '版权所有：青岛市大数据发展管理局',
value: '地址：山东省青岛市香港中路17号市级机关三号办公楼', // value: '地址：山东省青岛市香港中路17号市级机关三号办公楼',
}, // },
{ // {
name: '电话：0532-85912587', // name: '电话：0532-85912587',
value: '传真：0532-85912181', // value: '传真：0532-85912181',
}, // },
], // ],
} }
mapTestNum.lsNum = [ mapTestNum.lsNum = [
{ {

181
front/src/views/abilityStatistics/components/ResourceAggregation.vue
View File

@ -98,11 +98,85 @@
// }) // })
// }) // })
// } // }
selectTotal().then((res) => { // selectTotal().then((res) => {
console.log('selectTotal===============>', res) // console.log('selectTotal===============>', res)
if (res.data.code !== 0) { // if (res.data.code !== 0) {
return message.error(res.data.msg) // 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 = { let imgObj = {
GIS图层: require('../../../assets/abilityStatistics/banner-zj.png'), GIS图层: require('../../../assets/abilityStatistics/banner-zj.png'),
应用系统: require('../../../assets/abilityStatistics/banner-yy.png'), 应用系统: require('../../../assets/abilityStatistics/banner-yy.png'),
@ -110,73 +184,38 @@
数据资源: require('../../../assets/abilityStatistics/banner-sj.png'), 数据资源: require('../../../assets/abilityStatistics/banner-sj.png'),
云网资源: require('../../../assets/abilityStatistics/banner-zs.png'), 云网资源: require('../../../assets/abilityStatistics/banner-zs.png'),
} }
res.data.data.total.forEach((val) => { dataList.value.dataList = [
let _obj = { {
organization: '项', organization: '项',
type: val.type, type: 'GIS图层',
photo: val.type && imgObj[val.type], photo: imgObj['GIS图层'],
amount: val.count, amount: 434,
} },
if (val.type == '视频资源') { {
if (uavAndIndividualSoldier.num) { organization: '项',
_obj.amount = val.count - 0 + uavAndIndividualSoldier.num type: '应用系统',
} photo: imgObj['应用系统'],
} amount: 201,
if (val.type == '云网资源') { },
_obj.organization = '条' {
} organization: '项',
dataList.value.dataList.push(_obj) type: '视频资源',
// switch (val.type) { photo: imgObj['视频资源'],
// case 'GIS图层': amount: 7865,
// dataList.value.dataList.push({ },
// organization: '项', {
// type: 'GIS图层', organization: '项',
// photo: require('../../../assets/abilityStatistics/banner-zj.png'), type: '数据资源',
// amount: val.count, photo: imgObj['数据资源'],
// }) amount: 10,
// break },
// case '应用系统': {
// dataList.value.dataList.push({ organization: '项',
// organization: '项', type: '云网资源',
// type: '应用系统', photo: imgObj['云网资源'],
// photo: require('../../../assets/abilityStatistics/banner-yy.png'), amount: 20,
// 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 datas = ref([]) let datas = ref([])
let laiyuanDataList = ref([]) let laiyuanDataList = ref([])
// let dataSourceNum = ref(0) // let dataSourceNum = ref(0)

20
front/src/views/detailsAll/ApplicationDetails.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-08 11:32:22 * @Date: 2022-06-08 11:32:22
* @LastEditors: Light * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-11-03 16:52:08 * @LastEditTime: 2022-11-05 22:16:30
* @Description: 应用详情页 * @Description: 应用详情页
--> -->
<template> <template>
@ -11,21 +11,21 @@
<application-top-details <application-top-details
:dataList="dataList.data" :dataList="dataList.data"
></application-top-details> ></application-top-details>
<div style="position: absolute; top: 240px; left: 320px"> <div style="position: absolute; top: 2.4rem; left: 3.2rem">
<div style="display: flex; align-items: center; color: #99ffff"> <div style="display: flex; align-items: center; color: #99ffff">
<i class="jc"></i> <i class="jc"></i>
<div style="margin-left: 10px">能力基本信息</div> <div style="margin-left: 0.1rem">能力基本信息</div>
</div> </div>
<div <div
style=" style="
display: flex; display: flex;
align-items: center; align-items: center;
color: #67b1fc; color: #67b1fc;
margin-top: 450px; margin-top: 4.5rem;
" "
> >
<i class="kz"></i> <i class="kz"></i>
<div style="margin-left: 10px">能力扩展信息</div> <div style="margin-left: 0.1rem">能力扩展信息</div>
</div> </div>
</div> </div>
<!-- 导航 --> <!-- 导航 -->
@ -234,15 +234,15 @@
margin-top: 0.84rem; margin-top: 0.84rem;
} }
.jc { .jc {
width: 15px; width: 0.15rem;
height: 15px; height: 0.15rem;
background: url('~@/assets/home/jc.png') no-repeat; background: url('~@/assets/home/jc.png') no-repeat;
background-size: 100%; background-size: 100%;
background-position: center; background-position: center;
} }
.kz { .kz {
width: 15px; width: 0.15rem;
height: 15px; height: 0.15rem;
background: url('~@/assets/home/kz.png') no-repeat; background: url('~@/assets/home/kz.png') no-repeat;
background-size: 100%; background-size: 100%;
background-position: center; background-position: center;

5
front/src/views/home/components/header.vue
View File

@ -442,6 +442,7 @@
width: 1.4rem; width: 1.4rem;
margin-left: 0.1rem; margin-left: 0.1rem;
background: url('~@/assets/newHome/yiwang.png') no-repeat; background: url('~@/assets/newHome/yiwang.png') no-repeat;
background-size: contain;
} }
} }
@ -464,7 +465,8 @@
width: 0.8rem; width: 0.8rem;
border-radius: 0.1rem; border-radius: 0.1rem;
background: url('~@/assets/newHome/yiwang.png') no-repeat; background: url('~@/assets/newHome/yiwang.png') no-repeat;
background-size: 100%; // background-size: 100%;
background-size: contain;
} }
span { span {
@ -625,6 +627,7 @@
height: 0.35rem; height: 0.35rem;
background: url('~@/assets/newHome/iconTo.png') no-repeat; background: url('~@/assets/newHome/iconTo.png') no-repeat;
cursor: pointer; cursor: pointer;
background-size: contain;
} }
</style> </style>
<style> <style>

60
front/src/views/newHome/components/Navigation2.vue
View File

@ -65,11 +65,11 @@
const router = useRouter() const router = useRouter()
const store = useStore() const store = useStore()
// import mybus from '@/myplugins/mybus' // import mybus from '@/myplugins/mybus'
const yyNum = ref('') const yyNum = ref('201')
const zjNum = ref('') const zjNum = ref('434')
const jcNum = ref('') const jcNum = ref('7865')
const sjNum = ref('') const sjNum = ref('10')
const zsNum = ref('') const zsNum = ref('20')
// mybus.on('chagneNum', (obj) => { // mybus.on('chagneNum', (obj) => {
// console.log('更改数据============>', obj) // console.log('更改数据============>', obj)
// yyNum.value = obj.yyNum // yyNum.value = obj.yyNum
@ -78,31 +78,31 @@
// sjNum.value = obj.sjNum // sjNum.value = obj.sjNum
// zsNum.value = obj.zsNum // zsNum.value = obj.zsNum
// }) // })
selectTotal().then((res) => { // selectTotal().then((res) => {
console.log('selectTotal===============>', res.data.data) // console.log('selectTotal===============>', res.data.data)
res.data.data.total.forEach((val) => { // res.data.data.total.forEach((val) => {
switch (val.type) { // switch (val.type) {
case 'GIS图层': // case 'GIS图层':
zjNum.value = val.count // zjNum.value = val.count
break // break
case '应用系统': // case '应用系统':
yyNum.value = val.count // yyNum.value = val.count
break // break
case '视频资源': // case '视频资源':
jcNum.value = val.count // jcNum.value = val.count
if (uavAndIndividualSoldier.num) { // if (uavAndIndividualSoldier.num) {
jcNum.value = jcNum.value - 0 + uavAndIndividualSoldier.num // jcNum.value = jcNum.value - 0 + uavAndIndividualSoldier.num
} // }
break // break
case '数据资源': // case '数据资源':
sjNum.value = val.count // sjNum.value = val.count
break // break
case '云网资源': // case '云网资源':
zsNum.value = val.count // zsNum.value = val.count
break // break
} // }
}) // })
}) // })
function jumpPage(type) { function jumpPage(type) {
// 点击内存入store // 点击内存入store
store.commit('home/selectCardsData', { store.commit('home/selectCardsData', {