瀏覽代碼

页面bug

彭宇 2 年之前
父節點
當前提交
1457340fdb
共有 2 個文件被更改,包括 72 次插入25 次删除
  1. 72 24
      src/components/vBottomMenu.vue
  2. 0 1
      src/views/forest.vue

+ 72 - 24
src/components/vBottomMenu.vue

@@ -35,7 +35,8 @@
     </div>
     <div class="bottom-menu-normal">
       <div v-for="(fastMenu,index) in fastMenu" :key="index" class="btm-m-con">
-        <a><i :class="fastMenu.icon"  @click.stop="showDialog(fastMenu.click)"></i><a @click.stop="showDialog(fastMenu.click)">{{ fastMenu.name }}</a>
+        <a><i :class="fastMenu.icon" @click.stop="showDialog(fastMenu.click)"></i><a
+          @click.stop="showDialog(fastMenu.click)">{{ fastMenu.name }}</a>
           <div v-if="showChild && fastMenu.click == 'layerSwitching'" class="nav-child">
             <el-button type="primary"
                        @click.stop="choseLayerSwitching('http://218.27.1.154:8090/iserver/services/map-sipingshi/rest/maps/tiedong_lunkuo',true)"
@@ -49,10 +50,23 @@
                         @click.stop="closeChild"></el-button> -->
           </div>
           <!-- 林斑 -->
-          <div v-if="showBanChild && fastMenu.click == 'forestban'" class="nav-child">
+          <div v-show="showBanChild && fastMenu.click == 'forestban'" class="nav-child">
             <div class="forestban">
               <div class="forestban-con">
-                <el-tree :data="deptOptionsLiandong" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
+<!--                <el-input-->
+<!--                  placeholder="输入关键字进行过滤"-->
+<!--                  v-model="filterbanText">-->
+<!--                </el-input>-->
+                <el-tree
+                  :data="deptOptionsLiandong"
+                  ref="banDept"
+                  node-key="id"
+                  :check-strictly="true"
+                  :filter-node-method="filterbanNode"
+                  :accordion="true"
+                  empty-text="加载中,请稍候"
+                  :props="defaultProps"
+                ></el-tree>
               </div>
               <div class="forestban-right">
                 <el-input placeholder="请输入内容" prefix-icon="el-icon-search" v-model="searchFB">
@@ -72,10 +86,23 @@
             </div>
           </div>
           <!-- 林场 -->
-          <div v-if="showChangChild && fastMenu.click == 'forestchang'" class="nav-child">
+          <div v-show="showChangChild && fastMenu.click == 'forestchang'" class="nav-child">
             <div class="forestban">
               <div class="forestban-con">
-                <el-tree :data="deptOptionsLiandong" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
+<!--                <el-input-->
+<!--                  placeholder="输入关键字进行过滤"-->
+<!--                  v-model="filterchangText">-->
+<!--                </el-input>-->
+                <el-tree
+                  :data="deptOptionsLiandong"
+                  ref="changDept"
+                  node-key="id"
+                  :check-strictly="true"
+                  :filter-node-method="filterchangNode"
+                  :accordion="true"
+                  empty-text="加载中,请稍候"
+                  :props="defaultProps"
+                ></el-tree>
               </div>
               <div class="forestban-right">
                 <el-input placeholder="请输入内容" prefix-icon="el-icon-search" v-model="searchFB">
