Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

# Conflicts:
#	front/src/views/assertReport/components/ReservoirBottom.vue
#	front/src/views/assertReport/components/ReservoirRight.vue
#	front/src/views/assertReport/components/ReservoirThumbnail.vue
#	front/src/views/assertReport/index.vue
This commit is contained in:
gongjiale 2022-11-29 13:56:18 +08:00
commit dbdb6d7cea
7 changed files with 1024 additions and 1051 deletions

View File

@ -2,13 +2,13 @@
* @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-11-27 23:42:04
* @LastEditTime: 2022-11-29 11:21:41
* @Description: 系统静态参数配置
*/
var _global = {}
var CONFIGITEM = {
// version: 'qingdao', //
version: 'xihaian', // 西
version: 'qingdao', //
// version: 'xihaian', // 西
// version: 'dev', //
// version: 'zhanTingDev', // dev (2022-09-13:)
// version: 'qingdao', //

File diff suppressed because one or more lines are too long

View File

@ -1,3 +1,10 @@
/*
* @Author: hisense.wuhongjian
* @Date: 2022-11-28 16:43:10
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-11-29 11:35:36
* @Description: 告诉大家这是什么
*/
import request from '@/utils/request'
//
export function getDistrictFundStatement() {

View File

@ -1,4 +1,3 @@
<template>
<div class="right-survey">
@ -113,7 +112,7 @@ export default {
.platform-overview-bottom {
margin-top: 20px;
margin-top: 5px;
width: 100%;
height: 1.78rem;
background: rgba(0, 108, 188, 0.2);

View File

@ -1,4 +1,3 @@
<template>
<div class="right-survey">
<!--最上面 部门排行榜-->
@ -7,7 +6,7 @@
<div class="bottom1">
<div class="bottom-item">
<div class="inner-title">
<p style="width: 220px">市级部门共享贡献资金排行</p>
<p style="width: 220px">市级部门共享节省资金排行</p>
</div>
<div class="left-list">
<div class="left-list1">排行</div>
@ -39,7 +38,7 @@
<div class="bottom-item">
<div class="inner-title">
<p style="width: 220px">市级部门审评节省资金排行</p>
<p style="width: 220px">市级部门申请节省资金排行</p>
</div>
<div class="left-list">
<div class="left-list1">排行</div>
@ -69,7 +68,7 @@
<div class="bottom2">
<div class="bottom-item">
<div class="inner-title">
<p style="width: 220px">区市部门共享贡献资金排行</p>
<p style="width: 220px">区市部门共享节省资金</p>
</div>
<div class="left-list">
<div class="left-list1">序号</div>
@ -100,7 +99,7 @@
</div>
<div class="bottom-item">
<div class="inner-title">
<p style="width: 220px">区市部门申请节省资金排行</p>
<p style="width: 220px">区市部门申请节省资金</p>
</div>
<div class="left-list">
<div class="left-list1">序号</div>
@ -159,7 +158,7 @@ import {
export default {
components: {},
created() {},
destroyed() {},
unmounted() {},
mounted() {
this.getgetProvideDeptFund()
@ -268,7 +267,7 @@ export default {
},
}
</script>
<style lang='less' scoped>
<style lang="less" scoped>
@keyframes turn {
0% {
border-image: linear-gradient(to right, #003194, #00ffea) 1;
@ -327,17 +326,19 @@ export default {
transition: all 100ms ease-out;
.top {
font-size: 24px;
background: url('~@/assets/capabilityCloud/infrastructure_title.png') no-repeat;
background: url('~@/assets/capabilityCloud/infrastructure_title.png')
no-repeat;
background-size: 100% 100%;
text-align: center;
}
.bottom1 {
margin-top: 10px;
width: 100%;
display: table;
// display: flex;
justify-content: space-between;
align-items: center;
height: 1.8rem;
height: 2.5rem;
overflow-y: auto;
.bottom-item {
width: 98%;
}
@ -349,7 +350,7 @@ export default {
display: table;
justify-content: space-between;
align-items: center;
height: 4.0rem;
height: 4rem;
.bottom-item {
width: 48%;
}
@ -360,20 +361,22 @@ export default {
}
.bottom-item {
height: 100%;
overflow-y: auto;
background: rgba(0, 108, 188, 0.2);
border-radius: 2px;
margin: 2px 5px;
border: 1px solid #10496f;
.inner-title {
margin-top: 5px;
margin-top: 10px;
margin-bottom: 10px;
margin-right: 5px;
font-weight: bold;
color: #ffffff;
p {
font-size: 16px;
line-height: 27px;
background: linear-gradient(
90deg,
#041d2f 0,
@ -393,7 +396,7 @@ export default {
width: 100%;
height: 26px;
margin-right: 10px;
margin-top: 5px;
font-size: 16px;
.left-list1 {
font-size: 16x;
@ -455,7 +458,8 @@ export default {
transition: all 100ms ease-out;
.top {
font-size: 24px;
background: url('~@/assets/capabilityCloud/infrastructure_title.png') no-repeat;
background: url('~@/assets/capabilityCloud/infrastructure_title.png')
no-repeat;
background-size: 100% 100%;
text-align: center;
}

View File

@ -1,8 +1,8 @@
<!--
* @Author: hisense.xiaoshangqing
* @Date: 2022-7-26 10:00:48
* @LastEditors: xiaoshangqing
* @LastEditTime: 2022-07-27 16:56:55
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-11-29 11:47:26
* @Description: 水库专题首页缩略图 -->
<template>
<div class="river-course-view">
@ -13,116 +13,96 @@
<div class="topic-animation4 display-animation4"></div>
<div class="topic-animation5 display-animation5"></div>
<div class="topic-animation6 display-animation6"></div>
</div>
</template>
<script>
import {
getDistrictFundStatement
} from '@/api/assertReport'
import { getProvideDistrictFundStatement } from '@/api/assertReport'
import axios from 'axios'
const echarts = require("echarts");
const echarts = require('echarts')
export default {
//import使
components: {},
data() {
//
return {
districtData: [
{
name: "市南区",
name: '市南区',
value: [120.395966, 36.000892],
},
{
name: "市北区",
name: '市北区',
value: [120.355026, 36.083819],
},
{
name: "李沧区",
name: '李沧区',
value: [120.421236, 36.188023],
},
{
name: "崂山区",
name: '崂山区',
value: [120.587393, 36.199569],
},
{
name: "城阳区",
name: '城阳区',
value: [120.369135, 36.266833],
},
{
name: "即墨区",
name: '即墨区',
value: [120.517352, 36.490847],
},
{
name: "莱西市",
name: '莱西市',
value: [120.426226, 36.86009],
},
{
name: "胶州市",
name: '胶州市',
value: [120.010202, 36.235878],
},
{
name: "平度市",
name: '平度市',
value: [119.959012, 36.788828],
},
{
name: "西海岸新区",
name: '西海岸新区',
value: [119.895518, 35.875138],
},
],
};
}
},
mounted() {
this.findAllInfo();
this.findAllInfo()
},
//
methods: {
findAllInfo() {
getDistrictFundStatement().then((res) => {
getProvideDistrictFundStatement().then((res) => {
let districtData = this.districtData
let resulrtData = res.data.data
for (let i = 0; i < resulrtData.length; i++) {
for (let j = 0; j < districtData.length; j++) {
if (resulrtData[i].districtName === districtData[j].name) {
districtData[j].num=resulrtData[i].applyPrice
districtData[j].num = resulrtData[i].applyPrice + '万'
}
}
}
debugger
console.log('上图数据', districtData)
this.initMap(districtData)
})
},
initMap(data) {
this.loadedDataUrl = "./static/qingdao.json";
this.loadedDataUrl = './static/qingdao.json'
let _this = this
axios.get(_this.loadedDataUrl, {}) .then(geoJson =>{
_this.myChart = echarts.init(_this.$refs.qdCityMap);
echarts.registerMap("qingdao", geoJson.data);
const imgBack = new Image();
imgBack.src = "./static/assets/map-back.png";
const img = new Image();
img.src = "./static/assets/echarts-map-bak.png";
const typeImg = new Image();
typeImg.src = "./static/assets/reservoir-type-bak.png";
axios.get(_this.loadedDataUrl, {}).then((geoJson) => {
_this.myChart = echarts.init(_this.$refs.qdCityMap)
echarts.registerMap('qingdao', geoJson.data)
const imgBack = new Image()
imgBack.src = './static/assets/map-back.png'
const img = new Image()
img.src = './static/assets/echarts-map-bak.png'
const typeImg = new Image()
typeImg.src = './static/assets/reservoir-type-bak.png'
_this.option = {
visualMap: {
@ -130,12 +110,12 @@ export default {
max: 100,
seriesIndex: 1,
inRange: {
color: ["#000000", "yellow", "pink"],
color: ['#000000', 'yellow', 'pink'],
},
},
geo: [
{
map: "qingdao",
map: 'qingdao',
roam: false, //
aspectScale: 0.8,
zoom: 1.1, //
@ -144,14 +124,14 @@ export default {
label: {
show: true, //
textStyle: {
color: "#ffffff", //
color: '#ffffff', //
fontSize: 16, //
fontFamily: "微软雅黑",
backgroundColor: "rgba(0,0,0,0)", //0
fontFamily: '微软雅黑',
backgroundColor: 'rgba(0,0,0,0)', //0
},
},
itemStyle: {
borderColor: "#25e8ff",
borderColor: '#25e8ff',
borderWidth: 2,
/* areaColor: "#004d8e", //rgba设置透明度0
shadowColor: "#10daff",
@ -160,12 +140,12 @@ export default {
opacity: 0.53, */
areaColor: {
image: img,
repeat: "repeat",
repeat: 'repeat',
},
},
emphasis: {
disabled: false,
focus: "none",
focus: 'none',
itemStyle: {
color: null,
},
@ -176,15 +156,15 @@ export default {
},
},
{
map: "qingdao",
map: 'qingdao',
aspectScale: 0.8,
roam: false, //
zoom: 1.1, //
top: 105,
z: 4,
itemStyle: {
areaColor: "#1864a5",
borderColor: "transparent",
areaColor: '#1864a5',
borderColor: 'transparent',
},
silent: true,
tooltip: {
@ -192,15 +172,15 @@ export default {
},
},
{
map: "qingdao",
map: 'qingdao',
aspectScale: 0.8,
roam: false, //
zoom: 1.1, //
top: 110,
z: 3,
itemStyle: {
areaColor: "#1864a5",
borderColor: "transparent",
areaColor: '#1864a5',
borderColor: 'transparent',
borderWidth: 2,
},
silent: true,
@ -209,19 +189,19 @@ export default {
},
},
{
map: "qingdao",
map: 'qingdao',
aspectScale: 0.8,
roam: false, //
roam: true, //
zoom: 1.1, //
top: 115,
z: 2,
itemStyle: {
areaColor: "#1864a5",
areaColor: '#1864a5',
//borderColor: "#0f3866",
borderColor: "transparent",
borderColor: 'transparent',
borderWidth: 1,
shadowColor: "#808080", //
shadowBlur: "10",
shadowColor: '#808080', //
shadowBlur: '10',
},
silent: true,
tooltip: {
@ -278,9 +258,9 @@ export default {
normal: {
show: true,
formatter: function (params) {
var name = params.data.num;
var text = `{fline|${name}}`;
return text;
var name = params.data.num
var text = `{fline|${name}}`
return text
},
color: '#fff',
rich: {
@ -308,19 +288,16 @@ export default {
itemStyle: {
color: '#e3e00a',
},
symbol: "image://static/assets/reservoir-type-bak.png",
symbol: 'image://static/assets/reservoir-type-bak.png',
symbolSize: [84, 28],
symbolOffset: [0, -30],
z: 999,
data: data, //
},
],
};
_this.myChart.setOption(_this.option);
_this.myChart.on("click", (params) => {
}
_this.myChart.setOption(_this.option)
_this.myChart.on('click', (params) => {
// console.log("", params);
// //
// //name
@ -334,31 +311,28 @@ export default {
// latitude:_this.districtData[index].value[1],
// };
// _this.$emit('jumpIntoMap',districtObject);
});
});
})
})
},
},
beforeCreate() {}, // -
beforeMount() {}, // -
beforeUpdate() {}, // -
updated() {}, // -
beforeDestroy() {}, // -
destroyed() {}, // -
beforeUnmount() {}, // -
unmounted() {}, // -
activated() {}, //keep-alive
};
}
</script>
<style lang='less' scoped>
<style lang="less" scoped>
//@import url(); css
.river-course-view {
position: relative;
width: 100%;
height: 100%;
background: url("~@/assets/common/homePage/big-bak.png") no-repeat;
background: url('~@/assets/common/homePage/big-bak.png') no-repeat;
background-size: 100% 100%;
.city-map-content-echarts {
width: 10rem;
@ -450,7 +424,7 @@ export default {
position: absolute;
margin: 0px auto;
background-image: url("~@/assets/common/homePage/animation1.png");
background-image: url('~@/assets/common/homePage/animation1.png');
background-size: cover;
}
.display-animation1 {
@ -462,7 +436,7 @@ export default {
position: absolute;
margin: 0px auto;
background-image: url("~@/assets/common/homePage/animation2.png");
background-image: url('~@/assets/common/homePage/animation2.png');
background-size: cover;
}
.display-animation2 {
@ -474,7 +448,7 @@ export default {
position: absolute;
margin: 0px auto;
background-image: url("~@/assets/common/homePage/animation3.png");
background-image: url('~@/assets/common/homePage/animation3.png');
background-size: cover;
}
.display-animation3 {
@ -486,7 +460,7 @@ export default {
position: absolute;
margin: 0px auto;
background-image: url("~@/assets/common/homePage/animation4.png");
background-image: url('~@/assets/common/homePage/animation4.png');
background-size: cover;
}
.display-animation4 {
@ -498,7 +472,7 @@ export default {
position: absolute;
margin: 0px auto;
background-image: url("~@/assets/common/homePage/animation5.png");
background-image: url('~@/assets/common/homePage/animation5.png');
background-size: cover;
}
.display-animation5 {
@ -510,7 +484,7 @@ export default {
position: absolute;
margin: 0px auto;
background-image: url("~@/assets/common/homePage/animation6.png");
background-image: url('~@/assets/common/homePage/animation6.png');
background-size: cover;
}
.display-animation6 {

View File

@ -1,9 +1,6 @@
<!-- -->
<template>
<div class="capability-cloud">
<div class="header">
<span class="title" @click="goHome">城市云脑通用能力服务平台</span>
</div>
@ -19,8 +16,9 @@
</template>
<div class="mianJi">万元</div>
</div>
<div style=" color: #bed1df; font-size: 16px">资源参考价格由部门提供或参考市场价格设定</div>
<div style="color: #bed1df; font-size: 16px">
资源参考价格由部门提供或参考市场价格设定
</div>
</div>
<!--左侧-->
<div class="reservoir-left">
@ -41,40 +39,35 @@
<!--下方-->
<div class="bottom">
<reservoir-bottom />
</div>
</div>
</template>
<script>
import {
getApplyPriceCount
} from '@/api/assertReport'
import ReservoirThumbnail from "./components/ReservoirThumbnail.vue";
import ReservoirLeft from "./components/ReservoirLeft";
import ReservoirRight from "./components/ReservoirRight";
import ReservoirBottom from "./components/ReservoirBottom";
import { NumbersConvertedToArrays } from "@/utils/arrayMethod.js";
import { getApplyPriceCount } from '@/api/assertReport'
import ReservoirThumbnail from './components/ReservoirThumbnail.vue'
import ReservoirLeft from './components/ReservoirLeft'
import ReservoirRight from './components/ReservoirRight'
import ReservoirBottom from './components/ReservoirBottom'
import { NumbersConvertedToArrays } from '@/utils/arrayMethod.js'
export default {
//import使
components: {
ReservoirThumbnail,
ReservoirLeft,
ReservoirRight,
ReservoirBottom
ReservoirBottom,
},
data() {
//
return {
saveMonmy: [],
model: "common",
dialogTitle: "周边视频",
model: 'common',
dialogTitle: '周边视频',
videoAnalysisDialogVisible: false, //
riverCourseHistoryDialogVisible: false, //
riverDetailInfo: {}, //
dialogType: "add",
dialogType: 'add',
dialogData: {},
dangerReportDialogVisible: false,
positionInfo: null,
@ -82,11 +75,11 @@ export default {
districtOptions: [], //
isThumbnail: true, //
tabindex: 0, //3dtab
listType:"",// warnig
listType: '', // warnig
basicInfo: {}, //
type: '',
callSource:"indexPage",
};
callSource: 'indexPage',
}
},
// data
computed: {},
@ -96,17 +89,15 @@ export default {
methods: {
getSaveMoney() {
getApplyPriceCount().then((res) => {
this.saveMonmy = NumbersConvertedToArrays(res.data.data)
})
}
},
},
mounted() {
this.getSaveMoney()
},
};
}
</script>
<style lang="less">
@font-face {
@ -135,7 +126,7 @@ export default {
}
}
</style>
<style lang='less' scoped>
<style lang="less" scoped>
// scopeddate-pickerreservoir
//@import url(); css
.module-header-container {
@ -158,15 +149,15 @@ export default {
font-size: 0.46rem;
}
.bottom {
bottom: 9px;
bottom: 12px;
position: absolute;
left: 545px;
width: 732px;
align-items: center;
z-index: 1004;
text-align: center;
height: 1.95rem;
height: 1.8rem;
}
.header1 {
top: 78px;
@ -188,8 +179,8 @@ export default {
// line-height: 45px;
color: #fed93f;
font-weight: bold;
background: url("~@/assets/capabilityCloud/num_bg.png")
100% 100% no-repeat;
background: url('~@/assets/capabilityCloud/num_bg.png') 100% 100%
no-repeat;
background-size: 100%;
text-align: center;
font-size: 34px;
@ -198,7 +189,7 @@ export default {
font-family: DinPro-Bold;
}
.mianJi {
margin-top: 6px;;
margin-top: 6px;
margin-right: 3px;
font-size: 22px;
float: right;
@ -284,6 +275,4 @@ export default {
border-color: #009ab3;
}
}
</style>