禅道bug修改

src/api/leader.js

@@ -1,12 +1,5 @@
 import request from '@/utils/request'
 
-// 获取左侧
-export function getRy() {
-  return request({
-    url: '/center-resources/VisuForestCloudMapController/getRy',//有逻辑
-    method: 'post',
-  })
-}
 
 // 获取左侧人员列表
 export function getForestLeader(linJob,linType) {

src/components/vBottomMenu.vue

@@ -192,7 +192,7 @@
               </div>
               <div class="btm-r-pop-info-list">
                 <div class="btm-r-pop-info-list-name">内容</div>
-                <div class="btm-r-pop-info-list-text">
+                <div class="btm-r-pop-info-list-text" style="width: 85%;">
                   <h4 class="line-h-1 w-100p" v-html="item.content">{{ item.content }}</h4>
                 </div>
               </div>

src/views/firespread.vue

@@ -129,7 +129,7 @@
                       size="small"
                       icon="el-icon-s-grid"
                       @click="showTVWallDiaLog()"
-                      v-show="eventType == 1"
+                      v-show="cameraCode != '' && cameraCode != null && cameraCode != undefined"
                     >视频联动</el-button>
                     <el-button size="small" icon="el-icon-upload" @click="showEventdetailsdialog()">动态标绘</el-button>
                     <!--                  <el-button size="small" icon="el-icon-upload" @click="showheatPlotting()">火灾蔓延</el-button>-->
@@ -363,8 +363,8 @@
           <div class="bottomLeft">
             <div class="leftItem d-l-con padding-box nowrap" style="white-space: nowrap;" v-for="(item,index) in depteventList">
               <div class="bgt-info">
-                <div class="bgt-info-name" :class="{on:iconCurrentIndex==item.deptId}"
-                     @click="dutysystemSelect(item.deptId,item.deptName,item.id)">{{ item.deptName }}
+                <div class="bgt-info-name" :class="{on:iconCurrentIndex==item.deptId}" :title="item.deptName"
+                     @click="dutysystemSelect(item.deptId,item.deptName,item.id)">{{ item.deptName.length > 10 ? item.deptName.slice(0, 10) + "..." : item.deptName }}
                 </div>
               </div>
             </div>
@@ -428,8 +428,8 @@
           <div class="bottomLeft">
             <div class="leftItem d-l-con padding-box nowrap" v-for="(item,index) in depteventList">
               <div class="bgt-info">
-                <div class="bgt-info-name" :class="{on:iconCurrentIndex==item.deptId}"
-                     @click="dutysystemSelect(item.deptId,item.deptName,item.id)">{{ item.deptName }}
+                <div class="bgt-info-name" :class="{on:iconCurrentIndex==item.deptId}" :title="item.deptName"
+                     @click="dutysystemSelect(item.deptId,item.deptName,item.id)">{{ item.deptName.length > 10 ? item.deptName.slice(0, 10) + "..." : item.deptName }}
                 </div>
               </div>
             </div>

src/views/forest.vue

@@ -451,67 +451,49 @@
 </template>
 
 <script>
-  import dateChoose from '@/views/date.vue' //日历
-  /** ----------------------------------weosocket开始------------------------------------- */
-  import Cookies from 'js-cookie'
-  /** ----------------------------------weosocket结束------------------------------------- */
+import dateChoose from '@/views/date.vue' //日历
+/** ----------------------------------weosocket开始------------------------------------- */
+import Cookies from 'js-cookie'
+/** ----------------------------------weosocket结束------------------------------------- */
+import {
+  getBaseInfo,
+  getDeptEventCount_direct,
+  getEventByEventType_direct,
+  getEventByReportorOrder_direct,
+  getEventList,
+  getEventList_direct,
+  getEventPush,
+  getExposureStage_direct,
+  getLatestNotice,
+  getTodayEvents_direct,
+  getWeather_direct,
+  selectByMenuId
+} from '@/api/forest'
+import { getNearEvent } from '@/api/event'
+import supermap from '@/components/supermap-2.5d' //超图
+// import supermapNotProcessed from '@/components/supermap' //超图
+// import supermapProcessed from '@/components/supermap' //超图
+import vheader from '@/components/v-header.vue' //一体化共用头部
+import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部菜单
+import eventLocation from '@/components/eventLocation.vue' //事件定位弹窗
+import TVWall from '@/components/TVWall.vue' //电视墙弹窗
+import TVWalls from '@/components/TVWalls.vue' //电视墙弹窗
+import eventdetailsdialog from '@/views/eventdetailsdialog.vue' //事件详情弹窗
+import firespread from '@/views/firespread.vue' //事件详情弹窗
+import chart from './from/dvCapsuleChart.vue'
+import { fireControlViewList, fireControlViewPoint, getResourceDetail, getResourcePoint } from '@/api/datacenter'
 
-  import {
-    getMenuEventType,
-    getEventPush,
-    getBaseInfo,
-    getTodayEvents,
-    getLatestNotice,
-    getDeptEventCount,
-    getWeather,
-    getEventList,
-    getEventByEventType,
-    getEventByReportorOrder,
-    getExposureStage,
-    selectByMenuId,
-    getTodayEvents_direct,
-    getDeptEventCount_direct,
-    getWeather_direct,
-    getEventList_direct, getEventByEventType_direct, getEventByReportorOrder_direct, getExposureStage_direct
-  } from '@/api/forest'
-  import {
-    getNearEvent
-  } from '@/api/event'
-  import supermap from '@/components/supermap-2.5d' //超图
-  // import supermapNotProcessed from '@/components/supermap' //超图
-  // import supermapProcessed from '@/components/supermap' //超图
-  import vheader from '@/components/v-header.vue' //一体化共用头部
-  import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部菜单
-  import eventLocation from '@/components/eventLocation.vue' //事件定位弹窗
-  import TVWall from '@/components/TVWall.vue' //电视墙弹窗
-  import TVWalls from '@/components/TVWalls.vue' //电视墙弹窗
-  import eventdetailsdialog from '@/views/eventdetailsdialog.vue' //事件详情弹窗
-  import firespread from '@/views/firespread.vue' //事件详情弹窗
-  import chart from "./from/dvCapsuleChart.vue";
-  import {
-    getResource,
-    getResourceDetail,
-    fireControlViewList,
-    fireControlViewPoint,
-    getResourcePoint
-  } from '@/api/datacenter'
+/** ----------------------------------摄像头预览开始------------------------------------- */
+// import DHWs from '@/dahua/lib/DHWs'
+import Firespread from './firespread'
 
-  /** ----------------------------------摄像头预览开始------------------------------------- */
-  import {
-    getDahuaVideoServer
-  } from '@/api/dahua/dahua'
-  // import DHWs from '@/dahua/lib/DHWs'
-  import Firespread from "./firespread";
+/** ----------------------------------摄像头预览结束------------------------------------- */
+import { getIconBg } from '@/api/components/sookaMapIcon'
 
-  /** ----------------------------------摄像头预览结束------------------------------------- */
-  import { getIconBg } from "@/api/components/sookaMapIcon";
+import { selectConfigKey } from '@/api/system/config'
+import { getUserProfile } from '@/api/system/user'
 
-  import {
-    selectConfigKey
-  } from "@/api/system/config";
-  import {getUserProfile} from "@/api/system/user";
-
-  let echarts = require('echarts')
+let echarts = require('echarts')
   export default {
     components: {
       Firespread,
@@ -1138,8 +1120,8 @@
             eventTypeDl.push(item.eventType)
           })
           that.websockSid.userId = Cookies.get('userId')
-          that.websockSid.eventTypeDl = res.data.eventTypeDl
-          that.websockSid.eventType = res.data.eventType
+          that.websockSid.eventTypeDl = eventTypeDl
+          that.websockSid.eventType = eventType
           that.initWebSocket(that.websockSid.userId, that.websockSid.eventTypeDl, that.websockSid.eventType)
           console.log(that.websockSid)
         })