@@ -339,8 +366,22 @@ export default {
   components: {
     supermapTaskDialog
   },
+  watch: {
+    filterbanText(val) {
+      alert(val)
+      console.log(this.$refs)
+      this.$refs.banDept.filter(val)
+    },
+    filterchangText(val) {
+      alert(val)
+      console.log(this.$refs)
+      this.$refs.changDept.filter(val)
+    }
+  },
   data() {
     return {
+      filterbanText: '',
+      filterchangText: '',
       eventId: null,
       eventCode: null,
       longitude: null,
@@ -349,8 +390,7 @@ export default {
       eventDialog: false,//事件详情弹层
       taskStatusButton: null,//任务按钮
       visuForestCloudYuAnBo: null,
-      address:null,//事件上报地址
-
+      address: null,//事件上报地址
 
       taskId: null,//任务ID
       showDeptConfirm: false,//任务领取选择部门弹窗
@@ -399,7 +439,7 @@ export default {
           click: 'TVWall'
         }
       ],
-      deptOptionsLiandong:[],
+      deptOptionsLiandong: [],
       data: [
         {
           label: '一级 1',
@@ -454,17 +494,27 @@ export default {
     })
   },
   methods: {
+    filterbanNode(value, data) {
+      //树搜索
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+    filterchangNode(value, data) {
+      //树搜索
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
     // 返回图片列表
     assetTypeAnImage(filePath) {
-      let imageList=[]
-      if(filePath!=null&&filePath.length>0){
+      let imageList = []
+      if (filePath != null && filePath.length > 0) {
         for (let i = 0; i < filePath.length; i++) {
           //获取最后一个.的位置
           var index = filePath[i].lastIndexOf('.')
           //获取后缀
           var ext = filePath[i].substr(index + 1)
           let aa = ['png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1
-          if(aa){
+          if (aa) {
             imageList.push(filePath[i])
           }
         }
@@ -499,8 +549,8 @@ export default {
         }
       }
     },
-    receiveTask(taskId,eventCode) {
-      let param = { taskId: taskId,eventCode: eventCode, centerTaskTaskDepts: this.centerTaskTaskDepts }
+    receiveTask(taskId, eventCode) {
+      let param = { taskId: taskId, eventCode: eventCode, centerTaskTaskDepts: this.centerTaskTaskDepts }
       receiveTask(param).then(res => {
         //任务领取
         if (res.code == 200) {
@@ -514,8 +564,8 @@ export default {
         }
       })
     },
-    refusedTask(taskId,eventCode) {
-      let param = { taskId: taskId,eventCode: eventCode, centerTaskTaskDepts: this.centerTaskTaskDepts }
+    refusedTask(taskId, eventCode) {
+      let param = { taskId: taskId, eventCode: eventCode, centerTaskTaskDepts: this.centerTaskTaskDepts }
       refusedTask(param).then(res => {
         //任务拒绝
         if (res.code == 200) {
@@ -529,7 +579,7 @@ export default {
         }
       })
     },
-    selectTaskDtpts(taskId,eventCode, state) {
+    selectTaskDtpts(taskId, eventCode, state) {
       this.taskId = taskId
       this.eventCode = eventCode
       selectTaskDtpts({ taskId: taskId }).then(res => {
@@ -543,12 +593,12 @@ export default {
     },
     cancelEventShow() {
       console.log('关闭事件弹窗')
-      this.eventCode=null
+      this.eventCode = null
       this.eventLogList = []
     },
     cancelEventConfirm() {
       console.log('关闭任务选择部门')
-      this.eventCode=null
+      this.eventCode = null
       this.deptOptions = []
       this.deptName = []
       this.centerTaskTaskDepts = []
@@ -579,13 +629,14 @@ export default {
             radius: 0
           }
 
-          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1'&&res.data.catalogue[0].urgeCount==0) {
+          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' && res.data.catalogue[0].urgeCount == 0) {
             markersMap.icon = 'sj-icon-map-xinshangbao'
-          }if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1'&&res.data.catalogue[0].urgeCount>0) {
+          }
+          if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_1' && res.data.catalogue[0].urgeCount > 0) {
             markersMap.icon = 'sj-icon-map-cuiban'
           } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_2') {
             markersMap.icon = 'sj-icon-map-qianshou'
-          }else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_5') {
+          } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_5') {
             markersMap.icon = 'sj-icon-map-banjie'
           } else if (res.data.catalogue[0].eventStatusValue == 'forest_event_status_6') {
             markersMap.icon = 'sj-icon-map-guidnag'
@@ -621,9 +672,6 @@ export default {
     handleCheckedCitiesChangeChang(value) {
       this.choseLayerSwitchingList(this.changCheckList)
     },
-    handleNodeClick(data) {
-      console.log(data)
-    },
     refresh() {
       window.location.reload()
     },

+ 0 - 1
src/views/forest.vue

@@ -438,7 +438,6 @@ export default {
     // this.initWebSocket()
     /** ----------------------------------weosocket结束------------------------------------- */
     this.selectTaskList()//获取任务
-    console.log(this.dict)
   },
   data() {
     return {