提交文本修改

src/api/baseUrl.js

@@ -11,7 +11,7 @@ switch (process.env.NODE_ENV) {
     baseUrl = "https://pre-server.feleti.cn"; // 预上线环境url
     baseUrl = "https://pre-server.feleti.cn"; // 预上线环境url
     break;
     break;
   case "production":
   case "production":
-    baseUrl = "http://192.168.9.233:20080"; // 生产环境url
+    baseUrl = "http://192.168.9.133:20080"; // 生产环境url
     break;
     break;
 }
 }
 
 

src/store/mutaition.js

@@ -19,5 +19,8 @@ export default {
   },
   },
   setillegaltype(state, data) {
   setillegaltype(state, data) {
     state.illegaltype = data;
     state.illegaltype = data;
+  },
+  setmapopen(state, data) {
+    state.mapopen = data;
   }
   }
 };
 };

src/store/state.js

 export default {
 export default {
   ocxstate: 0,
   ocxstate: 0,
+  mapopen:false,
   addRouter:[]
   addRouter:[]
 }
 }

src/views/Layout/index.vue

@@ -77,6 +77,8 @@ export default {
     openmenu() {
     openmenu() {
       this.isopen = !this.isopen;
       this.isopen = !this.isopen;
       this.$refs.leftmenu.collapsemenu();
       this.$refs.leftmenu.collapsemenu();
+      let date = new Date().getTime();
+      this.$store.commit("setmapopen", date);
     },
     },
     toPath(data) {
     toPath(data) {
       this.$refs.leftmenu.handleSelect(data.path);
       this.$refs.leftmenu.handleSelect(data.path);

src/views/Layout/menu.vue

@@ -11,7 +11,7 @@
       <el-submenu index="1" class="menu-icon">
       <el-submenu index="1" class="menu-icon">
         <template slot="title">
         <template slot="title">
           <i class="icon-fanxing-iconxuanzhongshouye1"></i>
           <i class="icon-fanxing-iconxuanzhongshouye1"></i>
-          <span slot="title">首页</span>
+          <span slot="title">态势总览</span>
         </template>
         </template>
         <el-menu-item index="/trficcshow">
         <el-menu-item index="/trficcshow">
           <i class="submenuicon"></i>交通展示
           <i class="submenuicon"></i>交通展示

src/views/public/videoPlay.vue

@@ -34,7 +34,7 @@ export default {
           let isLoadingOcx = typeof myVideo.GetVersion() === "string" ? true : false;
           let isLoadingOcx = typeof myVideo.GetVersion() === "string" ? true : false;
           if (isLoadingOcx) {
           if (isLoadingOcx) {
             let ocxPlayRes = document.getElementById("VionVideo").StartPlay(url, 0);
             let ocxPlayRes = document.getElementById("VionVideo").StartPlay(url, 0);
-            console.log("video Ocx播放rtsp流返回值:", ocxPlayRes);
+            console.log("视频流:", url);
           } else {
           } else {
             this.installOcxInfo();
             this.installOcxInfo();
           }
           }

src/views/sceneManage/setting/demarcate.vue

@@ -134,18 +134,21 @@ export default {
   // props: ['bgUrl'],
   // props: ['bgUrl'],
   methods: {
   methods: {
     checkBrower: function() {},
     checkBrower: function() {},
-    showModal: function(data) {
+    showModal: function(data, mtaskdata) {
+      var _this = this;
       this.$store.commit("setocxstate", 0);
       this.$store.commit("setocxstate", 0);
-      this.taskData = data;
+      this.taskData = mtaskdata;
       this.dialogVisible = true;
       this.dialogVisible = true;
-      this.curType = 0;
-      // let filePath = 'C:/Program Files (x86)/screen.jpg';
-      let cur_duid = data.task_id;
-      let subtask_id = data.task_id;
-      this.src = "";
+      this.type = data.algo_type;
+      // this.type = 2;
+      this.bgUrl = "";
+      //获取视频截图
       this.$api.task
       this.$api.task
-        .cutpic(data.vchan.vdev_unid, data.vchan.vchan_refid, data.subtask_id)
-        .then(res => {
+        .cutpic(
+          mtaskdata.vchan.vdev_unid,
+          mtaskdata.vchan.vchan_refid,
+          mtaskdata.subtask_id
+        ).then(res => {
           if (!res.ecode) {
           if (!res.ecode) {
             this.src = "data:image/png;base64," + res.pic_base64;
             this.src = "data:image/png;base64," + res.pic_base64;
           } else {
           } else {

src/views/sceneManage/setting/index.vue

@@ -121,7 +121,7 @@ export default {
           }
           }
         ]
         ]
       },
       },
-      switchstate: true
+      switchstate: false
     };
     };
   },
   },
   props: ["taskid", "subtaskid", "playurl"],
   props: ["taskid", "subtaskid", "playurl"],
@@ -149,7 +149,7 @@ export default {
     setDemarcate(scenesdata, index) {
     setDemarcate(scenesdata, index) {
       if (this.checkpollstate()) {
       if (this.checkpollstate()) {
         this.curindex = index;
         this.curindex = index;
-        this.$refs.demarcate.showModal(scenesdata);
+        this.$refs.demarcate.showModal(scenesdata, this.taskInfo);
       }
       }
     },
     },
     handleparam(type) {
     handleparam(type) {

src/views/trafficShow/alarmEvent.vue

@@ -5,7 +5,7 @@
       <el-table-column
       <el-table-column
         align="center"
         align="center"
         prop="camername"
         prop="camername"
-        label="事件地点"
+        label="发生地点"
       ></el-table-column>
       ></el-table-column>
       <el-table-column
       <el-table-column
         align="center"
         align="center"
@@ -120,12 +120,13 @@ export default {
               pics: pics,
               pics: pics,
               pos: pos
               pos: pos
             };
             };
-            if (that.tableData.length > 40) {
+            if (that.tableData.length > 6) {
               that.tableData.pop(obj);
               that.tableData.pop(obj);
             } else {
             } else {
               that.tableData.unshift(obj);
               that.tableData.unshift(obj);
             }
             }
             that.tableData.unshift(obj);
             that.tableData.unshift(obj);
+            this.$forceUpdate();
           }
           }
         } catch (error) {
         } catch (error) {
           console.log(error);
           console.log(error);

src/views/trafficShow/map.vue

@@ -31,6 +31,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
+import {mapState} from "vuex";
 import videoPlay from "../public/videoPlay";
 import videoPlay from "../public/videoPlay";
 import { inherits } from "ol/util.js";
 import { inherits } from "ol/util.js";
 import Map from "ol/Map";
 import Map from "ol/Map";
@@ -163,7 +164,6 @@ export default {
         };
         };
         heatData.features.push(a);
         heatData.features.push(a);
       }
       }
-
       var vectorSources = new VectorSource({
       var vectorSources = new VectorSource({
         features: new GeoJSON().readFeatures(heatData, {
         features: new GeoJSON().readFeatures(heatData, {
           dataProjection: "EPSG:4326"
           dataProjection: "EPSG:4326"
@@ -439,6 +439,16 @@ export default {
       });
       });
     }
     }
   },
   },
+  computed:{
+    ...mapState(['mapopen'])
+  },
+  watch:{
+    mapopen(){
+      debugger
+      map.updateSize();
+      // this.InitMap();
+    }
+  },
   mounted() {
   mounted() {
     setTimeout(() => {
     setTimeout(() => {
       this.getDevList();
       this.getDevList();