bug修复

This commit is contained in:
wuhongjian 2022-11-29 11:57:33 +08:00
parent b8e51270fd
commit 953fe9e18f
9 changed files with 1114 additions and 1194 deletions

View File

@ -2,13 +2,13 @@
* @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-27 23:42:04 * @LastEditTime: 2022-11-29 11:21:41
* @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', //

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' import request from '@/utils/request'
// //
export function getDistrictFundStatement() { export function getDistrictFundStatement() {
@ -12,61 +19,61 @@ export function getComponentFundStatement() {
url: '/processForm/tabilityapplication/getComponentFundStatement', url: '/processForm/tabilityapplication/getComponentFundStatement',
method: 'get', method: 'get',
}) })
} }
// //
export function getResourceFundStatement() { export function getResourceFundStatement() {
return request({ return request({
url: '/processForm/tabilityapplication/getResourceFundStatement', url: '/processForm/tabilityapplication/getResourceFundStatement',
method: 'get', method: 'get',
}) })
} }
// //
export function getInfrastructureFundStatement() { export function getInfrastructureFundStatement() {
return request({ return request({
url: '/processForm/tabilityapplication/getInfrastructureFundStatement', url: '/processForm/tabilityapplication/getInfrastructureFundStatement',
method: 'get', method: 'get',
}) })
} }
// //
export function getProvideDeptFundStatement() { export function getProvideDeptFundStatement() {
return request({ return request({
url: '/processForm/tabilityapplication/getProvideDeptFundStatement', url: '/processForm/tabilityapplication/getProvideDeptFundStatement',
method: 'get', method: 'get',
}) })
} }
// //
export function getApplyDeptFundStatement() { export function getApplyDeptFundStatement() {
return request({ return request({
url: '/processForm/tabilityapplication/getApplyDeptFundStatement', url: '/processForm/tabilityapplication/getApplyDeptFundStatement',
method: 'get', method: 'get',
}) })
} }
// //
export function getProvideDistrictFundStatement() { export function getProvideDistrictFundStatement() {
return request({ return request({
url: '/processForm/tabilityapplication/getProvideDistrictFundStatement', url: '/processForm/tabilityapplication/getProvideDistrictFundStatement',
method: 'get', method: 'get',
}) })
} }
// //
export function getApplyDistrictFundStatement() { export function getApplyDistrictFundStatement() {
return request({ return request({
url: '/processForm/tabilityapplication/getApplyDistrictFundStatement', url: '/processForm/tabilityapplication/getApplyDistrictFundStatement',
method: 'get', method: 'get',
}) })
} }
// //
export function selectTotal() { export function selectTotal() {
return request({ return request({
url: '/resource/selectTotal', url: '/resource/selectTotal',
method: 'get', method: 'get',
}) })
} }
// //
// //
export function getApplyPriceCount() { export function getApplyPriceCount() {
return request({ return request({
url: '/processForm/tabilityapplication/getApplyPriceCount', url: '/processForm/tabilityapplication/getApplyPriceCount',
method: 'get', method: 'get',
}) })
} }

View File

