首頁 探索 說明
註冊 登入
fuyuhang
/
Project_yhfu
镜像来自 http://121.37.83.100:3000/sooka_onest/sooka_onest_forestfire_vue2_visualization.git
關註 1
讚好 0
複刻 0
檔案 問題管理 0 Wiki
瀏覽代碼

日志接口更改
重点区域接口

彭宇 2 年之前
父節點
db7d53b559
當前提交
de4c5a97a4
共有 6 個文件被更改，包括 88 次插入 和 43 次删除
分割檢視 顯示文件統計
  1. 36 27
      public/index.html
  2. 2 2
      src/api/forest.js
  3. 9 2
      src/api/monitor.js
  4. 2 2
      src/views/eventLogUpload.vue
  5. 2 1
      src/views/eventdetailsdialog.vue
  6. 37 9
      src/views/monitor.vue

+ 36 - 27
public/index.html
查看文件 

@@ -1,14 +1,15 @@
 
 <!DOCTYPE html>
 
 <html>
 
-  <head>
 
-    <meta charset="utf-8">
 
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
-    <meta name="renderer" content="webkit">
 
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
-    <title><%= webpackConfig.name %></title>
 
-    <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 
-	  <style>
 
+<head>
 
+  <meta charset="utf-8">
 
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
+  <meta name="renderer" content="webkit">
 
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
+  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
+  <title><%= webpackConfig.name %></title>
 
+  <!--[if lt IE 11]>
 
+  <script>window.location.href = '/html/ie.html';</script><![endif]-->
 
+  <style>
 
     html,
 
     body,
 
     #app {
 
@@ -16,6 +17,7 @@
 
       margin: 0px;
 
       padding: 0px;
 
     }
 
+
 
     .chromeframe {
 
       margin: 0.2em 0;
 
       background: #ccc;
 
@@ -194,26 +196,33 @@
 
       opacity: 0.5;
 
     }
 
   </style>
 
-  </head>
 
-  <body>
 
-  <!--三个必要的js文件引入-->
 
-  <!--<script src="./hk/jquery-1.12.4.min.js"></script>-->
 
-  <script src="./hk/jsencrypt.min.js"></script>            <!-- 用于RSA加密 -->
 
-  <script src="./hk/jsWebControl-1.0.0.min.js"></script>   <!-- 用于前端与插件交互 -->
 
+</head>
 
+<body>
 
+<!--三个必要的js文件引入-->
 
+<!--<script src="./hk/jquery-1.12.4.min.js"></script>-->
 
+  <script src="hk/jsencrypt.min.js"></script>            <!-- 用于RSA加密 -->
 
+  <script src="hk/jsWebControl-1.0.0.min.js"></script>   <!-- 用于前端与插件交互 -->
 
+<!--<script src="h5player/h5player.min.js"></script>-->
 
+
 
+
 
 
 <!--  <link rel="stylesheet" href="./supermap/libs/plotting/leaflet/10.2.1/iclient-plot-leaflet.css">-->
 
-  <script type="text/javascript" include="leaflet,leaflet.sidebyside,iclient-leaflet,iclient-plot-leaflet,leaflet.draw,leaflet.markercluster,leaflet.heat" src="./supermap/dist/leaflet/include-leaflet.js"></script>
 
-  <script type="text/javascript" include="bootstrap,plottingPanel,fileupLoad,widgets.alert" src="./supermap/examples/js/include-web.js"></script>
 
+<script type="text/javascript"
 
+        include="leaflet,leaflet.sidebyside,iclient-leaflet,iclient-plot-leaflet,leaflet.draw,leaflet.markercluster,leaflet.heat"
 
+        src="./supermap/dist/leaflet/include-leaflet.js"></script>
 
+<script type="text/javascript" include="bootstrap,plottingPanel,fileupLoad,widgets.alert"
 
+        src="./supermap/examples/js/include-web.js"></script>
 
 <!--  <script type="text/javascript" include="iclient-classic" src="./supermap/dist/classic/include-classic.js"></script>-->
 
 <!--  <script type="text/javascript" src="./supermap/libs/plotting/leaflet/10.2.1/iclient-plot-leaflet-es6.min.js"></script>-->
 
-  <script type="text/javascript" include="PlotPanel,StylePanel,SMLInfosPanel,iPortalStylePanel" src="./supermap/examples/js/plottingPanel/PlottingPanel.Include.js"></script>
 
-    <div id="app">
 
-	    <div id="loader-wrapper">
 
-		    <div id="loader"></div>
 
-		    <div class="loader-section section-left"></div>
 
-		    <div class="loader-section section-right"></div>
 
-		    <div class="load_title">正在加载系统资源，请耐心等待</div>
 
-        </div>
 
-	</div>
 
-  </body>
 
+<script type="text/javascript" include="PlotPanel,StylePanel,SMLInfosPanel,iPortalStylePanel"
 
+        src="./supermap/examples/js/plottingPanel/PlottingPanel.Include.js"></script>
 
+<div id="app">
 
+  <div id="loader-wrapper">
 
+    <div id="loader"></div>
 
+    <div class="loader-section section-left"></div>
 
+    <div class="loader-section section-right"></div>
 
+    <div class="load_title">正在加载系统资源，请耐心等待</div>
 
+  </div>
 
+</div>
 
+</body>
 
 </html>

+ 2 - 2
src/api/forest.js
查看文件 

