彭宇 2 роки тому
батько
коміт
796907f899
3 змінених файлів з 11 додано та 37 видалено
  1. 2 2
      src/views/datacenter.vue
  2. 7 7
      src/views/eventdetailsdialog.vue
  3. 2 28
      src/views/monitor.vue

+ 2 - 2
src/views/datacenter.vue

@@ -6,7 +6,7 @@
     <!--主体-->
     <div class="visual-body">
       <!-- 左侧 -->
-      <div class="leftbar w-10" :class="indentleft" ref="left">
+      <div class="leftbar w-10" ref="left">
         <div class="forthis">
           <dv-border-box-13 :color="['#0e7957', '#0da24c']" backgroundColor="#09140e" style="padding-bottom: 1rem;">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
@@ -32,7 +32,7 @@
       <!--      <button @click="showEventInfo1" style="position: absolute; right: 50%;top: 45%;z-index: 1000;">弹层事件演示用按钮-->
       <!--      </button>-->
       <!-- 右侧 -->
-      <div class="rightbar" :class="indentright" ref="right">
+      <div class="rightbar" ref="right">
         <div class="forthis">
           <dv-border-box-13 :color="['#0e7957', '#0da24c']" backgroundColor="#09140e" style="padding-bottom: 1rem;">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>

+ 7 - 7
src/views/eventdetailsdialog.vue

@@ -1145,18 +1145,18 @@ export default {
       resourcesList: [
         {
           resourceName: '重点企业',
-          type: 'zdqy',
+          type: 'zdqygl',
           count: '1',
           icon: 'sj-icon-enterprise'
         },
         {
           resourceName: '禁烧区',
-          type: 'jsq',
+          type: 'jsqgl',
           icon: 'sj-icon-area'
         },
         {
           resourceName: '污染源',
-          type: 'wry',
+          type: 'wrygl',
           count: '1',
           icon: 'sj-icon-pollution'
         },
@@ -1280,11 +1280,11 @@ export default {
           this.$refs.supermapDialog.clearMByType(type)
         }, 1000)
       } else {
-        this.resourcesListCheck.push(type)
         //搜索物资
         let param = { longitude: this.longitude, latitude: this.latitude, type: type, radius: this.radius }
         listResourceByWz(param).then(res => {
           if (res.data != null && res.data.length > 0) {
+            this.resourcesListCheck.push(type)
             var markersList = []
             for (let i = 0; i < res.data.length; i++) {
               let markersMap = {
@@ -1300,11 +1300,11 @@ export default {
               if (res.data.length > 50) {
                 markersMap.isAggregation = true
               }
-              if (type == 'zdqy') {
+              if (type == 'zdqygl') {
                 markersMap.icon = 'sj-icon-map-centerdata-t-environment-key-enterprise'
-              } else if (type == 'jsq') {
+              } else if (type == 'jsqgl') {
                 markersMap.icon = 'sj-icon-map-centerdata-t-environment-prohibition-area'
-              } else if (type == 'wry') {
+              } else if (type == 'wrygl') {
                 markersMap.icon = 'sj-icon-map-centerdata-t-environment-source-pollution'
               }else if (type == 'sxt') {
                 markersMap.icon = 'camera'

+ 2 - 28
src/views/monitor.vue

@@ -6,7 +6,7 @@
     <!--主体-->
     <div class="visual-body">
       <!-- 左侧 -->
-      <div class="leftbar" :class="indentleft" ref="left">
+      <div class="leftbar" ref="left">
         <div class="forthis">
           <dv-border-box-13 :color="['#0e7957', '#0da24c']" backgroundColor="#09140e" style="padding-bottom: 1rem;">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
@@ -71,7 +71,7 @@
                 :mapSite="{doubleClickZoom:false}" :codes="['9fa5']" :isSideBySide="false" @preview="preview">
       </supermap>
       <!-- 右侧 -->
-      <div class="rightbar" :class="indentright" ref="right">
+      <div class="rightbar" ref="right">
         <div class="forthis">
           <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>
@@ -110,10 +110,6 @@
         </div>
       </div>
       <vBottomMenu ref="bottomMenu"></vBottomMenu>
-<!--      <el-tooltip :content="indentText" placement="top" :disabled="indentdisabled">-->
-<!--        <div class="mascot" ref="mascot" :class="indentStyle" @click="indent"><img-->
-<!--          src="@/assets/images/mascot.png"/></div>-->
-<!--      </el-tooltip>-->
 
     </div>
     <eventLocation ref="eventLocation"></eventLocation>
@@ -209,12 +205,6 @@ export default {
       activeName: 'info',
       radio: '1',
       region: [],
-      //左右缩进
-      indentStyle: '',
-      indentleft: '',
-      indentright: '',
-      indentText: '收起左右栏',
-      indentdisabled: false
     }
   },
   methods: {
@@ -612,22 +602,6 @@ export default {
         }
       })
     },
-    //吉祥物收起左右框
-    indent() {
-      let list = document.getElementsByClassName('el-tooltip__popper')
-      list[list.length - 1].style.display = 'none'
-      if (this.indentStyle == '') {
-        this.indentStyle = 'indent-style'
-        this.indentleft = 'indent-left'
-        this.indentright = 'indent-right'
-        this.indentText = '展开左右栏'
-      } else if (this.indentText == '展开左右栏') {
-        this.indentStyle = ''
-        this.indentleft = ''
-        this.indentright = ''
-        this.indentText = '收起左右栏'
-      }
-    },
     /** ----------------------------------摄像头预览开始------------------------------------- */
     alertLogin: function() {
       this.$modal.msg('登录中....')