Skip to content

X
xt-whp
Commit 3074d112 authored by jianqian's avatar jianqian
Browse files
Options

gengxin

parent 50097361
Expand all Show whitespace changes
Inline Side-by-side
Showing with 201 additions and 128 deletions
dcit-hcsystem-hcsystem-master/src/App.vue
View file @ 3074d112
...@@ -16,9 +16,9 @@ export default class App extends Vue {} ...@@ -16,9 +16,9 @@ export default class App extends Vue {}
<style lang="scss"> <style lang="scss">
@import './common/font/font.css'; @import './common/font/font.css';
#app { #app {
font-family: Avenir, Helvetica, Arial, sans-serif; font-family: Avenir, Helvetica, Arial, sans-serif;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
</style> </style>
dcit-hcsystem-hcsystem-master/src/views/Enterprises/EnterprisesTj.vue
View file @ 3074d112
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
<!--</div>--> <!--</div>-->
<div style="width:100%;display:flex;flex-direction:row;justify-content:flex-start;"> <div style="width:100%;display:flex;flex-direction:row;justify-content:flex-start;">
<div id="pie20" style="width:48%;height: 100%;margin-left: 1%;"> <div id="pie20" style="width:48%;height: 100%;margin-left: 1%;margin-top: 50px;">
<div id="main2" style="width:100%;height:30em;"></div> <div id="main2" style="width:100%;height:520px;"></div>
</div> </div>
<div id="pie3" style="width:48%;height: 100%;margin-left: 0%;"> <div id="pie3" style="width:48%;height: 100%;margin-left: 0%;margin-top: 50px;">
<div id="main3" style="width:100%;height:30em;"></div> <div id="main3" style="width:100%;height:520px;"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -300,42 +300,72 @@ export default { ...@@ -300,42 +300,72 @@ export default {
// } // }
// }); // });
// 绘制图表 // 绘制图表
// myChart2.setOption({
// // color:['rgb(8,252,7)','rgb(255,168,0)','rgb(0,121,254)','rgb(0,255,251)','rgb(3,120,251)','rgb(0,200,251)'],
// title: {
// text: '企业危险源数量统计',//主标题
// color: '#000',
// // subtext: '柱状图',
// textStyle: {
// color: "#000",
// }
// },
// tooltip: {},
// legend: {
// data:['危险源'],
// textStyle: { //图例文字的样式
// color: '#000',
// }
// },
// xAxis: {
// axisLabel: {
// interval:0,
// rotate:40
// } ,
// data: ["监控点位","危险源","职业危害场所","隐患","设备数量"],
// //data: [],
// },
// yAxis: {},
// series: [{
// name: '危险源',
// type: 'bar',
// //data: [5, 20, 36, 10, 10, 20],
// data: data,
// }],
// textStyle: {
// color: "#000",
// fontSize: 18
// },
// });
myChart2.setOption({ myChart2.setOption({
// color:['rgb(8,252,7)','rgb(255,168,0)','rgb(0,121,254)','rgb(0,255,251)','rgb(3,120,251)','rgb(0,200,251)'],
title: { title: {
text: '企业危险源数量统计',//主标题 text: '企业安全基础信息'
color: '#000',
// subtext: '柱状图',
textStyle: {
color: "#000",
}
}, },
tooltip: {},
legend: { legend: {
data:['危险源'], data: ['信息属性']
textStyle: { //图例文字的样式
color: '#000',
}
}, },
xAxis: { radar: {
axisLabel: { // shape: 'circle',
interval:0, indicator: [
rotate:40 { name: '监控点位', max: 10 },
} , { name: '危险源', max: 10 },
data: ["监控点位","危险源","职业危害场所","隐患","设备数量"], { name: '职业危害场所', max: 10 },
//data: [], { name: '隐患', max: 10 },
}, { name: '设备数量', max: 10 }
yAxis: {}, ]
series: [{
name: '危险源',
type: 'bar',
//data: [5, 20, 36, 10, 10, 20],
data: data,
}],
textStyle: {
color: "#000",
fontSize: 18
}, },
series: [
{
name: 'Budget vs spending',
type: 'radar',
data: [
{
value: data,
name: '信息属性'
}
]
}
]
}); });
} }
} }
......
dcit-hcsystem-hcsystem-master/src/views/Video/VideoList.vue
View file @ 3074d112
...@@ -162,18 +162,20 @@ ...@@ -162,18 +162,20 @@
if(node.level == "3"){ if(node.level == "3"){
that.playerWindow = 'newplay' + that.flag; that.playerWindow = 'newplay' + that.flag;
var player = new WasmPlayer(null, that.playerWindow, null, {Height: true}); var player = new WasmPlayer(null, that.playerWindow, null, {Height: true});
// console.log(that.playerWindow, node.data.deviceNumber) //console.log(that.playerWindow, node.data.deviceNumber)
METHOD.axiosGet( METHOD.axiosGet(
this, this,
`/artemis/getPreviewURLs?cameraIndexCode=`+that.treecheckedObj.deviceNumber, `/artemis/getPreviewURLs?cameraIndexCode=`+that.treecheckedObj.deviceNumber,
function(res) { function(res) {
// console.log(res.code) console.log(res.code)
if (res.code == 0) { if (res.code == 0) {
//+"?transcode=1&videotype=h264"
player.play(res.data.url, 1); player.play(res.data.url, 1);
}else{ }else{
//player.play('http://live.hkstv.hk.lxdns.com/flv/hks.flv', 1); player.play('http://27.128.189.137:18000/flv/hls/stream_88_0.flv', 1);
} }
}); });
//player.play('http://27.128.189.137:18000/flv/hls/stream_88_0.flv', 1);
//player.play('http://27.128.189.137:18000/flv/hls/' + that.treecheckedObj.deviceNumber + '.flv', 1); //player.play('http://27.128.189.137:18000/flv/hls/' + that.treecheckedObj.deviceNumber + '.flv', 1);
if(that.flag < 4) { if(that.flag < 4) {
that.flag++; that.flag++;
......
dcit-hcsystem-hcsystem-master/src/views/guarantee/dangerMap.vue
View file @ 3074d112
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<div class="markBox"> <div class="markBox">
<div @click="mapma" class="markbox-div" ref="material" style="margin-top: 50px;"> <div @click="mapma" class="markbox-div" ref="material" style="margin-top: 10px;">
<div class="markbox-click" ref="maimg" style="width: 30%;height: 100%;float: left;text-align: right;"> <div class="markbox-click" ref="maimg" style="width: 30%;height: 100%;float: left;text-align: right;">
<img width="30px" src="@/assets/mark/tongxin.png" /> <img width="30px" src="@/assets/mark/tongxin.png" />
</div> </div>
...@@ -662,7 +662,7 @@ ...@@ -662,7 +662,7 @@
that.mapLoadDone = true; that.mapLoadDone = true;
that.Mutil = new Mutil("mapbox"); that.Mutil = new Mutil("mapbox");
that.MAP = that.Mutil.MAP; that.MAP = that.Mutil.MAP;
await this.Mutil.getBoundaries("新乐") await this.Mutil.getBoundaries("行唐")
that.Mutil.mapSelectBind((evt: any) => { that.Mutil.mapSelectBind((evt: any) => {
//这是地图marker点击回调监听 //这是地图marker点击回调监听
/*if (evt.selected[0].get('type') === 'qiye') { /*if (evt.selected[0].get('type') === 'qiye') {
...@@ -679,8 +679,6 @@ ...@@ -679,8 +679,6 @@
this.getStatiData(); this.getStatiData();
this.getMaterial(); this.getMaterial();
} }
mapma(){ mapma(){
......
dcit-hcsystem-hcsystem-master/src/views/qyMap/qyMap.vue
View file @ 3074d112
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
</div> </div>
<div @click="kongzhi" id="bluebox2" <div @click="kongzhi" id="bluebox2"
style="width: 18px;height: 8%;z-index: 11;background-color: rgba(2, 40, 90, 0.9);position: absolute;top: 0;left: 500px;float: left;top:45%;border-radius: 5px;"> style="width: 18px;height: 8%;z-index: 11;background-color: rgba(2, 40, 90, 0.9);position: absolute;top: 0;left: 500px;float: left;top:45%;border-radius: 5px;">
<img id ="ko" style="height: 100%;width: 100%" src="@/assets/Subtract-1.png"/> <div style="width: 100%;height: 25%"></div>
<img id ="ko" style="height: 50%;width: 100%;" src="@/assets/Subtract-1.png"/>
</div> </div>
<div class="markBox"> <div class="markBox">
...@@ -218,6 +219,7 @@ ...@@ -218,6 +219,7 @@
@Provide() materialData: any = []; @Provide() materialData: any = [];
@Provide() lastVideoPlayId: any = ""; @Provide() lastVideoPlayId: any = "";
@Provide() markersB: any = []; @Provide() markersB: any = [];
@Provide() videoUrl: any = "";
@Provide() dialogVisible1: Boolean = false; @Provide() dialogVisible1: Boolean = false;
@Provide() dialogVisible2: Boolean = false; @Provide() dialogVisible2: Boolean = false;
@Provide() toolobj: any; @Provide() toolobj: any;
...@@ -417,6 +419,7 @@ ...@@ -417,6 +419,7 @@
} }
getshipinWindowInfo(deviceId: string) { getshipinWindowInfo(deviceId: string) {
console.log("deviceId:"+deviceId);
let that = this; let that = this;
this.closeVideo(); this.closeVideo();
METHOD.axiosGet( METHOD.axiosGet(
...@@ -440,12 +443,15 @@ ...@@ -440,12 +443,15 @@
this, this,
`/artemis/getPreviewURLs?cameraIndexCode=`+that.treecheckedObj.deviceNumber, `/artemis/getPreviewURLs?cameraIndexCode=`+that.treecheckedObj.deviceNumber,
function(res) { function(res) {
// console.log(res.code)
if (res.code == 0) { if (res.code == 0) {
console.log(res.data.url)
that.videoUrl = res.data.url;
that.player = new WasmPlayer(null, "div_video", null);
that.player.play(res.data.url, 1); that.player.play(res.data.url, 1);
that.lastVideoPlayId = that.treecheckedObj.deviceNumber;//记录上次播放的视频ID that.lastVideoPlayId = that.treecheckedObj.deviceNumber;//记录上次播放的视频ID
}else{ }else{
//player.play('http://live.hkstv.hk.lxdns.com/flv/hks.flv', 1); //that.player.play('http://live.hkstv.hk.lxdns.com/flv/hks.flv', 1);
//that.player.play("http://27.128.189.137:18000/flv/hls/stream_88_0.flv", 1);
} }
}); });
} }
...@@ -529,8 +535,9 @@ ...@@ -529,8 +535,9 @@
// } // }
//关闭视频方法 //关闭视频方法
closeVideo() { closeVideo() {
if (this.lastVideoPlayId != "") { if (this.videoUrl != "") {
this.player.stop('http://27.128.189.137:18000/flv/hls/' + this.lastVideoPlayId + '.flv', 1); console.log("--1"+this.videoUrl)
this.player.stop(this.videoUrl, 1);
} }
this.isShowVideo = false; this.isShowVideo = false;
} }
...@@ -569,6 +576,7 @@ ...@@ -569,6 +576,7 @@
0.4, 0.4,
index+1 index+1
); );
that.Mutil.visibleMarks(false, "material");
} }
addMark(obj: any, index: any) { addMark(obj: any, index: any) {
let icon, let icon,
...@@ -605,6 +613,7 @@ ...@@ -605,6 +613,7 @@
0.4, 0.4,
obj.enterpriseId obj.enterpriseId
); );
that.Mutil.visibleMarks(false, "qiye");
} }
harmaddMark(obj: any, index: any) { harmaddMark(obj: any, index: any) {
...@@ -640,6 +649,7 @@ ...@@ -640,6 +649,7 @@
0.6, 0.6,
index+1 index+1
); );
that.Mutil.visibleMarks(false, "wh");
} }
wxyaddMark(obj: any, index: any) { wxyaddMark(obj: any, index: any) {
let icon, let icon,
...@@ -674,6 +684,7 @@ ...@@ -674,6 +684,7 @@
0.6, 0.6,
obj.id obj.id
); );
that.Mutil.visibleMarks(false, "wxy");
} }
shipinaddMark(obj: any, index: any) { shipinaddMark(obj: any, index: any) {
let icon, let icon,
...@@ -708,6 +719,7 @@ ...@@ -708,6 +719,7 @@
0.6, 0.6,
obj.id obj.id
); );
that.Mutil.visibleMarks(false, "shipin");
} }
yhaddMark(obj: any, index: any) { yhaddMark(obj: any, index: any) {
let icon, let icon,
...@@ -742,6 +754,7 @@ ...@@ -742,6 +754,7 @@
0.6, 0.6,
obj.id obj.id
); );
that.Mutil.visibleMarks(false, "yh");
} }
change(v: any) { change(v: any) {
let that = this; let that = this;
...@@ -835,7 +848,7 @@ ...@@ -835,7 +848,7 @@
that.getyinhuanWindowInfo(yinhuanid); that.getyinhuanWindowInfo(yinhuanid);
} }
created() { created() {
this.getMapData(); //this.getMapData();
//this.getMaterial(); //this.getMaterial();
} }
cancel(){ cancel(){
...@@ -906,17 +919,18 @@ ...@@ -906,17 +919,18 @@
}); });
} }
async mounted() { async mounted() {
let that = this; let that = this;
that.player = new WasmPlayer(null, "div_video", null); that.player = new WasmPlayer(null, "div_video", null);
that.mapLoadDone = true; that.mapLoadDone = true;
that.Mutil = new Mutil("mapbox"); that.Mutil = new Mutil("mapbox");
that.MAP = that.Mutil.MAP; that.MAP = that.Mutil.MAP;
await this.Mutil.getBoundaries("新乐"); await this.Mutil.getBoundaries("行唐");
this.getMapData();
that.Mutil.mapSelectBind((evt: any) => { that.Mutil.mapSelectBind((evt: any) => {
//这是地图marker点击回调监听 //这是地图marker点击回调监听
if (evt.selected[0].get('type') === 'qiye') { if (evt.selected[0].get('type') === 'qiye') {
console.log("qyyedianji")
that.Mutil.closeAllOverlays(); that.Mutil.closeAllOverlays();
let id = evt.selected[0].get('did'); let id = evt.selected[0].get('did');
if (id) that.getPopcon(id); if (id) that.getPopcon(id);
...@@ -948,13 +962,13 @@ ...@@ -948,13 +962,13 @@
mapqiye() { mapqiye() {
if (this.qiyeVisble) { if (this.qiyeVisble) {
this.Mutil.visibleMarks(false, "qiye"); this.Mutil.visibleMarks(true, "qiye");
this.qiyeVisble = false; this.qiyeVisble = false;
this.$refs.qyzc.style.background = "#24BBC7"; this.$refs.qyzc.style.background = "#24BBC7";
this.$refs.zqyzc.lastChild.style.color = "#013056"; this.$refs.zqyzc.lastChild.style.color = "#013056";
} else { } else {
this.Mutil.visibleMarks(true, "qiye"); this.Mutil.visibleMarks(false, "qiye");
this.Mutil.setViewF({ this.Mutil.setViewF({
center: [this.mapData[0].longitude,this.mapData[0].latitude] center: [this.mapData[0].longitude,this.mapData[0].latitude]
}) })
...@@ -966,12 +980,12 @@ ...@@ -966,12 +980,12 @@
} }
mapma(){ mapma(){
if (this.maVisble) { if (this.maVisble) {
this.Mutil.visibleMarks(false, "material"); this.Mutil.visibleMarks(true, "material");
this.maVisble = false; this.maVisble = false;
this.$refs.material.style.background = "#24BBC7"; this.$refs.material.style.background = "#24BBC7";
this.$refs.zma.lastChild.style.color = "#013056"; this.$refs.zma.lastChild.style.color = "#013056";
} else { } else {
this.Mutil.visibleMarks(true, "material"); this.Mutil.visibleMarks(false, "material");
this.maVisble = true; this.maVisble = true;
this.$refs.material.style.background = "RGBA(5, 52, 82, 0.7)"; this.$refs.material.style.background = "RGBA(5, 52, 82, 0.7)";
this.$refs.zma.lastChild.style.color = "#fff"; this.$refs.zma.lastChild.style.color = "#fff";
...@@ -984,7 +998,7 @@ ...@@ -984,7 +998,7 @@
// } // }
mapwxy() { mapwxy() {
if (this.wxyVisble) { if (this.wxyVisble) {
this.Mutil.visibleMarks(false, "wxy"); this.Mutil.visibleMarks(true, "wxy");
this.wxyVisble = false; this.wxyVisble = false;
this.$refs.wxy.style.background = "#24BBC7"; this.$refs.wxy.style.background = "#24BBC7";
this.$refs.zwxy.lastChild.style.color = "#013056"; this.$refs.zwxy.lastChild.style.color = "#013056";
...@@ -992,7 +1006,7 @@ ...@@ -992,7 +1006,7 @@
this.Mutil.setViewF({ this.Mutil.setViewF({
center: [this.wxymapData[0].longitude,this.wxymapData[0].latitude] center: [this.wxymapData[0].longitude,this.wxymapData[0].latitude]
}) })
this.Mutil.visibleMarks(true, "wxy"); this.Mutil.visibleMarks(false, "wxy");
this.wxyVisble = true; this.wxyVisble = true;
this.$refs.wxy.style.background = "RGBA(5, 52, 82, 0.7)"; this.$refs.wxy.style.background = "RGBA(5, 52, 82, 0.7)";
this.$refs.zwxy.lastChild.style.color = "#fff"; this.$refs.zwxy.lastChild.style.color = "#fff";
...@@ -1000,7 +1014,7 @@ ...@@ -1000,7 +1014,7 @@
} }
mapwh() { mapwh() {
if (this.harmVisble) { if (this.harmVisble) {
this.Mutil.visibleMarks(false, "wh"); this.Mutil.visibleMarks(true, "wh");
this.harmVisble = false; this.harmVisble = false;
this.$refs.wh.style.background = "#24BBC7"; this.$refs.wh.style.background = "#24BBC7";
this.$refs.zwh.lastChild.style.color = "#013056"; this.$refs.zwh.lastChild.style.color = "#013056";
...@@ -1008,7 +1022,7 @@ ...@@ -1008,7 +1022,7 @@
this.Mutil.setViewF({ this.Mutil.setViewF({
center: [this.harmmapData[0].longitude,this.harmmapData[0].latitude] center: [this.harmmapData[0].longitude,this.harmmapData[0].latitude]
}) })
this.Mutil.visibleMarks(true, "wh"); this.Mutil.visibleMarks(false, "wh");
this.harmVisble = true; this.harmVisble = true;
this.$refs.wh.style.background = "RGBA(5, 52, 82, 0.7)"; this.$refs.wh.style.background = "RGBA(5, 52, 82, 0.7)";
this.$refs.zwh.lastChild.style.color = "#fff"; this.$refs.zwh.lastChild.style.color = "#fff";
...@@ -1016,7 +1030,7 @@ ...@@ -1016,7 +1030,7 @@
} }
mapshipin() { mapshipin() {
if (this.shipinVisble) { if (this.shipinVisble) {
this.Mutil.visibleMarks(false, "shipin"); this.Mutil.visibleMarks(true, "shipin");
this.shipinVisble = false; this.shipinVisble = false;
this.$refs.jk.style.background = "#24BBC7"; this.$refs.jk.style.background = "#24BBC7";
this.$refs.zjk.lastChild.style.color = "#013056"; this.$refs.zjk.lastChild.style.color = "#013056";
...@@ -1024,7 +1038,7 @@ ...@@ -1024,7 +1038,7 @@
this.Mutil.setViewF({ this.Mutil.setViewF({
center: [this.shipinmapData[0].longitude,this.shipinmapData[0].latitude] center: [this.shipinmapData[0].longitude,this.shipinmapData[0].latitude]
}) })
this.Mutil.visibleMarks(true, "shipin"); this.Mutil.visibleMarks(false, "shipin");
this.shipinVisble = true; this.shipinVisble = true;
this.$refs.jk.style.background = "RGBA(5, 52, 82, 0.7)"; this.$refs.jk.style.background = "RGBA(5, 52, 82, 0.7)";
this.$refs.zjk.lastChild.style.color = "#fff"; this.$refs.zjk.lastChild.style.color = "#fff";
...@@ -1032,7 +1046,7 @@ ...@@ -1032,7 +1046,7 @@
} }
yinhuan() { yinhuan() {
if (this.yinhuanVisble) { if (this.yinhuanVisble) {
this.Mutil.visibleMarks(false, "yh"); this.Mutil.visibleMarks(true, "yh");
this.yinhuanVisble = false; this.yinhuanVisble = false;
this.$refs.yh.style.background = "#24BBC7"; this.$refs.yh.style.background = "#24BBC7";
this.$refs.zyh.lastChild.style.color = "#013056"; this.$refs.zyh.lastChild.style.color = "#013056";
...@@ -1040,7 +1054,7 @@ ...@@ -1040,7 +1054,7 @@
this.Mutil.setViewF({ this.Mutil.setViewF({
center: [this.yhmapData[0].longitude,this.yhmapData[0].latitude] center: [this.yhmapData[0].longitude,this.yhmapData[0].latitude]
}) })
this.Mutil.visibleMarks(true, "yh"); this.Mutil.visibleMarks(false, "yh");
this.yinhuanVisble = true; this.yinhuanVisble = true;
this.$refs.yh.style.background = "RGBA(5, 52, 82, 0.7)"; this.$refs.yh.style.background = "RGBA(5, 52, 82, 0.7)";
this.$refs.zyh.lastChild.style.color = "#fff"; this.$refs.zyh.lastChild.style.color = "#fff";
......
dcit-hcsystem-hcsystem-master/src/views/qyMap/qyMapone.vue
View file @ 3074d112
...@@ -6,23 +6,23 @@ ...@@ -6,23 +6,23 @@
<div style="width:100%;height: 30px;text-align: center;"> <div style="width:100%;height: 30px;text-align: center;">
<span style="font-size: 20px; font-weight: 900; color: #fff;">企业注册</span> <span style="font-size: 20px; font-weight: 900; color: #fff;">企业注册</span>
</div> </div>
<div style="width: 50%;height: 180px;float: left;text-align: center;"> <div style="width: 50%;height: 160px;float: left;text-align: center;">
<div class="qiyezc"> <div class="qiyezc">
<img src="@/assets/mark/qiyezc.png" alt="" style="width: 180px;height: 180px;"> <img src="@/assets/mark/qiyezc.png" alt="" style="width: 160px;height: 160px;">
<div style="position: absolute;width: 100%; height: 100%;top: 0;text-align: center;color: #fff;font-size: 1.2rem;font-weight: 500;"> <div style="position: absolute;width: 100%; height: 100%;top: 0;text-align: center;color: #fff;font-size: 1rem;font-weight: 500;">
<p>注册数量</p> <p>注册数量</p>
<span id="span1" style="font-size: 1.5rem;">{{$data.enterpriseRegNum}}个</span> <span id="span1" style="font-size: 1.2rem;">{{$data.enterpriseRegNum}}个</span>
</div> </div>
</div> </div>
</div> </div>
<div style="width: 50%;height: 180px;float: right;text-align: center;"> <div style="width: 50%;height: 160px;float: right;text-align: center;">
<div class="qiyesh"> <div class="qiyesh">
<img src="@/assets/mark/qiyesh.png" alt="" style="width: 180px;height: 180px;"> <img src="@/assets/mark/qiyesh.png" alt="" style="width: 160px;height: 160px;">
<div style="position: absolute;width: 100%; height: 100%;top: 0;text-align: center;color: #fff;font-size: 1.2rem;font-weight: 500;"> <div style="position: absolute;width: 100%; height: 100%;top: 0;text-align: center;color: #fff;font-size: 1rem;font-weight: 500;">
<p>审核数量</p> <p>审核数量</p>
<span id="span2" style="font-size: 1.5rem;" >{{$data.enterpriseCheckIngNum}}个</span> <span id="span2" style="font-size: 1.2rem;" >{{$data.enterpriseCheckIngNum}}个</span>
</div> </div>
</div> </div>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<dv-border-box-12> <dv-border-box-12>
<div id="pie2" style="width:450px;height: auto;padding: 20px 0 0 0;"> <div id="pie2" style="width:450px;height: auto;padding: 20px 0 0 0;">
<!-- 为 ECharts 准备一个具备大小（宽高）的 DOM --> <!-- 为 ECharts 准备一个具备大小（宽高）的 DOM -->
<div id="main2" style="width:450px;height:calc(100vh - 670px);"></div> <div id="main2" style="width:450px;height:calc(100vh - 670px);max-height: 350px"></div>
</div> </div>
</dv-border-box-12> </dv-border-box-12>
<div class="div-table" style="width:480px;margin-bottom: 11px;background-color: rgb(0, 0, 0,0);position: fixed;bottom: 0;right: 0;margin-right: 10px;"> <div class="div-table" style="width:480px;margin-bottom: 11px;background-color: rgb(0, 0, 0,0);position: fixed;bottom: 0;right: 0;margin-right: 10px;">
...@@ -460,7 +460,7 @@ export default { ...@@ -460,7 +460,7 @@ export default {
.pie #pie2 { .pie #pie2 {
/* border: 1px #000000 solid; */ /* border: 1px #000000 solid; */
margin-left: 20px; margin-left: 20px;
margin-top: 20px !important; margin-top: 0px !important;
} }
.el-main .el-tabs .el-tabs__content{ .el-main .el-tabs .el-tabs__content{
/* height: 100%; */ /* height: 100%; */
......
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