Skip to content

Z
zh-baseversion-project
Commit 5a738d9a authored by wanghao's avatar wanghao
Browse files
Options

1 bigWindowOld 界面调整

parent 45da1dbe
Hide whitespace changes
Inline Side-by-side
Showing with 350 additions and 400 deletions
zh-baseversion-web/src/components/bigWindowOld/leftBar.vue
View file @ 5a738d9a
<template> <template>
<div class="leftb"> <div class="leftb">
<!-- 基本信息 --> <!-- 基本信息 -->
<div class="item2"> <div class="item2">
<!-- <span class="dot"> <!-- <span class="dot">
...@@ -9,109 +10,64 @@ ...@@ -9,109 +10,64 @@
<!-- <div class="fong-div"></div> <!-- <div class="fong-div"></div>
<div class="fong-div" style="margin-left: 3px;"></div> <div class="fong-div" style="margin-left: 3px;"></div>
<div class="fong-div" style="margin-left: 3px;"></div> --> <div class="fong-div" style="margin-left: 3px;"></div> -->
<span <span style="letter-spacing :1px;color:#fff;float: right;margin-right: 50px;"> 基本信息 </span>
style="
letter-spacing: 1px;
color: #fff;
float: right;
margin-right: 50px;
"
>
基本信息
</span>
<div class="rightline1"></div> <div class="rightline1"></div>
</div> </div>
<div class="leftbar1"> <div class="leftbar1">
<div class="left-top"> <div class="left-top">
<div class="ltop1"> <div class="ltop1">
<!-- <img src="../../assets/second1/btn-1.png" alt=""> --> <!-- <img src="../../assets/second1/btn-1.png" alt=""> -->
<div <div style="width: 100%;text-align: center;color: #fff;margin-left: 10px;">
style=" <div class="div-p" @click="$router.push('/regulation/supervise')">从业人员数(人)</div>
width: 100%; <span style="font-family: 'arialbd';font-size: 35px;background-image:-webkit-linear-gradient(bottom,#f0c41b,#e4dbb7);-webkit-background-clip:text;-webkit-text-fill-color:transparent;">{{allNum.peopleNum}}</span>
text-align: center;
color: #fff;
margin-left: 10px;
"
>
<div class="div-p" @click="$router.push('/regulation/supervise')">
从业人员数(人)
</div> </div>
<span
style="
font-family: 'arialbd';
font-size: 35px;
color: rgb(255, 255, 255);
-webkit-background-clip: text;
"
>{{ allNum.peopleNum }}</span
>
</div> </div>
</div> <!-- <div style="width: 86%;margin-left: 4%;border-bottom: 1px dashed #094749;margin-top: 15px;margin-bottom: 15px;"></div> -->
<!-- <div style="width: 86%;margin-left: 4%;border-bottom: 1px dashed #094749;margin-top: 15px;margin-bottom: 15px;"></div> --> <div class="ltop2">
<div class="ltop2"> <!-- <img src="../../assets/second1/btn-2.png" alt=""> -->
<!-- <img src="../../assets/second1/btn-2.png" alt=""> --> <div style="width: 100%;text-align: center;color: #fff;margin-left: 10px;">
<div <div class="div-p" @click="$router.push('/regulation/pipe')">管道长度(m)</div>
style=" <span style="font-family: 'arialbd';font-size: 35px;background-image:-webkit-linear-gradient(bottom,#f0c41b,#e4dbb7);-webkit-background-clip:text;-webkit-text-fill-color:transparent;">{{allNum.allPipeLength}}</span>
width: 100%;
text-align: center;
color: #fff;
margin-left: 10px;
"
>
<div class="div-p" @click="$router.push('/regulation/pipe')">
管道长度(m)
</div> </div>
<span
style="
font-family: 'arialbd';
font-size: 35px;
color: rgb(255, 255, 255);
-webkit-background-clip: text;
"
>{{ allNum.allPipeLength }}</span
>
</div> </div>
</div> </div>
</div> </div>
</div>
<!-- 安全监管 --> <!-- 安全监管 -->
<div class="leftbar2"> <div class="leftbar2">
<div class="item1"> <div class="item1">
<!-- <div class="fong-div"></div> <!-- <div class="fong-div"></div>
<div class="fong-div" style="margin-left: 3px;"></div> <div class="fong-div" style="margin-left: 3px;"></div>
<div class="fong-div" style="margin-left: 3px;"></div> --> <div class="fong-div" style="margin-left: 3px;"></div> -->
<span style="letter-spacing: 1px; color: #fff; float: right"> <span style="letter-spacing :1px;color:#fff;float: right;"> 巡检巡查 </span>
巡检巡查
</span>
<!-- <img src="../../assets/second1/ti-bg.png" alt=""> --> <!-- <img src="../../assets/second1/ti-bg.png" alt=""> -->
<div class="rightline2"></div> <div class="rightline2"></div>
</div> </div>
<div class="pieone"> <div class="pieone">
<div <div id="myChartpieone" :style="{width: '100%', height: '100%'}"></div>
id="myChartpieone"
:style="{ width: '100%', height: '100%' }"
></div>
<div class="titleTex"> <div class="titleTex">
<div :style="{ color: '#5470c6' }">● 已完成:{{ allNum.typeOne }}</div> <div :style="{color: '#5470c6'}"> ● 已完成:{{allNum.typeOne}}</div>
<div :style="{ color: '#fa8167' }">● 未完成:{{ allNum.typeTwo }}</div> <div :style="{color: '#fa8167'}"> ● 未完成:{{allNum.typeTwo}}</div>
</div> </div>
</div> </div>
<div class="pietwo"> <div class="pietwo">
<div <div id="myChartpietwo" :style="{width: '100%', height: '100%'}"></div>
id="myChartpietwo" <div class="titleTex">
:style="{ width: '100%', height: '100%' }" <div :style="{color: '#5470c6'}"> ● 已完成:0</div>
></div> <div :style="{color: '#fa8167'}"> ● 未完成:0</div>
<div class="titleTex" style="width: 140% !important; margin-left: -20%">
<div :style="{ color: '#5470c6' }">● 已完成:{{this.allNum.hiddenBookFinish}}(天然气：{{this.allNum.trqHiddenBookFinish}},液化气：{{this.allNum.hiddenBookFinish-this.allNum.trqHiddenBookFinish}})</div>
<div :style="{ color: '#fa8167' }">● 未完成:{{this.allNum.hiddenBookUnFinish}}(天然气：{{this.allNum.trqHiddenBookUnFinish}},液化气：{{this.allNum.hiddenBookUnFinish-this.allNum.trqHiddenBookUnFinish}})</div>
</div> </div>
</div> </div>
</div> </div>
<!-- 任务完成率 --> <!-- 任务完成率 -->
<div class="leftbar3"> <div class="leftbar3">
<div class="item1"> <div class="item1">
<!-- <div class="fong-div"></div> <!-- <div class="fong-div"></div>
...@@ -130,88 +86,83 @@ ...@@ -130,88 +86,83 @@
<div id="main1" style="width: 100%; height: 100%"></div> <div id="main1" style="width: 100%; height: 100%"></div>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { selectWorkOrderNum } from "@/api/operationMonitor/order"; import { selectWorkOrderNum } from "@/api/operationMonitor/order";
// 引入基本模板
// let echarts = require("echarts/lib/echarts"); import {
// // 引入柱状图组件 getQLJG,
// require("echarts/lib/chart/bar"); getSGSL,
// // 引入提示框和title组件 getYHZZ,
// require("echarts/lib/component/tooltip"); getYHTJ,
// require("echarts/lib/component/title"); } from "@/api/bigWindow/charsData.js";
// let echarts = this.$echarts;
export default {
import { getQLJG,getSGSL, getYHZZ, getYHTJ } from "@/api/bigWindowOld/charsData.js"; data () {
　　return {
export default { allNum:{},
data() { zeroNum:{
return { allPipeLength: 0,
allNum: {}, peopleNum: 0,
zeroNum: { typeFor: 0,
allPipeLength: 0, typeOne: 0,
peopleNum: 0, typeThree: 0,
typeFor: 0, typeTwo: 0
typeOne: 0, },
typeThree: 0, enterpriseIds:{
typeTwo: 0, enterpriseId:""
hiddenBookFinish: 0, },
hiddenBookUnFinish: 0 dataAll:{
}, congyeNum:1544,
enterpriseIds: { guandaoNum:3658495,
enterpriseId: "", shigu1:[820, 932, 901, 934, 1290, 1330, 1320,820, 932, 901, 934, 1290],
}, shigu2:[452, 786, 456, 732, 458, 165, 198,489, 158, 358, 345, 675],
dataAll: { shigu3:[ 932, 901, 198,489, 158, 358, 345, 675, 901, 934, 1290, 888],
congyeNum: 1544, renwu:[50,92],
guandaoNum: 3658495, renwuzong:142
shigu1: [], },
shigu2: [], dataone:{
// shigu3: [932, 901, 198, 489, 158, 358, 345, 675, 901, 934, 1290, 888], congyeNum:521,
renwu: [50, 92], guandaoNum:1254848,
renwuzong: 142, shigu1:[223, 44, 332, 321, 458, 456, 653,122, 345, 133, 421, 123],
date: [], shigu2:[123, 234, 456, 567, 235, 12,89, 158, 158, 145, 175,224],
}, shigu3:[ 432, 301, 108,189, 18, 158, 145, 175, 401, 334, 590, 388],
dataone: { renwu:[4,27],
congyeNum: 521, renwuzong:31
guandaoNum: 1254848, },
shigu1: [223, 44, 332, 321, 458, 456, 653, 122, 345, 133, 421, 123], datatwo:{
shigu2: [123, 234, 456, 567, 235, 12, 89, 158, 158, 145, 175, 224], congyeNum:488,
shigu3: [432, 301, 108, 189, 18, 158, 145, 175, 401, 334, 590, 388], guandaoNum:1244495,
renwu: [4, 27], shigu1:[653,122, 345, 133, 456, 653,122, 345, 133, 421, 123,500],
renwuzong: 31, shigu2:[432, 301, 456, 567, 235, 12, 145, 175, 401, 334, 590, 388],
}, shigu3:[ 123, 234, 108,189, 18, 158, 123, 234, 456, 567, 235, 12],
datatwo: { renwu:[8,25],
congyeNum: 488, renwuzong:33
guandaoNum: 1244495, },
shigu1: [653, 122, 345, 133, 456, 653, 122, 345, 133, 421, 123, 500], datathree:{
shigu2: [432, 301, 456, 567, 235, 12, 145, 175, 401, 334, 590, 388], congyeNum:535,
shigu3: [123, 234, 108, 189, 18, 158, 123, 234, 456, 567, 235, 12], guandaoNum:1189492,
renwu: [8, 25], shigu1:[653,122, 345, 133, 456, 653,122, 345, 133, 421, 123,500],
renwuzong: 33, shigu2:[432, 301, 456, 567, 456, 653,122, 175, 401, 334, 590, 388],
}, shigu3:[ 334, 590, 388, 133, 456, 123, 234, 653,122, 345, 133],
datathree: { renwu:[38,40],
congyeNum: 535, renwuzong:78
guandaoNum: 1189492, },
shigu1: [653, 122, 345, 133, 456, 653, 122, 345, 133, 421, 123, 500], datanow:{
shigu2: [432, 301, 456, 567, 456, 653, 122, 175, 401, 334, 590, 388], renwu:[0,0]
shigu3: [334, 590, 388, 133, 456, 123, 234, 653, 122, 345, 133], }
renwu: [38, 40], };
renwuzong: 78, 　},
}, mounted(){
datanow: { this.datanow = this.dataAll;
renwu: [0, 0], //this.getNum(null)
this.getLineChats();
}, },
};
},
mounted() {
this.datanow = this.dataAll;
//this.getNum(null)
this.getLineChats();
},
methods: { methods: {
// 两个接口实现一个line统计图这个是改数据 // 两个接口实现一个line统计图这个是改数据
async getLineChats() { async getLineChats() {
// getSGSL,getYHZZ // getSGSL,getYHZZ
...@@ -235,206 +186,208 @@ export default { ...@@ -235,206 +186,208 @@ export default {
}); });
this.drawLine(this.datanow); this.drawLine(this.datanow);
}, },
choice(val) { choice(val){
// if(index==0){ // if(index==0){
// this.datanow = this.dataAll; // this.datanow = this.dataAll;
// this.drawLine(this.datanow); // this.drawLine(this.datanow);
// this.getNum(index); // this.getNum(index);
// }else // }else
console.log("===================>>>>>>>>>>>>>>>>>>",val) this.getNum(val);
this.getNum(val); // if(index==1){
// if(index==1){ // this.datanow = this.dataone;
// this.datanow = this.dataone; // this.drawLine(this.datanow);
// this.drawLine(this.datanow); // }else if(index==2){
// }else if(index==2){ // this.datanow = this.datatwo;
// this.datanow = this.datatwo; // this.drawLine(this.datanow);
// this.drawLine(this.datanow); // }else if(index==3){
// }else if(index==3){ // this.datanow = this.datathree;
// this.datanow = this.datathree; // this.drawLine(this.datanow);
// this.drawLine(this.datanow); // }
// }
},
getNum(val) {
if (val != null && val != "") {
this.enterpriseIds.enterpriseId = val.toString();
selectWorkOrderNum(this.enterpriseIds).then((response) => {
console.log(response);
this.allNum = response.data;
this.initdata();
});
} else {
this.allNum = this.zeroNum;
this.initdata();
}
},
initdata() {
// 基于准备好的dom，初始化echarts实例
//console.log(data.renwu[0]+"=-=-=-"+data.renwu[1])
let pieone = this.$echarts.init(document.getElementById("myChartpieone"));
let pietwo = this.$echarts.init(document.getElementById("myChartpietwo"));
// 绘制图表
pieone.setOption({
title: {
text:
"巡检任务数(个) : " + (this.allNum.typeOne + this.allNum.typeTwo),
left: "center",
top: 0,
textStyle: {
color: "#cddbe4",
fontSize: "16",
},
},
grid: {
bottom: "7%",
containLabel: true,
},
tooltip: {
trigger: "item",
}, },
series: [ getNum( val){
{
name: "任务概况", if(val!=null && val!=''){
type: "pie", this.enterpriseIds.enterpriseId = val.toString();
radius: "55%", if(!this.enterpriseIds.enterpriseId) return
center: ["50%", "58%"], selectWorkOrderNum (this.enterpriseIds).then(response => {
data: [ console.log(response);
{ this.allNum=response.data;
value: this.allNum.typeTwo, this.initdata();
name: "未完成", });
itemStyle: { color: "#fa8167" }, }else {
this.allNum = this.zeroNum;
this.initdata();
}
},
initdata(){
// 基于准备好的dom，初始化echarts实例
//console.log(data.renwu[0]+"=-=-=-"+data.renwu[1])
let pieone = this.$echarts.init(document.getElementById('myChartpieone'));
let pietwo = this.$echarts.init(document.getElementById('myChartpietwo'));
// 绘制图表
pieone.setOption({
title: {
text: '巡检任务数(个) : '+ (this.allNum.typeOne+this.allNum.typeTwo),
left: 'center',
top :0,
textStyle:{
color: "#cddbe4",
fontSize: "16"
}
}, },
{ grid: {
value: this.allNum.typeOne, bottom: "7%",
name: "已完成", containLabel: true,
itemStyle: { color: "#5470c6" },
}, },
], tooltip: {
labelLine: { trigger: 'item',
length: 20,
length2: 50,
}, },
label: { series: [
color: "#fff", {
fontSize: 14, name: '任务概况',
// formatter:"{b}\n\n", type: 'pie',
// padding:[0,-55], radius: '55%',
normal: { center: ['50%','58%'],
show: false, data: [
position: "outer", {
// formatter: '{d}%, {c} \n\n', value: this.allNum.typeTwo,
//模板变量有 {a}, {b}，{c}，{d}，{e}，分别表示系列名，数据名，数据值等。 name: '未完成',
formatter: "{a_set|{b}}\n{b_set|{d}%}\n\n\n", itemStyle: { color: '#fa8167' }
// formatter: "{a_set|{b}}\n{c_set|{d}%}\n{b|}\n\n", },
borderWidth: 20, {
borderRadius: 4, value: this.allNum.typeOne,
padding: [0, -55], name: '已完成' ,
rich: { itemStyle: { color: '#5470c6' }
a_set: {
color: "#cddbe4",
lineHeight: 20,
align: "center",
padding: [55, -40, -15, -40],
}, },
b_set: { ],
color: "auto", labelLine:{
length:20,
length2:50,
},
label:{
color:'#fff',
fontSize: 14,
// formatter:"{b}\n\n",
// padding:[0,-55],
normal: {
show: false,
position: 'outer',
// formatter: '{d}%, {c} \n\n',
//模板变量有 {a}, {b}，{c}，{d}，{e}，分别表示系列名，数据名，数据值等。
formatter: "{a_set|{b}}\n{b_set|{d}%}\n\n\n",
// formatter: "{a_set|{b}}\n{c_set|{d}%}\n{b|}\n\n",
borderWidth: 20,
borderRadius: 4,
padding: [0, -55],
rich: {
a_set: {
color: "#cddbe4",
lineHeight: 20,
align: "center",
padding: [55, -40, -15, -40],
},
b_set:{
color: "auto",
},
}
}
}, },
emphasis: {
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)'
}
}, },
labelLine: {
show: false
},
}
]
});
pietwo.setOption({
title: {
text: '隐患整治数(个) : 0',
left: 'center',
top :0,
textStyle:{
color: "#cddbe4",
fontSize: "16"
}
}, },
}, grid: {
emphasis: { bottom: "7%",
itemStyle: { containLabel: true,
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: "rgba(0, 0, 0, 0.5)",
}, },
tooltip: {
trigger: 'item',
}, },
labelLine: { series: [
show: false,
},
},
],
});
pietwo.setOption({
title: {
text: "隐患整治数(个) : " +(this.allNum.hiddenBookFinish + this.allNum.hiddenBookUnFinish),
left: "center",
top: 0,
textStyle: {
color: "#cddbe4",
fontSize: "16",
},
},
grid: {
bottom: "7%",
containLabel: true,
},
tooltip: {
trigger: "item",
},
series: [
{
name: "任务概况",
type: "pie",
radius: "55%",
center: ["50%", "58%"],
data: [
{
value: this.allNum.hiddenBookUnFinish,
name: "未完成",
itemStyle: { color: "#fa8167" },
},
{ {
value: this.allNum.hiddenBookFinish, name: '任务概况',
name: "已完成", type: 'pie',
itemStyle: { color: "#5470c6" }, radius: '55%',
}, center: ['50%','58%'],
], data: [
labelLine: { {
length: 20, value: 0,
length2: 50, name: '未完成',
}, itemStyle: { color: '#fa8167' }
label: { },
color: "#fff", {
fontSize: 14, value: 0,
// formatter:"{b}\n\n", name: '已完成' ,
// padding:[0,-55], itemStyle: { color: '#5470c6' }
normal: {
show: false,
position: "outer",
// formatter: '{d}%, {c} \n\n',
//模板变量有 {a}, {b}，{c}，{d}，{e}，分别表示系列名，数据名，数据值等。
formatter: "{a_set|{b}}\n{b_set|{d}%}\n\n\n",
// formatter: "{a_set|{b}}\n{c_set|{d}%}\n{b|}\n\n",
borderWidth: 20,
borderRadius: 4,
padding: [0, -55],
rich: {
a_set: {
color: "#cddbe4",
lineHeight: 20,
align: "center",
padding: [55, -40, -15, -40],
}, },
b_set: { ],
color: "auto", labelLine:{
length:20,
length2:50,
},
label:{
color:'#fff',
fontSize: 14,
// formatter:"{b}\n\n",
// padding:[0,-55],
normal: {
show: false,
position: 'outer',
// formatter: '{d}%, {c} \n\n',
//模板变量有 {a}, {b}，{c}，{d}，{e}，分别表示系列名，数据名，数据值等。
formatter: "{a_set|{b}}\n{b_set|{d}%}\n\n\n",
// formatter: "{a_set|{b}}\n{c_set|{d}%}\n{b|}\n\n",
borderWidth: 20,
borderRadius: 4,
padding: [0, -55],
rich: {
a_set: {
color: "#cddbe4",
lineHeight: 20,
align: "center",
padding: [55, -40, -15, -40],
},
b_set:{
color: "auto",
},
}
}
}, },
emphasis: {
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)'
}
}, },
}, labelLine: {
}, show: false
emphasis: { },
itemStyle: { }
shadowBlur: 10, ]
shadowOffsetX: 0, });
shadowColor: "rgba(0, 0, 0, 0.5)", },
}, //折线图
},
labelLine: {
show: false,
},
},
],
});
},
//折线图 //折线图
drawLine(data) { drawLine(data) {
// 基于准备好的dom，初始化echarts实例 // 基于准备好的dom，初始化echarts实例
...@@ -573,82 +526,81 @@ export default { ...@@ -573,82 +526,81 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
/* @font-face { /* @font-face {
font-family: 'arialbd'; font-family: 'arialbd';
} */ } */
.leftb { .leftb{
width: 98%; width: 98%;
height: 100%; height: 100%;
margin-left: 2%; margin-left: 2%;
} }
.leftbar1 { .leftbar1{
width: 85%; width: 85%;
height: 20%; height: 20%;
padding-top: 10%; padding-top: 10%;
pointer-events: auto;
} }
.leftbar2 { .leftbar2{
width: 80%; width: 80%;
height: 39%; height: 39%;
padding-top: 15px; padding-top: 15px;
pointer-events: auto;
} }
.leftbar3 { .leftbar3{
width: 85%; width: 85%;
height: 32%; height: 32%;
padding-top: 15px; padding-top: 15px;
padding-bottom: 35px; padding-bottom: 35px;
pointer-events: auto;
} }
.item1 { .item1{
width: 85%; width: 85%;
height: 30px; height: 30px;
font-size: 16px; font-size: 16px;
font-weight: 700; font-weight: 700;
margin-left: 5%; margin-left: 5%;
padding-top: 10px; padding-top: 10px;
line-height: 10px; line-height: 10px;
// margin-top: 10px; // margin-top: 10px;
} }
.item1 img { .item1 img{
width: 100%; width: 100%;
} }
.item2 { .item2{
width: 85%; width: 85%;
height: 30px; height: 30px;
font-size: 16px; font-size: 16px;
font-weight: 700; font-weight: 700;
margin-left: 5%; margin-left: 5%;
margin-top: 40px; margin-top: 40px;
} }
.fong-div { .fong-div{
width: 4px; width: 4px;
height: 10px; height: 10px;
background-image: linear-gradient(to bottom, rgb(122, 247, 247), #057e8c); background-image: linear-gradient(to bottom,rgb(122, 247, 247), #057E8C);
float: left; float: left;
margin-top: 10px; margin-top: 10px;
} }
.rightline1 { .rightline1{
width: 85%; width: 85%;
height: 2px; height: 2px;
float: right; float: right;
background-image: linear-gradient(to left, #3bfafa, #ffffff00); background-image: linear-gradient(to left, #3BFAFA, #ffffff00);
margin-top: 10px; margin-top: 10px;
margin-right: 50px; margin-right: 50px;
} }
.rightline2 { .rightline2{
width: 92%; width: 92%;
height: 2px; height: 2px;
float: right; float: right;
background-image: linear-gradient(to left, #3bfafa, #ffffff00); background-image: linear-gradient(to left, #3BFAFA, #ffffff00);
margin-top: 10px; margin-top: 10px;
} }
.rightline3 { .rightline3{
width: 95%; width: 95%;
height: 2px; height: 2px;
float: right; float: right;
background-image: linear-gradient(to left, #3bfafa, #ffffff00); background-image: linear-gradient(to left, #3BFAFA, #ffffff00);
margin-top: 10px; margin-top: 10px;
} }
/* .dot { /* .dot {
...@@ -700,9 +652,9 @@ export default { ...@@ -700,9 +652,9 @@ export default {
transform: scale(2.4) transform: scale(2.4)
} }
} */ } */
.div-p { .div-p{
width: 100%; width: 100%;
background: url("../../assets/ranqifirst/div-p.png"); background: url('../../assets/ranqifirst/div-p.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
cursor: pointer; cursor: pointer;
...@@ -710,29 +662,27 @@ export default { ...@@ -710,29 +662,27 @@ export default {
color: #0ff; color: #0ff;
} }
.div-el { .div-el{
margin-top: 30px; margin-top: 30px;
width: 100%; width: 100%;
height: 18px; height: 18px;
} }
.left-top { .left-top{
display: flex; display: flex;
justify-content: space-evenly; justify-content: space-evenly;
} }
.ltop1 { .ltop1{
width: 35%; width: 35%;
display: flex; display: flex;
justify-content: space-evenly; justify-content: space-evenly;
color: rgb(255, 255, 255);
} }
.ltop2 { .ltop2{
width: 35%; width: 35%;
display: flex; display: flex;
justify-content: space-evenly; justify-content: space-evenly;
} }
.el-left { .el-left{
color: rgb(255, 255, 255); color: #96a4ad;
color: #ad9d66;
width: 20%; width: 20%;
height: 100%; height: 100%;
float: left; float: left;
...@@ -755,7 +705,7 @@ export default { ...@@ -755,7 +705,7 @@ export default {
/* ::v-deep .el-progress-bar__innerText { /* ::v-deep .el-progress-bar__innerText {
color: #1e516f; color: #1e516f;
} */ } */
.titleTex { .titleTex{
width: 100%; width: 100%;
height: 20px; height: 20px;
margin-top: 0px; margin-top: 0px;
...@@ -771,35 +721,36 @@ export default { ...@@ -771,35 +721,36 @@ export default {
width: 420px; width: 420px;
margin-left: 10px; margin-left: 10px;
} }
.yj { .yj{
padding: 0px 10px; padding: 0px 10px;
} }
.yujing { .yujing{
width: 33%; width: 33%;
float: left; float: left;
text-align: center; text-align: center;
margin-top: 45px; margin-top: 45px;
} }
.yujingtop { .yujingtop{
margin: 5px 0; margin: 5px 0;
text-align: center; text-align: center;
} }
.yujingbottom { .yujingbottom{
color: #cddbe4; color: #cddbe4;
margin-left: 10px; margin-left: 10px;
line-height: 35px; line-height: 35px;
padding: 10px 0 0 0; padding: 10px 0 0 0;
} }
.pieone { .pieone{
width: 50%; width: 50%;
height: 60%; height: 60%;
float: left; float: left;
margin-top: 30px; margin-top: 30px;
} }
.pietwo { .pietwo{
width: 50%; width: 50%;
height: 60%; height: 60%;
float: right; float: right;
margin-top: 30px; margin-top: 30px;
} }
</style> </style>
zh-baseversion-web/src/utils/mapClassForBigOld/map.js
View file @ 5a738d9a
...@@ -1125,7 +1125,7 @@ export class EditorMap { ...@@ -1125,7 +1125,7 @@ export class EditorMap {
const pipe = this.createPipeLine({ const pipe = this.createPipeLine({
id:id, id:id,
path: eval(path), path: eval(path),
strokeWeight: objData.strokeWeight || 2, strokeWeight: objData.strokeWeight || 4,
strokeColor: color, strokeColor: color,
extData: objData, extData: objData,
cursor: "pointer", cursor: "pointer",
......
zh-baseversion-web/src/views/bigWindowOld/index.vue
View file @ 5a738d9a
...@@ -178,7 +178,6 @@ import VideoView from "@/components/bigWindowOld/VideoView.vue"; ...@@ -178,7 +178,6 @@ import VideoView from "@/components/bigWindowOld/VideoView.vue";
import Device from "@/components/bigWindowOld/Device.vue"; import Device from "@/components/bigWindowOld/Device.vue";
import Cz from "@/components/bigWindowOld/Cz.vue"; import Cz from "@/components/bigWindowOld/Cz.vue";
import User from "@/components/bigWindowOld/User.vue"; import User from "@/components/bigWindowOld/User.vue";
import Center from "@/components/bigWindowOld/Center.vue";
import UserCenter from "@/components/bigWindowOld/UserCenter.vue"; import UserCenter from "@/components/bigWindowOld/UserCenter.vue";
import OtherCenter from "@/components/bigWindowOld/OtherCenter.vue"; import OtherCenter from "@/components/bigWindowOld/OtherCenter.vue";
import Company from "@/components/bigWindowOld/Company.vue"; import Company from "@/components/bigWindowOld/Company.vue";
...@@ -240,43 +239,43 @@ export default { ...@@ -240,43 +239,43 @@ export default {
{ {
val: 2, val: 2,
ischeck: false, ischeck: false,
imgurl: require("@/assets/firstimage/tiaoyaxiang.png"), imgurl: require("@/assets/bigWindowOld/firstimage/tiaoyaxiang.png"),
name: "调压箱", name: "调压箱",
}, },
{ {
val: 3, val: 3,
ischeck: false, ischeck: false,
imgurl: require("@/assets/firstimage/famen.png"), imgurl: require("@/assets/bigWindowOld/firstimage/famen.png"),
name: "阀门井", name: "阀门井",
}, },
{ {
val: 4, val: 4,
ischeck: false, ischeck: false,
imgurl: require("@/assets/firstimage/changzhan.png"), imgurl: require("@/assets/bigWindowOld/firstimage/changzhan.png"),
name: "场 站", name: "场 站",
}, },
{ {
val: 6, val: 6,
ischeck: false, ischeck: false,
imgurl: require("@/assets/firstimage/user.png"), imgurl: require("@/assets/bigWindowOld/firstimage/user.png"),
name: "居民用户", name: "居民用户",
}, },
{ {
val: 61, val: 61,
ischeck: false, ischeck: false,
imgurl: require("@/assets/firstimage/syUser.svg"), imgurl: require("@/assets/bigWindowOld/firstimage/syUser.svg"),
name: "商业用户", name: "商业用户",
}, },
{ {
val: 5, val: 5,
ischeck: false, ischeck: false,
imgurl: require("@/assets/firstimage/jiankong.png"), imgurl: require("@/assets/bigWindowOld/firstimage/jiankong.png"),
name: "监 控", name: "监 控",
}, },
{ {
val: 18, val: 18,
ischeck: false, ischeck: false,
imgurl: require("@/assets/firstimage/yhq.svg"), imgurl: require("@/assets/bigWindowOld/firstimage/yhq.svg"),
name: "餐饮单位液化气用户", name: "餐饮单位液化气用户",
}, },
], ],
...@@ -743,7 +742,7 @@ export default { ...@@ -743,7 +742,7 @@ export default {
top: -10px; top: -10px;
z-index: 998; z-index: 998;
text-align: center; text-align: center;
background: url("../../assets/firstimage/topbk.svg"); background: url("../../assets/bigWindowOld/firstimage/topbk.svg");
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
backdrop-filter: blur(4px); backdrop-filter: blur(4px);
...@@ -759,7 +758,7 @@ export default { ...@@ -759,7 +758,7 @@ export default {
position: fixed; position: fixed;
top: 70px; top: 70px;
z-index: 999; z-index: 999;
background: url("../../assets/firstimage/le.png"); background: url("../../assets/bigWindowOld/firstimage/le.png");
background-size: 105% 100%; background-size: 105% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
margin-left: -20px; margin-left: -20px;
...@@ -772,7 +771,7 @@ export default { ...@@ -772,7 +771,7 @@ export default {
top: 70px; top: 70px;
z-index: 999; z-index: 999;
right: 0; right: 0;
background: url("../../assets/firstimage/ri.png"); background: url("../../assets/bigWindowOld/firstimage/ri.png");
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
margin-right: -20px; margin-right: -20px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment