瀏覽代碼

应急可视化 隐患云图

彭宇 2 年之前
父節點
當前提交
8f4297d23d
共有 5 個文件被更改,包括 2347 次插入2354 次删除
  1. 1485 1486
      src/components/supermap.vue
  2. 2 2
      src/router/index.js
  3. 23 34
      src/views/bigdata/bigdata.vue
  4. 797 797
      src/views/forest.vue
  5. 40 35
      src/views/monitor.vue

文件差異過大導致無法顯示
+ 1485 - 1486
src/components/supermap.vue


+ 2 - 2
src/router/index.js

@@ -70,7 +70,7 @@ export const constantRoutes = [{
     name: 'leader',
     component: () => import('@/views/leader'),
     meta: {
-      title: '应急人员'
+      title: '巡检轨迹'
     }
   },
   {
@@ -127,7 +127,7 @@ export const constantRoutesNew = [{
     name: 'leader',
     component: () => import('@/views/leader'),
     meta: {
-      title: '应急人员'
+      title: '巡检轨迹'
     }
   },
   {

+ 23 - 34
src/views/bigdata/bigdata.vue

@@ -5,7 +5,7 @@
     <div class="header">
       <!-- title -->
       <div class="header-left"><img class="logo" src="@/assets/images/integrated/logo-small.png"/>
-        <h3 class="title">{{systemTitle.title}}-{{systemTitle.subTitle}}-统计分析</h3>
+        <h3 class="title">{{ systemTitle.title }}-{{ systemTitle.subTitle }}-统计分析</h3>
       </div>
       <div class="bignav">
         <img src="@/assets/images/integrated/bigdata-header-nav-left.png"/>
@@ -190,35 +190,21 @@ export default {
           name: '应急云图'
         },
         {
-          //应急资源
+          path: '/forestDanger',
+          name: '巡检隐患'
+        },
+        {
+          path: '/monitor',
+          name: '监控中心'
+        },
+        {
           path: '/datacenter',
           name: '应急资源'
         },
-        // {
-        //   //监控中心
-        //   path: '/monitor',
-        //   name: '监控中心'
-        // },
-        // {
-        //   path: '/disaster',
-        //   name: '灾后评估'
-        // },
-        // {
-        //   path: '/leader',
-        //   name: '网格化'
-        // },
-        // {
-        //   path: '/afforestation',
-        //   name: '植树造林'
-        // },
-        // {
-        //   path: '/',
-        //   name: '动物保护'
-        // },
-        // {
-        //   path: '/',
-        //   name: '珍惜古树'
-        // },
+        {
+          path: '/leader',
+          name: '巡检轨迹'
+        },
         {
           path: '/bigdata',
           name: '统计分析'
@@ -230,16 +216,19 @@ export default {
 
     }
   },
-created() {
-  this.fontConfig
-},
-  methods: {
-    fontConfig(){
+  created() {
+    this.fontConfig
+  },
+  computed:{
+    fontConfig() {
       fontConfig().then(res => {
-        this.systemTitle.title = res.data.fontTitle;
-        this.systemTitle.subTitle = res.data.subTitle;
+        debugger
+        this.systemTitle.title = res.data.fontTitle
+        this.systemTitle.subTitle = res.data.subTitle
       })
     },
+  },
+  methods: {
     rlt() {
       let that = this
       getRlt().then(resp => {

文件差異過大導致無法顯示
+ 797 - 797
src/views/forest.vue


+ 40 - 35
src/views/monitor.vue

@@ -99,7 +99,8 @@
               <dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;"/>
             </div>
             <div class="i-list-con h-25">
-              <div class="d-l-con" v-for="(item,index) in keyAreaList" :class="{on:listCurrentIndex3 == index}" @click="getRegionalFlag(item.id)">
+              <div class="d-l-con" v-for="(item,index) in keyAreaList" :class="{on:listCurrentIndex3 == index}"
+                   @click="getRegionalFlag(item.id)">
                 <div class="d-l-l-text">
                   <i class="i-small"></i>
                   <h4>{{ item.areaName }}</h4>
@@ -110,10 +111,10 @@
         </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>-->
+      <!--      <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>
@@ -186,7 +187,7 @@ export default {
       listCurrentIndex1: '-1',
       listCurrentIndex2: '-1',
       listCurrentIndex3: '-1',
-      graphicsList:[],//重点区域
+      graphicsList: [],//重点区域
       /** ----------------------------------摄像头预览开始------------------------------------- */
       //大华
       activePanel: 'key1',
@@ -217,24 +218,24 @@ export default {
       indentright: '',
       indentText: '收起左右栏',
       indentdisabled: false,
-      domId: 'dom1',
+      domId: 'dom1'
     }
   },
   methods: {
     selectKeyAreaList() {
-      this.keyAreaList=[]
+      this.keyAreaList = []
       //获取重点区域列表
       let that = this
       selectKeyAreaList().then(res => {
         that.keyAreaList = res.data
       })
     },
-    getRegionalFlag(id){
+    getRegionalFlag(id) {
       //获取重点区域
-      this.listCurrentIndex3=id
+      this.listCurrentIndex3 = id
       let that = this
       getRegionalFlag(id).then(res => {
-        that.graphicsList=[]
+        that.graphicsList = []
         //地图标记
         if (res.data != null && res.data.length > 0) {
           for (let i = 0; i < res.data.length; i++) {
@@ -341,18 +342,18 @@ export default {
           containLabel: true
         },
         dataZoom: [{
-          show:true,
+          show: true,
           type: 'slider',
-          yAxisIndex:0,
-          left:10,
+          yAxisIndex: 0,
+          left: 10,
           start: 0,
           end: this.sourceData.length > 10 ? 40 : 100,
-          width:15
+          width: 15
         }],
         xAxis: {
           show: false,
           type: 'value',
-          left:10
+          left: 10
         },
         yAxis: {
           type: 'category', // 不设置类目轴,抽离的dataset数据展示不出来
@@ -430,7 +431,7 @@ export default {
       //获取左侧动态感知设备
       let that = this
       selectDeviceType().then(res => {
-        that.cameraMarkersList=[]
+        that.cameraMarkersList = []
         that.visuForestCloudMapDeviceBOList = res.data.visuForestCloudMapDeviceBOList
 
         that.region = res.data.visuForestCloudTodaySjfbBOList
@@ -461,8 +462,10 @@ export default {
               isAggregation: false
             }
             if (res.data.visuForestCloudCameraBOList[i].channelCode != null) {
-              markersMap.parameter = {code:res.data.visuForestCloudCameraBOList[i].cameraCode,
-                type:res.data.visuForestCloudCameraBOList[i].cameraFactory}
+              markersMap.parameter = {
+                code: res.data.visuForestCloudCameraBOList[i].cameraCode,
+                type: res.data.visuForestCloudCameraBOList[i].cameraFactory
+              }
             } else {
               markersMap.parameter = []
             }
@@ -490,7 +493,7 @@ export default {
               '<span>' +
               '                  <div class="d-l-con">' +
               '                  <div class="d-l-l-text">' +
-              '                  <h4>摄像头类型:' + (res.data.visuForestCloudCameraBOList[i].cameraFactory=="1"?"大华":"海康") + '</h4>' +
+              '                  <h4>摄像头类型:' + (res.data.visuForestCloudCameraBOList[i].cameraFactory == '1' ? '大华' : '海康') + '</h4>' +
               '                </div>' +
               '                </div>' +
               '                </span>' +
@@ -554,8 +557,10 @@ export default {
               isAggregation: false
             }
             if (res.data[i].channelCode != null) {
-              markersMap.parameter = {code:res.data.data[i].cameraCode,
-                type:res.data.data[i].cameraFactory}
+              markersMap.parameter = {
+                code: res.data.data[i].cameraCode,
+                type: res.data.data[i].cameraFactory
+              }
             } else {
               markersMap.parameter = []
             }
@@ -582,7 +587,7 @@ export default {
               '<span>' +
               '                  <div class="d-l-con">' +
               '                  <div class="d-l-l-text">' +
-              '                  <h4>摄像头类型:' + (res.data[i].cameraFactory=="1"?"大华":"海康") + '</h4>' +
+              '                  <h4>摄像头类型:' + (res.data[i].cameraFactory == '1' ? '大华' : '海康') + '</h4>' +
               '                </div>' +
               '                </div>' +
               '                </span>' +
@@ -661,7 +666,7 @@ export default {
     },
     /** 预览按钮操作 */
     preview(cameraParam) {
-      if(cameraParam.type=='1'){
+      if (cameraParam.type == '1') {
         getDahuaVideoServer().then(newResponse => {
           console.log(newResponse)
           this.ws.detectConnectQt().then(res => {
@@ -691,12 +696,12 @@ export default {
             }
           })
         })
-      }else if(cameraParam.type=='0'){
+      } else if (cameraParam.type == '0') {
         let that = this
         that.cameraVisible = true
-        getHaiKangVideoServer({cameraCode:cameraParam.code}).then(newResponse => {
-          that.cameraTitle = '摄像头-'+newResponse.data.cameraName
-          that.initPlugin(newResponse.data.appkey,newResponse.data.loginIp,newResponse.data.secret,newResponse.data.loginPort)
+        getHaiKangVideoServer({ cameraCode: cameraParam.code }).then(newResponse => {
+          that.cameraTitle = '摄像头-' + newResponse.data.cameraName
+          that.initPlugin(newResponse.data.appkey, newResponse.data.loginIp, newResponse.data.secret, newResponse.data.loginPort)
           setTimeout(function() {
             that.playhk(newResponse.data.channelCode)
           }, 5000)
@@ -709,7 +714,7 @@ export default {
         this.$Message.info('正在登陆客户端,请稍等......')
         return false
       }
-      const params = [cameraParams];
+      const params = [cameraParams]
       this.ws.openVideo(params)
     },
     /** ----------------------------------摄像头预览结束------------------------------------- */
@@ -717,8 +722,8 @@ export default {
 
     /** ----------------------------------海康摄像头预览开始------------------------------------- */
     // 创建播放实例
-    initPlugin(newappkey,newloginIp,newsecret,newloginPort) {
-      let that=this
+    initPlugin(newappkey, newloginIp, newsecret, newloginPort) {
+      let that = this
       that.oWebControl = new WebControl({
         szPluginContainer: 'playWnd',                       // 指定容器id
         iServicePortStart: 15900,                           // 指定起止端口号,建议使用该值
@@ -733,7 +738,7 @@ export default {
             })
 
             that.oWebControl.JS_CreateWnd('playWnd', 1020, 600).then(function() { //JS_CreateWnd创建视频播放窗口,宽高可设定
-              that.init(newappkey,newloginIp,newsecret,newloginPort)  // 创建播放实例成功后初始化
+              that.init(newappkey, newloginIp, newsecret, newloginPort)  // 创建播放实例成功后初始化
             })
           }, function() { // 启动插件服务失败
           })
@@ -745,7 +750,7 @@ export default {
           initCount++
           if (initCount < 3) {
             setTimeout(function() {
-              that.initPlugin(newappkey,newloginIp,newsecret,newloginPort)
+              that.initPlugin(newappkey, newloginIp, newsecret, newloginPort)
             }, 3000)
           } else {
             $('#playWnd').html('插件启动失败,请检查插件是否安装!<a href="./hk/VideoWebPlugin.exe">点击下载插件</a>')
@@ -782,7 +787,7 @@ export default {
       })
     },
     //初始化
-    init(newappkey,newloginIp,newsecret,newloginPort) {
+    init(newappkey, newloginIp, newsecret, newloginPort) {
       let that = this
       that.getPubKey(function() {
         ////////////////////////////////// 请自行修改以下变量值	////////////////////////////////////
@@ -844,7 +849,7 @@ export default {
       var encrypt = new JSEncrypt()
       encrypt.setPublicKey(this.pubKey)
       return encrypt.encrypt(value)
-    },
+    }
     /** ----------------------------------海康摄像头预览结束------------------------------------- */
 
   }