@ -1,7 +1,5 @@
<template> <template>
<div class="right-survey"> <div class="right-survey">
<div class="platform-overview-bottom"> <div class="platform-overview-bottom">
<div class="top"><span class="title">资源汇聚总量</span></div> <div class="top"><span class="title">资源汇聚总量</span></div>
<div class="bottom"> <div class="bottom">
@ -16,14 +14,11 @@
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { import { selectTotal } from '@/api/assertReport'
selectTotal
} from '@/api/assertReport'
export default { export default {
components: {}, components: {},
mounted() { mounted() {
@ -32,22 +27,22 @@
data() { data() {
// //
return { return {
servicesNum: [], servicesNum: [],
} }
}, },
methods: { methods: {
selectAllTotal() {
selectAllTotal(){
selectTotal().then((res) => { selectTotal().then((res) => {
this.servicesNum=res.data.data.total this.servicesNum = res.data.data.total.filter(
(item) => item.type !== '知识库'
)
}) })
},
},
} }
} </script>
} <style lang="less" scoped>
</script>
<style lang='less' scoped>
@keyframes turn { @keyframes turn {
0% { 0% {
border-image: linear-gradient(to right, #003194, #00ffea) 1; border-image: linear-gradient(to right, #003194, #00ffea) 1;
@ -86,14 +81,12 @@
} }
} }
.right-survey { .right-survey {
height: 100%; height: 100%;
color: #f0fafa; color: #f0fafa;
font-size: 18px; font-size: 18px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.platform-overview-bottom { .platform-overview-bottom {
margin-top: 20px; margin-top: 20px;
width: 100%; width: 100%;
@ -108,17 +101,17 @@
transition: all 100ms ease-out; transition: all 100ms ease-out;
.top { .top {
font-size: 24px; 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%; background-size: 100% 100%;
text-align: center; text-align: center;
} }
.bottom { .bottom {
margin-top: 20px; margin-top: 20px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding:0rem 0.2rem; padding: 0rem 0.2rem;
.component-services-content-right-left-content-son { .component-services-content-right-left-content-son {
background: url('~@/assets/capabilityCloud/Component_services_snum.png') background: url('~@/assets/capabilityCloud/Component_services_snum.png')
no-repeat; no-repeat;
@ -147,5 +140,4 @@
animation: turn 5s linear infinite; animation: turn 5s linear infinite;
} }
} }
</style> </style>

View File

@ -1,4 +1,3 @@
<template> <template>
<div class="right-survey"> <div class="right-survey">
<!--最上面 部门排行榜--> <!--最上面 部门排行榜-->
@ -7,7 +6,7 @@
<div class="bottom1"> <div class="bottom1">
<div class="bottom-item"> <div class="bottom-item">
<div class="inner-title"> <div class="inner-title">
<p style="width: 220px">市级部门共享贡献资金排行</p> <p style="width: 220px">市级部门共享节省资金排行</p>
</div> </div>
<div class="left-list"> <div class="left-list">
<div class="left-list1">排行</div> <div class="left-list1">排行</div>
@ -87,7 +86,7 @@
</div> --> </div> -->
<div class="bottom-item"> <div class="bottom-item">
<div class="inner-title"> <div class="inner-title">
<p style="width: 220px">市级部门审评节省资金排行</p> <p style="width: 220px">市级部门申请节省资金排行</p>
</div> </div>
<div class="left-list"> <div class="left-list">
<div class="left-list1">排行</div> <div class="left-list1">排行</div>
@ -115,7 +114,7 @@
<div class="bottom2"> <div class="bottom2">
<div class="bottom-item"> <div class="bottom-item">
<div class="inner-title"> <div class="inner-title">
<p style="width: 220px">区市部门共享贡献资金排行</p> <p style="width: 220px">区市部门共享节省资金</p>
</div> </div>
<div class="left-list"> <div class="left-list">
<div class="left-list1">序号</div> <div class="left-list1">序号</div>
@ -146,7 +145,7 @@
</div> </div>
<div class="bottom-item"> <div class="bottom-item">
<div class="inner-title"> <div class="inner-title">
<p style="width: 220px">区市部门申请节省资金排行</p> <p style="width: 220px">区市部门申请节省资金</p>
</div> </div>
<div class="left-list"> <div class="left-list">
<div class="left-list1">序号</div> <div class="left-list1">序号</div>
@ -195,17 +194,17 @@
</template> </template>
<script> <script>
import { import {
getProvideDeptFundStatement, getProvideDeptFundStatement,
getApplyDeptFundStatement, getApplyDeptFundStatement,
getProvideDistrictFundStatement, getProvideDistrictFundStatement,
getApplyDistrictFundStatement, getApplyDistrictFundStatement,
selectTotal, selectTotal,
} from '@/api/assertReport' } from '@/api/assertReport'
export default { export default {
components: {}, components: {},
created() {}, created() {},
destroyed() {}, unmounted() {},
mounted() { mounted() {
this.getgetProvideDeptFund() this.getgetProvideDeptFund()
@ -312,9 +311,9 @@ export default {
}) })
}, },
}, },
} }
</script> </script>
<style lang='less' scoped> <style lang="less" scoped>
@keyframes turn { @keyframes turn {
0% { 0% {
border-image: linear-gradient(to right, #003194, #00ffea) 1; border-image: linear-gradient(to right, #003194, #00ffea) 1;
@ -332,27 +331,27 @@ export default {
border-image: linear-gradient(to right, #003194, #00ffea) 1; border-image: linear-gradient(to right, #003194, #00ffea) 1;
} }
} }
.top5-content::-webkit-scrollbar { .top5-content::-webkit-scrollbar {
width: 6px; width: 6px;
/*height: 4px;*/ /*height: 4px;*/
} }
.top5-content::-webkit-scrollbar-thumb { .top5-content::-webkit-scrollbar-thumb {
background-color: #00deff; background-color: #00deff;
} }
.map-search-result::-webkit-scrollbar-track, .map-search-result::-webkit-scrollbar-track,
.top5-content::-webkit-scrollbar-track { .top5-content::-webkit-scrollbar-track {
background-color: #424748; background-color: #424748;
} }
@keyframes topup50 { @keyframes topup50 {
from { from {
top: 50%; top: 50%;
} }
to { to {
top: -100%; top: -100%;
} }
} }
.right-survey { .right-survey {
width: 620px; width: 620px;
height: 100%; height: 100%;
color: #f0fafa; color: #f0fafa;
@ -373,17 +372,19 @@ export default {
transition: all 100ms ease-out; transition: all 100ms ease-out;
.top { .top {
font-size: 24px; 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%; background-size: 100% 100%;
text-align: center; text-align: center;
} }
.bottom1 { .bottom1 {
margin-top: 10px; margin-top: 10px;
width: 100%; width: 100%;
display: table; // display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
height: 1.8rem; height: 2.5rem;
overflow-y: auto;
.bottom-item { .bottom-item {
width: 98%; width: 98%;
} }
@ -395,7 +396,7 @@ export default {
display: table; display: table;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
height: 4.0rem; height: 4rem;
.bottom-item { .bottom-item {
width: 48%; width: 48%;
} }
@ -503,7 +504,8 @@ export default {
transition: all 100ms ease-out; transition: all 100ms ease-out;
.top { .top {
font-size: 24px; 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%; background-size: 100% 100%;
text-align: center; text-align: center;
} }
@ -539,5 +541,5 @@ export default {
border: 2px solid; border: 2px solid;
animation: turn 5s linear infinite; animation: turn 5s linear infinite;
} }
} }
</style> </style>

View File

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

View File

@ -1,26 +1,24 @@
<!-- --> <!-- -->
<template> <template>
<div class="capability-cloud"> <div class="capability-cloud">
<div class="header"> <div class="header">
<span class="title" @click="goHome">城市云脑通用能力服务平台</span> <span class="title" @click="goHome">城市云脑通用能力服务平台</span>
</div> </div>
<div class="header1"> <div class="header1">
<div style=" color:#bed1df; font-size: 32px">累计节省财政资金</div> <div style="color: #bed1df; font-size: 32px">累计节省财政资金</div>
<div class="area-right"> <div class="area-right">
<!-- <div class="mianJi">累计节省财政资金</div> --> <!-- <div class="mianJi">累计节省财政资金</div> -->
<template v-for="(item, index) in saveMonmy"> <template v-for="(item, index) in saveMonmy">
<p v-if="item == '.'" :key="index"> <p v-if="item == '.'" :key="index">
{{ item }} {{ item }}
</p> </p>
<span v-else >{{ item }}</span> <span v-else>{{ item }}</span>
</template> </template>
<div class="mianJi">万元</div> <div class="mianJi">万元</div>
</div> </div>
<div style=" color: #bed1df; font-size: 16px">资源参考价格由部门提供或参考市场价格设定</div> <div style="color: #bed1df; font-size: 16px">
资源参考价格由部门提供或参考市场价格设定
</div>
</div> </div>
<!--左侧--> <!--左侧-->
<div class="reservoir-left"> <div class="reservoir-left">
@ -41,52 +39,47 @@
<!--下方--> <!--下方-->
<div class="bottom"> <div class="bottom">
<reservoir-bottom /> <reservoir-bottom />
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { import { getApplyPriceCount } from '@/api/assertReport'
getApplyPriceCount import ReservoirThumbnail from './components/ReservoirThumbnail.vue'
} from '@/api/assertReport' import ReservoirLeft from './components/ReservoirLeft'
import ReservoirThumbnail from "./components/ReservoirThumbnail.vue"; import ReservoirRight from './components/ReservoirRight'
import ReservoirLeft from "./components/ReservoirLeft"; import ReservoirBottom from './components/ReservoirBottom'
import ReservoirRight from "./components/ReservoirRight"; import { NumbersConvertedToArrays } from '@/utils/arrayMethod.js'
import ReservoirBottom from "./components/ReservoirBottom"; export default {
import { NumbersConvertedToArrays } from "@/utils/arrayMethod.js";
export default {
//import使 //import使
components: { components: {
ReservoirThumbnail, ReservoirThumbnail,
ReservoirLeft, ReservoirLeft,
ReservoirRight, ReservoirRight,
ReservoirBottom ReservoirBottom,
}, },
data() { data() {
// //
return { return {
saveMonmy:[], saveMonmy: [],
model: "common", model: 'common',
dialogTitle: "周边视频", dialogTitle: '周边视频',
videoAnalysisDialogVisible: false, // videoAnalysisDialogVisible: false, //
riverCourseHistoryDialogVisible: false, // riverCourseHistoryDialogVisible: false, //
riverDetailInfo: {}, // riverDetailInfo: {}, //
dialogType: "add", dialogType: 'add',
dialogData: {}, dialogData: {},
dangerReportDialogVisible: false, dangerReportDialogVisible: false,
positionInfo: null, positionInfo: null,
reservoirDialogVisible: false, // reservoirDialogVisible: false, //
districtOptions: [], // districtOptions: [], //
isThumbnail:true, // isThumbnail: true, //
tabindex:0, //3dtab tabindex: 0, //3dtab
listType:"",// warnig listType: '', // warnig
basicInfo: {}, // basicInfo: {}, //
type: '', type: '',
callSource:"indexPage", callSource: 'indexPage',
}; }
}, },
// data // data
computed: {}, computed: {},
@ -94,19 +87,17 @@ export default {
watch: {}, watch: {},
// //
methods: { methods: {
getSaveMoney(){ getSaveMoney() {
getApplyPriceCount().then((res) => { getApplyPriceCount().then((res) => {
this.saveMonmy = NumbersConvertedToArrays(res.data.data)
this.saveMonmy=NumbersConvertedToArrays(res.data.data)
}) })
} },
}, },
mounted() { mounted() {
this.getSaveMoney() this.getSaveMoney()
}, },
}
};
</script> </script>
<style lang="less"> <style lang="less">
@font-face { @font-face {
@ -135,17 +126,17 @@ export default {
} }
} }
</style> </style>
<style lang='less' scoped> <style lang="less" scoped>
// scopeddate-pickerreservoir // scopeddate-pickerreservoir
//@import url(); css //@import url(); css
.module-header-container { .module-header-container {
position: absolute; position: absolute;
z-index: 1000; z-index: 1000;
top: 0px; top: 0px;
width: 100%; width: 100%;
pointer-events: none; pointer-events: none;
} }
.capability-cloud { .capability-cloud {
height: 10.8rem; height: 10.8rem;
background: url('~@/assets/capabilityCloud/bg.png') no-repeat; background: url('~@/assets/capabilityCloud/bg.png') no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
@ -157,7 +148,7 @@ export default {
background: url('~@/assets/capabilityCloud/header.png') no-repeat; background: url('~@/assets/capabilityCloud/header.png') no-repeat;
font-size: 0.46rem; font-size: 0.46rem;
} }
.bottom{ .bottom {
bottom: 12px; bottom: 12px;
position: absolute; position: absolute;
left: 545px; left: 545px;
@ -167,7 +158,6 @@ export default {
text-align: center; text-align: center;
height: 1.8rem; height: 1.8rem;
} }
.header1 { .header1 {
top: 78px; top: 78px;
@ -189,8 +179,8 @@ export default {
// line-height: 45px; // line-height: 45px;
color: #fed93f; color: #fed93f;
font-weight: bold; font-weight: bold;
background: url("~@/assets/capabilityCloud/num_bg.png") background: url('~@/assets/capabilityCloud/num_bg.png') 100% 100%
100% 100% no-repeat; no-repeat;
background-size: 100%; background-size: 100%;
text-align: center; text-align: center;
font-size: 34px; font-size: 34px;
@ -199,10 +189,10 @@ export default {
font-family: DinPro-Bold; font-family: DinPro-Bold;
} }
.mianJi { .mianJi {
margin-top: 6px;; margin-top: 6px;
margin-right: 3px; margin-right: 3px;
font-size: 22px; font-size: 22px;
float:right; float: right;
} }
p { p {
height: 44px; height: 44px;
@ -235,9 +225,9 @@ export default {
// height: 100%; // height: 100%;
// bottom:2rem; // bottom:2rem;
} }
} }
// //
.phone-date-picker { .phone-date-picker {
color: #fff; color: #fff;
//border: 1px solid #e4e7ed; //border: 1px solid #e4e7ed;
border: 1px solid #008fbb; border: 1px solid #008fbb;
@ -284,7 +274,5 @@ export default {
border: 1px solid #008fbb; border: 1px solid #008fbb;
border-color: #009ab3; border-color: #009ab3;
} }
} }
</style> </style>

View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: hisense.liangjunhua * @Author: hisense.liangjunhua
* @Date: 2022-06-19 10:15:33 * @Date: 2022-06-19 10:15:33
* @LastEditors: hisense.liangjunhua * @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-06-27 12:52:18 * @LastEditTime: 2022-11-28 16:23:25
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<template> <template>
@ -50,10 +50,10 @@
name: '总申请次数', name: '总申请次数',
num: '', num: '',
}, },
{ // {
name: '满足率', // name: '',
num: '', // num: '',
}, // },
]) ])
// //
const assignRankings = ref([ const assignRankings = ref([

View File

@ -2,7 +2,7 @@
海康H5Player 海康H5Player
--> -->
<template> <template>
<div :id="videoId" style="width: 800px; height: 600px; z-index: 9999"></div> <div :id="videoId" ref="video333" style="width: 800px; height: 600px"></div>
</template> </template>
<script> <script>
// const IS_MOVE_DEVICE = document.body.clientWidth < 992 // // const IS_MOVE_DEVICE = document.body.clientWidth < 992 //
@ -41,6 +41,7 @@
mseSupport: MSE_IS_SUPPORT, mseSupport: MSE_IS_SUPPORT,
// tabActive: MSE_IS_SUPPORT ? 'mse' : 'decoder', // tabActive: MSE_IS_SUPPORT ? 'mse' : 'decoder',
tabActive: 'decoder', tabActive: 'decoder',
videoDom: {},
urls: { urls: {
realplay: 'ws://10.19.147.22:559/EUrl/q2jQie4', realplay: 'ws://10.19.147.22:559/EUrl/q2jQie4',
talk: 'wss://10.41.163.126:6014/proxy/10.41.163.126:559/EUrl/6gFx47S', talk: 'wss://10.41.163.126:6014/proxy/10.41.163.126:559/EUrl/6gFx47S',
@ -70,18 +71,13 @@
}, },
created() {}, created() {},
mounted() { mounted() {
this.init() // this.init()
mybus.emit('closeLoading', true) mybus.emit('closeLoading', true)
this.createPlayer() this.createPlayer()
this.arrangeWindow() // this.arrangeWindow()
if (this.unStopable) { if (this.unStopable) {
this.videoPlay(this.videoUrl, 0)
} else {
this.realplay(this.videoUrl, 0) this.realplay(this.videoUrl, 0)
} }
//videoUrl this.realplay(this.videoUrl,0);//index
//this.realplay('wss://10.134.135.44:6014/proxy/10.10.20.14:559/openUrl/y3mFfcA',0);
}, },
watch: { watch: {
videoUrl: { videoUrl: {
@ -120,15 +116,18 @@
//szId: 'player'+this.index, //szId: 'player'+this.index,
szId: this.videoId, szId: this.videoId,
szBasePath: '/util/', //public/jsjs szBasePath: '/util/', //public/jsjs
iMaxSplit: 4, // iMaxSplit: 4,
iWidth: '800px', // iWidth: '800px',
iCurrentSplit: 4, // iCurrentSplit: 4,
openDebug: true, // openDebug: true,
oStyle: { // oStyle: {
borderSelect: '#FFCC00', // borderSelect: '#FFCC00',
}, // },
}) })
let that = this let that = this
that.videoDom = that.$refs.video333.querySelector('video') || {}
// that.videoDom.autoplay = false
// //
this.player.JS_SetWindowControlCallback({ this.player.JS_SetWindowControlCallback({
windowEventSelect: function (iWndIndex) { windowEventSelect: function (iWndIndex) {
@ -138,8 +137,8 @@
pluginErrorHandler: function (iWndIndex, iErrorCode, oError) { pluginErrorHandler: function (iWndIndex, iErrorCode, oError) {
// //
console.log('pluginError callback: ', iWndIndex, iErrorCode, oError) console.log('pluginError callback: ', iWndIndex, iErrorCode, oError)
message.error('取流异常,请稍后尝试') // message.error(',')
mybus.emit('closeLoading', false) // mybus.emit('closeLoading', false)
}, },
windowEventOver: function (iWndIndex) { windowEventOver: function (iWndIndex) {
// //
@ -159,16 +158,26 @@
}, },
firstFrameDisplay: function (iWndIndex, iWidth, iHeight) { firstFrameDisplay: function (iWndIndex, iWidth, iHeight) {
// //
console.log( // console.log(
'firstFrame loaded callback: ', // 'firstFrame loaded callback: ',
iWndIndex, // iWndIndex,
iWidth, // iWidth,
iHeight // iHeight
) // )
// // //
if (!that.realTime) { // if (!that.realTime) {
that.pausePlay(iWndIndex) // that.pausePlay(iWndIndex)
}
setTimeout(()=>{
console.log('为何暂停会失效???')
that.videoDom.pause()
}, 4000)
// that.player.JS_Visibilitychange()
var canvas = that.$refs.video333.querySelector('canvas');
var context = canvas.getContext('2d');
context.save();
// }
mybus.emit('closeLoading', false) mybus.emit('closeLoading', false)
}, },
performanceLack: function () { performanceLack: function () {
@ -191,67 +200,29 @@
// //
// //
realplay(playURL, index1) { realplay(playURL, index1) {
let that = this
this.realTime = false this.realTime = false
mybus.emit('closeLoading', true) mybus.emit('closeLoading', true)
setTimeout(() => { setTimeout(() => {
mybus.emit('closeLoading', false) mybus.emit('closeLoading', false)
}, 3000) }, 3000)
this.player.JS_Stop(0)
this.mode = 0 //0 1 this.mode = 0 //0 1
const { player, mode, urls } = this const { player, mode, urls } = this
// playURL = this.realplay
console.log('视频播放地址', playURL) console.log('视频播放地址', playURL)
// const startTime = {
// startTime: ,
// }
// const endTime = {
// endTime: ,
// }
player
.JS_Play(
playURL,
{ playURL, mode },
index1,
'2022-11-22T10:00:00Z',
'2022-11-22T11:00:00Z'
)
.then(
() => {
console.log('realplay success')
},
(e) => {
console.error(e)
// message.error(':' + e)
}
)
},
//
videoPlay(playURL, index1) {
let that = this
this.realTime = true
mybus.emit('closeLoading', true)
setTimeout(() => {
mybus.emit('closeLoading', false)
}, 3000)
if (!that.unStopable) {
message.warning('预览将在约6s后停止')
setTimeout(() => {
that.stopAllPlay()
}, 6000)
}
this.mode = 0 //0 1
const { player, mode, urls } = this
// playURL = this.realplay
console.log('视频播放地址', playURL)
// const startTime = {
// startTime: ,
// }
// const endTime = {
// endTime: ,
// }
player.JS_Play(playURL, { playURL, mode }, index1).then( player.JS_Play(playURL, { playURL, mode }, index1).then(
() => { () => {
console.log('realplay success') // console.log('')
// 6s mybus.emit('closeLoading', false)
// that.videoDom.muted = false
console.log('视频DOM', player)
// that.videoDom.addEventListener('play',function(){
// console.log("");
// that.videoDom.pause()
// });
setTimeout(() => {
that.videoDom.pause()
}, 0)
}, },
(e) => { (e) => {
console.error(e) console.error(e)
@ -272,20 +243,6 @@
} }
) )
}, },
//
pausePlay(index) {
let that = this
this.player.JS_Pause(index).then(
() => {
console.log('暂停成功')
},
(e) => {
console.error(e)
//
that.videoPlay(that.videoUrl, 0)
}
)
},
}, },
beforeUnmount() { beforeUnmount() {
console.log('关闭所有视频') console.log('关闭所有视频')