up

src/settings.js

@@ -37,8 +37,8 @@ module.exports = {
   * 服务API地址
   */
   serverUrl: 'http://113.141.93.143:1688', // 正式环境
-  // devServerUrl: 'http://113.141.93.143:1688', // 开发环境
-  devServerUrl: 'http://192.168.3.5:1688', // 开发环境 qu
+  devServerUrl: 'http://113.141.93.143:1688', // 开发环境
+  // devServerUrl: 'http://192.168.3.5:1688', // 开发环境 qu
   // devServerUrl: 'http://192.168.3.201:8080/', // 开发环境  test
   mqttUrl: 'ws://113.141.93.143:8894/mqtt', // mqtt地址
   /**

src/views/goaf/info/components/GoafInfo.vue

@@ -166,7 +166,7 @@ export default {
         this.conditions.goafId = ''
       } else if (type === 2) {
         goafOreheights = goafs.filter(item => (item.goafOrebody === this.conditions.goafOrebody) && (item.goafOrebelt === this.conditions.goafOrebelt))
-        goafOreheights = this.unique(goafOrebodys, 'goafOreheight')
+        goafOreheights = this.unique(goafOreheights, 'goafOreheight')
         this.goafOreheights = goafOreheights
         this.goafNames = []
         this.conditions.goafOreheight = ''

src/views/goaf/map/components/VisualEditor.vue

@@ -115,7 +115,7 @@ const markerIcon = L.icon({
 L.Marker.prototype.options.icon = markerIcon
 import mixins from '@/mixin/mqtt.js'
 import { NumConvertLM, Uint8ArrayToString } from '@/utils'
-const iconSize = [110, 110]
+const iconSize = [65, 65]
 export default {
   name: 'GoafVisualEditor',
   components: {
@@ -368,6 +368,7 @@ export default {
             const goafOrebody = _feature.properties.goafOrebody
             const goafOreheight = _feature.properties.goafOreheight
             const goafName = _feature.properties.goafName
+            var goaf_icon_tag = ''
             var goafAlarmStatus = ''
             let Volume = 0
             if (goafInfo) {
@@ -377,8 +378,8 @@ export default {
             if (_feature.properties.goafAlarmStatus === '1') {
               goafAlarmStatus = 'ico-warning'
             }
-            const goaf_icon_tag = `<div class="goaf-icon-tag" title="${NumConvertLM(goafOrebelt)}-${goafOrebody}-${goafOreheight}-${goafName}">${NumConvertLM(goafOrebelt)}-${goafOrebody}-${goafOreheight}-${goafName}</div>`
-            const html = `<div class="goaf-icon-box ${goafAlarmStatus}" style="width:100%;height:100%;position: relative;">${goaf_icon_tag}<div class="goaf-fill-v" style="height:${Volume}%;"></div></div>`
+            //  goaf_icon_tag = `<div class="goaf-icon-tag" title="${NumConvertLM(goafOrebelt)}-${goafOrebody}-${goafOreheight}-${goafName}"><span class="text">${NumConvertLM(goafOrebelt)}-${goafOrebody}-${goafOreheight}-${goafName}</span></div>`
+            const html = `<div class="goaf-icon-box ${goafAlarmStatus}" style="width:100%;height:100%;position: relative;" title="${NumConvertLM(goafOrebelt)}-${goafOrebody}-${goafOreheight}-${goafName}">${goaf_icon_tag}<div class="goaf-fill-v" style="height:${Volume}%;"></div></div>`
             var icon = L.divIcon({
               html,
               iconSize
@@ -478,6 +479,7 @@ export default {
       let goafOrebodys = this.deeepClone(this.goafOrebodys)
       let goafOreheights = this.deeepClone(this.goafOreheights)
       let goafNames = this.deeepClone(this.goafNames)
+      var goaf_icon_tag = ''
       if (type === 1) {
         goafOrebodys = goafs.filter(item => item.goafOrebelt === this.saveForm.goafOrebelt)
         goafOrebodys = this.unique(goafOrebodys, 'goafOrebody')
@@ -514,8 +516,8 @@ export default {
             const goafOrebody = goafNames[i].goafOrebody
             const goafOreheight = goafNames[i].goafOreheight
             const goafName = goafNames[i].goafName
-            const goaf_icon_tag = `<div class="goaf-icon-tag" title="${NumConvertLM(goafOrebelt)}-${goafOrebody}-${goafOreheight}-${goafName}">${NumConvertLM(goafOrebelt)}-${goafOrebody}-${goafOreheight}-${goafName}</div>`
-            const html = `<div class="goaf-icon-box" style="width:100%;height:100%;position: relative;">${goaf_icon_tag}<div class="goaf-fill-v" style="height:${Volume}%;"></div></div>`
+            // goaf_icon_tag = `<div class="goaf-icon-tag" title="${NumConvertLM(goafOrebelt)}-${goafOrebody}-${goafOreheight}-${goafName}">${NumConvertLM(goafOrebelt)}-${goafOrebody}-${goafOreheight}-${goafName}</div>`
+            const html = `<div class="goaf-icon-box" style="width:100%;height:100%;position: relative;" title="${NumConvertLM(goafOrebelt)}-${goafOrebody}-${goafOreheight}-${goafName}">${goaf_icon_tag}<div class="goaf-fill-v" style="height:${Volume}%;"></div></div>`
             var icon = L.divIcon({
               html,
               iconSize
@@ -751,6 +753,7 @@ export default {
             margin-top: 10px;
             .left-side{
                 min-width: 266px;
+                width: calc((100% - 878px)/2);
                 height: 100%;
                 overflow-y: auto;
                 background-color: #193142;
@@ -785,13 +788,15 @@ export default {
                 }
             }
             #vmap {
+                width: 878px;
                 height: 100%;
-                flex: 1;
+                // flex: 1;
                 background: #8c939d;
                 box-sizing: border-box;
             }
             .rightSide{
                 width: 269px;
+                width: calc((100% - 878px)/2);
                 height: 100%;
                 overflow-y: auto;
                 background-color: #193142;
@@ -889,7 +894,6 @@ export default {
         }
         .goaf-icon-tag{
             width: 100%;
-            display: inline-block;
             background: linear-gradient(90deg, #21649c 0.21%, #060F1E 100%);
             background-color: rgba(33, 100, 156,0.6);
             overflow:hidden;
@@ -899,7 +903,15 @@ export default {
             text-align: center;
             z-index: 99999;
             position: absolute;
-            top: -18px;
+            top: -19px;
+            left: 0;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            .text{
+              display: block;
+              transform: scale(0.5);
+            }
         }
   /*动画*/
 .ico-warning {

src/views/goaf/qrcode/components/GoafInfo.vue

@@ -149,9 +149,11 @@ export default {
         this.conditions.goafOreheight = ''
         this.conditions.goafName = ''
       } else if (type === 3) {
+        this.goafNames = []
+        this.conditions.goafName = ''
+        this.conditions.goafId = ''
         goafNames = goafs.filter(item => (item.goafOreheight === this.conditions.goafOreheight) && (item.goafOrebody === this.conditions.goafOrebody) && (item.goafOrebelt === this.conditions.goafOrebelt))
         this.goafNames = goafNames
-        this.conditions.goafName = ''
       } else {
         for (let i = 0; i < goafNames.length; i++) {
           if (this.conditions.goafId === goafNames[i].goafId) {