Merge remote-tracking branch 'origin/dev' into dev

src/layout/header-aside/components/header-user/index.vue

@@ -169,9 +169,12 @@ export default {
 
   .user-info{
     width: 84px;
-    height: 36px;
-    background: url(../../imgs/subwayBg.png);
-    background-size: 100% 100%;
+    height: 34px;
+    border-top: 1px solid rgba(255, 255, 255, 0.75);
+    border-bottom: 1px solid rgba(255, 255, 255, 0.75);
+    border-left: 1px solid rgba(255, 255, 255, 0.75);
+    border-top-left-radius: 7px;
+    border-bottom-left-radius: 7px;
     text-align:center;
     opacity: 0;
     float: right;

src/layout/header-aside/layout.vue

@@ -26,8 +26,9 @@
               <div class="current-date">{{ time | formatDate2 }}</div>
             </div>
             <div class="subway-container" >
-              <div class="subway-info" >
-                 <span :class="station.length<6?'lineFeed':''">{{station}}</span>
+              <div class="subway-info" :style="{width:station.length*13+ 'px','min-width':'60px'}">
+                 <!-- <span :class="station.length<6?'lineFeed':''">{{station}}</span> -->
+                 <span>{{station}}</span>
                 <!-- <div class="out-img">
                 </div> -->
               </div>
@@ -199,14 +200,13 @@ export default {
     this.zdCountNum = this.size.split('-')[0]
     this.xlCountNum = this.size.split('-')[1]
 
-    let currentPath=this.$route.path
+    let currentPath = this.$route.path
     let routeName = currentPath.slice(0, 7)
     if (routeName == '/routes') {
       this.isShow = true
     } else {
       this.isShow = false
     }
-
   },
   filters: {
     formatDate: function(value) {
@@ -265,7 +265,6 @@ export default {
       this.xlCountNum = val.split('-')[1]
       // console.log(this.zdCountNum, '1--------1')
       // console.log(this.xlCountNum, '2--------2')
-
     },
     '$route.path'(val) {
       // console.log(val, '--------')
@@ -445,7 +444,6 @@ export default {
   transform: translateY(60px);
 }
 
-
 // 注册主题
 @import "~@/assets/style/theme/register.scss";
 // 左上角logo
@@ -494,23 +492,20 @@ export default {
   }
 
   .subway-info {
-    min-width: 104px;
-    height: 36px;
-    line-height: 36px;
-    background: url(./imgs/subwayBg.png);
-    background-size: 100% 100%;
-    transform: translateX(12px);
+    height: 34px;
+    line-height:34px;
     text-align:right;
-       span {
-        display:inline-block;
-        height: 36px;
-        // padding-top:2px;
-        padding-right:16px;
     font-size: 12px;
+    padding-right:16px;
     font-family: Microsoft YaHei;
     font-weight: 400;
     color: rgba(255, 255, 255, 0.75);
-      }
+    transform: translateX(12px);
+    border-top: 1px solid rgba(255, 255, 255, 0.75);
+    border-bottom: 1px solid rgba(255, 255, 255, 0.75);
+    border-left: 1px solid rgba(255, 255, 255, 0.75);
+    border-top-left-radius: 7px;
+    border-bottom-left-radius: 7px;
   }
 }
 </style>

src/pages/access/point/index.vue

@@ -184,7 +184,8 @@ export default {
       let mapList = this.mapList
       this.imgurl = url
       // 计算静态地图映射到地图上的范围
-      let extent = [-1100, 110, 1460, 820]
+      // let extent = [-1100, 110, 1460, 820]
+      let extent = [-600, -100, 800, 1000]
 
       let projection = new Projection({
         // 投影
@@ -238,7 +239,7 @@ export default {
         view: new View({
           projection: projection,
           center: getCenter([0, 0, 0, 0]), // 获取范围的中心坐标。
-          zoom: 2.5,
+          zoom: 1.5,
           maxZoom: 5.0,
           minZoom: 1.5,
           extent: [-1100, -100, 2000, 1000]//[minX, minY, maxX, maxY] 控制拖动

src/pages/monitor/point/index.vue

@@ -185,7 +185,8 @@ export default {
       let mapList = this.mapList
       this.imgurl = url
       // 计算静态地图映射到地图上的范围
-      let extent = [-1100, 110, 1460, 820]
+      // let extent = [-1100, 110, 1460, 820]
+      let extent = [-600, -100, 800, 1000]
 
       let projection = new Projection({
         // 投影
@@ -239,7 +240,7 @@ export default {
         view: new View({
           projection: projection,
           center: getCenter([0, 0, 0, 0]), // 获取范围的中心坐标。
-          zoom: 2.5,
+          zoom: 1.5,
           maxZoom: 5.0,
           minZoom: 1.5,
           extent: [-1100, -100, 2000, 1000]//[minX, minY, maxX, maxY] 控制拖动

src/pages/patrol/data/query-detail.vue

@@ -145,7 +145,8 @@ export default {
     // 初始化地图
     initMap(url) {
       // 计算静态地图映射到地图上的范围
-      let extent = [-1100, 110, 1460, 820]
+      // let extent = [-1100, 110, 1460, 820]
+      let extent = [-600, -100, 800, 1000]
 
       let projection = new Projection({
         // 投影
@@ -177,9 +178,9 @@ export default {
         view: new View({
           projection: projection,
           center: getCenter([0, 0, 0, 0]), // 获取范围的中心坐标。
-          zoom: 2.65,
-          maxZoom: 2.65,
-          minZoom: 2.65,
+          zoom: 1.5,
+          maxZoom: 1.5,
+          minZoom: 1.5,
           extent: [-1030, 100, 2000, 1000] //[minX, minY, maxX, maxY] 控制拖动
         })
       })

src/pages/patrol/line/index.vue

@@ -203,7 +203,8 @@ export default {
       let mapList = this.mapList
       this.imgurl = url
       // 计算静态地图映射到地图上的范围
-      let extent = [-1100, 110, 1460, 820]
+      // let extent = [-1100, 110, 1460, 820]
+      let extent = [-600, -100, 800, 1000]
 
       let projection = new Projection({
         // 投影
@@ -257,7 +258,7 @@ export default {
         view: new View({
           projection: projection,
           center: getCenter([0, 0, 0, 0]), // 获取范围的中心坐标。
-          zoom: 2.5,
+          zoom: 1.5,
           maxZoom: 5.0,
           minZoom: 1.5,
           extent: [-1100, -100, 2000, 1000] //[minX, minY, maxX, maxY] 控制拖动

src/pages/patrol/plan/plan-add-or-update.vue

@@ -289,7 +289,8 @@ export default {
       let mapList = this.mapList
       this.imgurl = url
       // 计算静态地图映射到地图上的范围
-      let extent = [-1100, 110, 1460, 820]
+      // let extent = [-1100, 110, 1460, 820]
+      let extent = [-600, -100, 800, 1000]
 
       let projection = new Projection({
         // 投影

src/pages/patrol/plan/query-detail.vue

@@ -242,7 +242,8 @@ export default {
       let mapList = this.mapList
       this.imgurl = url
       // 计算静态地图映射到地图上的范围
-      let extent = [-1100, 110, 1460, 820]
+      // let extent = [-1100, 110, 1460, 820]
+      let extent = [-600, -100, 800, 1000]
 
       let projection = new Projection({
         // 投影

src/pages/patrol/spot/index.vue

@@ -202,7 +202,8 @@ export default {
       let mapList = this.mapList
       this.imgurl = url
       // 计算静态地图映射到地图上的范围
-      let extent = [-1100, 110, 1460, 820]
+      // let extent = [-1100, 110, 1460, 820]
+      let extent = [-600, -100, 800, 1000]
 
       let projection = new Projection({
         // 投影
@@ -256,7 +257,7 @@ export default {
         view: new View({
           projection: projection,
           center: getCenter([0, 0, 0, 0]), // 获取范围的中心坐标。
-          zoom: 2.5,
+          zoom: 1.5,
           maxZoom: 5.0,
           minZoom: 1.5,
           extent: [-1100, -100, 2000, 1000]//[minX, minY, maxX, maxY] 控制拖动
@@ -619,7 +620,7 @@ export default {
       }).then(data => {
         if (data && data.code === 0) {
           this.treeData = data.nodes
-          if(this.treeData){
+          if (this.treeData) {
             this.treeData.forEach(element => {
               element.readPath = this.urlPath + element.filePath
             })

src/pages/police/point/index.vue

@@ -67,7 +67,7 @@
           <div v-show="transformationSta==1">
             <el-row style="background:#fff;" :style="{height:currentHeight-115+'px'}" :span="24">
                 <el-col class="resource-container" :style="obj" ref="drag">
-                  <div id="policeMap" class="map"  ref='map' style="width: 100%;position: relative;" :style="{height:currentHeight-135+'px'}"></div>
+                  <div id="policeMap" class="map"  ref='map' style="width: 100%;position: relative;" :style="{height:currentHeight-125+'px'}"></div>
 
                 </el-col>
             </el-row>
@@ -214,7 +214,8 @@ export default {
       let mapList = this.mapList
       this.imgurl = url
       // 计算静态地图映射到地图上的范围
-      let extent = [-1100, 110, 1460, 820]
+      // let extent = [-1100, 110, 1460, 820]
+      let extent = [-600, -100, 800, 1000]
 
       let projection = new Projection({
         // 投影
@@ -268,7 +269,7 @@ export default {
         view: new View({
           projection: projection,
           center: getCenter([0, 0, 0, 0]), // 获取范围的中心坐标。
-          zoom: 2.5,
+          zoom: 1.5,
           maxZoom: 5.0,
           minZoom: 1.5,
           extent: [-1100, -100, 2000, 1000]//[minX, minY, maxX, maxY] 控制拖动

src/pages/sys/point/index.vue

@@ -223,7 +223,9 @@
                 let mapList = this.mapList
 
                 // 计算静态地图映射到地图上的范围
-                let extent = [-1100, 110, 1460, 820]
+                // let extent = [-1100, 110, 1460, 820]
+                let extent = [-600, -100, 800, 1000]
+
                 let projection = new Projection({
                     // 投影
                     code: 'xkcd-image',
@@ -257,7 +259,7 @@
                     view: new View({
                         projection: projection,
                         center: getCenter([0, 0, 418, 600]), // 获取范围的中心坐标。
-                        zoom: 2.5,
+                        zoom: 1.5,
                         maxZoom: 5,
                         minZoom: 1.5,
                         extent: [-1100, -100, 2000, 1000]//[minX,minY,maxX,maxY] 控制拖动

src/pages/sys/region/index.vue

@@ -109,7 +109,7 @@ export default {
   },
   data() {
     return {
-      isShow:true,
+      isShow: true,
       imgLayerList: [],
       controlList: [],
       urlPath: window.CONFIG.urlPath,
@@ -195,11 +195,11 @@ export default {
     QueryDetail
   },
     watch: {
-    'leftListData'(val){
-      if(val.length>0){
-        this.isShow=true
-      }else{
-        this.isShow=false
+    'leftListData'(val) {
+      if (val.length > 0) {
+        this.isShow = true
+      } else {
+        this.isShow = false
       }
     }
   },
@@ -213,7 +213,8 @@ export default {
       let mapList = this.mapList
       this.imgurl = url
       // 计算静态地图映射到地图上的范围
-      let extent = [-1100, 110, 1460, 820]
+      // let extent = [-1100, 110, 1460, 820]
+      let extent = [-600, -100, 800, 1000]
 
       let projection = new Projection({
         // 投影
@@ -267,7 +268,7 @@ export default {
         view: new View({
           projection: projection,
           center: getCenter([0, 0, 0, 0]), // 获取范围的中心坐标。
-          zoom: 2.5,
+          zoom: 1.5,
           maxZoom: 5.0,
           minZoom: 1.5,
           extent: [-1100, -100, 2000, 1000] //[minX, minY, maxX, maxY] 控制拖动
@@ -286,7 +287,7 @@ export default {
       //将鹰眼控件加载到map中
       // this.map.addControl(this.controlList[0])
 
-      if(this.leftListData.length==0){
+      if (this.leftListData.length == 0) {
         this.clearLayer()
       }
       // //点击事件