Merge remote-tracking branch 'origin/master'

dcit-hcsystem-hcsystem-master/src/views/qyMap/qyMap.vue

@@ -148,6 +148,13 @@
     import QyMapone from './qyMapone.vue';
     import vueDrag from 'vue-dragging'
     import { Component, Vue, Provide, Prop, Watch } from "vue-property-decorator";
+    import 'ol/ol.css';
+    import Map from 'ol/Map';
+    import OSM from 'ol/source/OSM';
+    import TileLayer from 'ol/layer/Tile';
+    import View from 'ol/View';
+    import {easeIn, easeOut} from 'ol/easing';
+    import {fromLonLat} from 'ol/proj';
     Vue.use(vueDrag)
     @Component({
         components: {
@@ -797,11 +804,13 @@
                 this.Mutil.visibleMarks(false, "qiye");
                 this.qiyeVisble = false;
                 this.$refs.qyzc.style.background = "#24BBC7";
-                this.$refs.zqyzc.lastChild.style.color = "#013056";                
-                // this.$refs.qyimg.lastChild.style.display = "none";
+                this.$refs.zqyzc.lastChild.style.color = "#013056";
 
             } else {
                 this.Mutil.visibleMarks(true, "qiye");
+                this.Mutil.setViewF({
+                    center: [this.mapData[0].longitude,this.mapData[0].latitude]
+                })
                 this.qiyeVisble = true;
                 this.$refs.qyzc.style.background = "RGBA(5, 52, 82, 0.7)";
                 this.$refs.zqyzc.lastChild.style.color = "#fff";
@@ -833,6 +842,9 @@
                 this.$refs.wxy.style.background = "#24BBC7";
                 this.$refs.zwxy.lastChild.style.color = "#013056";
             } else {
+                this.Mutil.setViewF({
+                    center: [this.wxymapData[0].longitude,this.wxymapData[0].latitude]
+                })
                 this.Mutil.visibleMarks(true, "wxy");
                 this.wxyVisble = true;
                 this.$refs.wxy.style.background = "RGBA(5, 52, 82, 0.7)";
@@ -846,6 +858,9 @@
                 this.$refs.jk.style.background = "#24BBC7";
                 this.$refs.zjk.lastChild.style.color = "#013056";
             } else {
+                this.Mutil.setViewF({
+                    center: [this.shipinmapData[0].longitude,this.shipinmapData[0].latitude]
+                })
                 this.Mutil.visibleMarks(true, "shipin");
                 this.shipinVisble = true;
                 this.$refs.jk.style.background = "RGBA(5, 52, 82, 0.7)";
@@ -859,6 +874,9 @@
                 this.$refs.yh.style.background = "#24BBC7";
                 this.$refs.zyh.lastChild.style.color = "#013056";
             } else {
+                this.Mutil.setViewF({
+                    center: [this.yhmapData[0].longitude,this.yhmapData[0].latitude]
+                })
                 this.Mutil.visibleMarks(true, "yh");
                 this.yinhuanVisble = true;
                 this.$refs.yh.style.background = "RGBA(5, 52, 82, 0.7)";

dcit-hcsystem-hcsystem-master/src/views/qyMap/qyMapone.vue

 <template style="">
     
-    <div class="pie" style="width:480px;margin-left: 10px;margin-top: 20px;">
+    <div class="pie" style="width:480px;margin-left: 10px;margin-top: 10px;">
       <!-- <dv-border-box-1> -->
         <div class="pie-div">
             <div style="width:100%;height: 30px;text-align: center;">
@@ -31,12 +31,12 @@
         </div>
       <!-- </dv-border-box-1> -->
       <dv-border-box-12>
-        <div id="pie2" style="width:450px;height: 330px;padding: 20px 0 0 0;">
+        <div id="pie2" style="width:450px;height: auto;padding: 20px 0 0 0;">
             <!-- 为 ECharts 准备一个具备大小（宽高）的 DOM -->
-            <div id="main2" style="width:450px;height:310px;"></div>
+            <div id="main2" style="width:450px;height:calc(100vh - 670px);"></div>
         </div>
       </dv-border-box-12>
-        <div class="div-table" style="width:480px;margin-top: 20px;background-color: rgb(0, 0, 0,0);position: fixed;bottom: 0;right: 0;margin-right: 20px;">
+        <div class="div-table" style="width:480px;margin-top: 15px;background-color: rgb(0, 0, 0,0);position: fixed;bottom: 0;right: 0;margin-right: 20px;">
           <div style="width: 100%;height: 38px;text-align: left;font-size: 16px; line-height: 38px;color: #fff;font-weight: 900;background: #013056;opacity: 0.8;"><span style="margin-left: 10px;">预警信息</span></div>
           <el-table :data="$data.tableData" stripe border :header-cell-style="{background:'#02285a',color:'#fff',}">
             <el-table-column prop="unitName" label="企业名称" width="110"></el-table-column>
@@ -49,9 +49,9 @@
             <el-table-column prop="alarmTime" label="预警时间"></el-table-column>
           </el-table>
         </div>
-        <div id="pie3" style="width:450px;height: 350px;margin-left: 20px;margin-top: 35px;">
+        <div id="pie3" style="width:450px;height: auto;margin-left: 20px;margin-top: 20px;">
           <!-- 为 ECharts 准备一个具备大小（宽高）的 DOM -->
-          <div id="main3" style="width:450px;height:330px;"></div>
+          <div id="main3" style="width:450px;height:300px;"></div>
         </div>
     </div>
     
@@ -206,7 +206,7 @@ export default {
                         }
         },
         grid: {
-          bottom:'7%',
+          bottom:'13%',
           left: 80,
         },
 		    xAxis: {
@@ -438,7 +438,7 @@ export default {
   .pie #pie2 {
     /* border: 1px #000000 solid; */
     margin-left: 20px;
-    margin-top: 30px !important;
+    margin-top: 20px !important;
 }
 	.el-main .el-tabs .el-tabs__content{
 		/* height: 100%; */