@@ -85,7 +85,7 @@ export function getEventByReportorOrder(param) {
 
 // 日志文件上传
 
 export function eventLogUpload(param) {
 
   return request({
 
-    url: '/center-event/eventcatalogue/upload',
 
+    url: '/center-event/centereventtfirelog',
 
     method: 'post',
 
     data: param
 
   })
 
@@ -93,7 +93,7 @@ export function eventLogUpload(param) {
 
 // 日志发送
 
 export function sendEventLog(param) {
 
   return request({
 
-    url: '/center-event/eventcatalogue/uploadConext',
 
+    url: '/center-event/centereventtfirelog',
 
     method: 'post',
 
     data: param
 
   })

+ 9 - 2
src/api/monitor.js
查看文件 

@@ -15,10 +15,17 @@ export function selectCameraByDeptId(deptId) {
 
     data:{"deptId":deptId}
 
   })
 
 }
 
-// 获取重点区域
 
+// 获取重点区域列表
 
 export function selectKeyAreaList() {
 
   return request({
 
-    url: '/center-data/importarea/listFegin',
 
+    url: '/center-fire/VisuForestCloudMapController/importarealistFegin',
 
+    method: 'get',
 
+  })
 
+}
 
+// 获取重点区域
 
+export function getRegionalFlag(id) {
 
+  return request({
 
+    url: '/center-fire/VisuForestCloudMapController/getRegionalFlag/'+id,
 
     method: 'get',
 
   })
 
 }

+ 2 - 2
src/views/eventLogUpload.vue
查看文件 

@@ -125,11 +125,11 @@ export default {
 
       let fileUrl=[]
 
       if(this.fileList!=null&&this.fileList.length>0){
 
         for (let i = 0; i < this.fileList.length; i++) {
 
-          let file={url:this.fileList[i].url,webname:this.fileList[i].webName}
 
+          let file={attachPath:this.fileList[i].url,fileName:this.fileList[i].webName,busIndx: "bus_indx_forest",busSource: "PC"}
 
           fileUrl.push(file)
 
         }
 
       }
 
-      let param={ eventCode:this.eventCode,fileUrl: fileUrl }
 
+      let param={ eventCode:this.eventCode,operation:"bus_oper_type_2",operationType:"log_oper_type_1",fileList:fileUrl}
 
       //日志文件上传
 
       eventLogUpload(param).then(res => {
 
         if(res.code==200){

+ 2 - 1
src/views/eventdetailsdialog.vue
查看文件 

@@ -1727,7 +1727,7 @@ export default {
 
     },
 
     sendEventLog() {
 
       //日志发送
 
-      let param = { eventCode: this.eventCode, conext: this.eventLog }
 
+      let param = { eventCode: this.eventCode, logContent: this.eventLog,operation:"bus_oper_type_2",operationType:"log_oper_type_1"}
 
       sendEventLog(param).then(res => {
 
         if (res.code == 200) {
 
           this.$message.success(`发送成功!`)
 
@@ -2182,6 +2182,7 @@ function cbIntegrationCallBack(oData) {
 
 }
 
 </script>
 
 
+
 
 <style lang="scss" scoped>
 
 @import '@/assets/styles/base.scss';

+ 37 - 9
src/views/monitor.vue
查看文件 

@@ -99,7 +99,7 @@
 
               <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" @click="">
 
+              <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>
 
@@ -132,7 +132,8 @@
 
 import {
 
   selectDeviceType,
 
   selectCameraByDeptId,
 
-  selectKeyAreaList
 
+  selectKeyAreaList,
 
+  getRegionalFlag
 
 } from '@/api/monitor'
 
 
 import supermap from '@/components/supermap' //超图
 
@@ -183,6 +184,8 @@ export default {
 
       iconCurrentIndex1: '-1',
 
       listCurrentIndex1: '-1',
 
       listCurrentIndex2: '-1',
 
+      listCurrentIndex3: '-1',
 
+      graphicsList:[],//重点区域
 
       /** ----------------------------------摄像头预览开始------------------------------------- */
 
       //大华
 
       activePanel: 'key1',
 
@@ -216,6 +219,38 @@ export default {
 
     }
 
   },
 
   methods: {
 
+    selectKeyAreaList() {
 
+      this.keyAreaList=[]
 
+      //获取重点区域列表
 
+      let that = this
 
+      selectKeyAreaList().then(res => {
 
+        that.keyAreaList = res
 
+      })
 
+    },
 
+    getRegionalFlag(id){
 
+      //获取重点区域
 
+      this.listCurrentIndex3=id
 
+      let that = this
 
+      getRegionalFlag(id).then(res => {
 
+        that.graphicsList=[]
 
+        //地图标记
 
+        if (res.data != null && res.data.length > 0) {
 
+          for (let i = 0; i < res.data.length; i++) {
 
+            let latlng = {
 
+              lat: res.data[i].lat,
 
+              lng: res.data[i].lng
 
+            }
 
+            that.graphicsList.push(latlng)
 
+          }
 
+          setTimeout(() => {
 
+            that.$refs.supermap.clearG()
 
+            that.$refs.supermap.setGraphicsList(this.graphicsList, 'red')
 
+          }, 1000)
 
+        } else {
 
+          that.$refs.supermap.clearG()
 
+        }
 
+      })
 
+    },
 
     /** ----------------------------------底部按钮公用组件开始------------------------------------- */
 
     showDialog(click) {
 
       if (click == 'eventLocation') {
 
@@ -374,13 +409,6 @@ export default {
 
         }]
 
       })
 
     },
 
-    selectKeyAreaList() {
 
-      //获取重点区域
 
-      let that = this
 
-      selectKeyAreaList().then(res => {
 
-        that.keyAreaList = res
 
-      })
 
-    },
 
     selectDeviceType(index) {
 
       this.iconCurrentIndex1 = index
 
       //获取左侧动态感知设备