From adcf8b319e2d72b32b4c8741123d0d9e49d79c43 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Thu, 14 Mar 2024 17:22:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=8B=E4=BB=B6=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E7=BB=8F=E7=BA=AC=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/map/index.vue       | 29 +++++++--------
 src/views/components/newEvent/index.vue | 48 ++++++++++++++++---------
 2 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/src/views/bigScreen/map/index.vue b/src/views/bigScreen/map/index.vue
index d62a93d..caeaf2c 100644
--- a/src/views/bigScreen/map/index.vue
+++ b/src/views/bigScreen/map/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2024-01-09 23:08:15
  * @LastEditors: JC9527
- * @LastEditTime: 2024-03-08 09:06:26
+ * @LastEditTime: 2024-03-14 16:12:31
 -->
 <template>
   <div class="map-main">
@@ -1400,7 +1400,7 @@ export default {
           if(res.code == 200 && res.data.msg == '操作成功') {
           // http://121.229.2.163:9291/live/9999   http://120.27.25.166:9305/live/9999_
             setTimeout(()=>{
-              this.initVideoPlayer(`https://121.229.2.163:9307/live/9999_${this.personInfo.info.userId}.flv`)
+              this.initVideoPlayer(`https://t-jn-bjh-admin-server.jsszkd.com/jn/live/9999_${this.personInfo.info.userId}.flv`)
             },3000)
           }
         })
@@ -1775,15 +1775,15 @@ export default {
     },
     // 子组件的实时定位事件
     realTimeLocationClick(item,id){
-      if(id == 1) {
+      if(id == 1 && this.actionMap == 1) {
         this.personLine.forEach(per=>{
           if(item.imei == per.imei) {
             this.map.setZoomAndCenter(16,[per.longitude,per.latitude]);
           }
         })
-      } else if(id == 3){
+      } else if(id == 3 && this.actionMap == 3){
         // console.log("进来了");
-        console.log(this.carInfo);
+        // console.log(this.carInfo);
         this.carLine.forEach(car=>{
           if(item.id == car.id) {
             this.map.setZoomAndCenter(16,[car.longitude,car.latitude]);
@@ -1801,7 +1801,6 @@ export default {
     },
     // 子组件的名称点击事件
     divClick(lightedPolygonId){
-      // console.log(lightedPolygonId,"父组件的名称点击事件");
       if(this.action == 1) {
         // 取消重点区域高亮
         this.quyuData.forEach((element) => {
@@ -1959,7 +1958,7 @@ export default {
         } else if(lightedPolygonId.id == 4) {
           // 考勤围栏
           this.weilanData.forEach((element) => {
-            if(element.id == lightedPolygonId.item.id) {
+            if(element.id == lightedPolygonId.item) {
               element.myPolygon.setOptions({
                 strokeColor: '#46FF77',
                 fillColor: '#46FF77',
@@ -2147,7 +2146,7 @@ export default {
         } else if(lightedPolygonId.id == 4) {
           // 考勤围栏
           this.weilanData.forEach((element) => {
-            if(element.id == lightedPolygonId.item.id) {
+            if(element.id == lightedPolygonId.item) {
               element.myPolygon.setOptions({
                 strokeColor: '#46FF77',
                 fillColor: '#46FF77',
@@ -2444,12 +2443,12 @@ export default {
       } else if (this.actionMap == 2) {
         // 事件的搜索
         let data = {'queryValue' : [{colCode:"name",queryValue:queryString}], "myInstanceClassify" : "all", "parameterValue":[], fks: []}
-        ViewListPage({viewCode:'shi_jian_shou_li_list_page', pageNo: 1, pageSize:10}, data).then(res=>{
-          console.log(res,"事件信息");
+        ViewListPage({viewCode:'event-all-list', pageNo: 1, pageSize:10}, data).then(res=>{
+          // console.log(res,"事件信息");
           var restaurants = res.result.records;
           let a = [];
           restaurants.forEach((per=>{
-            let item = { value: per.name, imei: per.id };
+            let item = { value: per.name, location: per.location ? per.location : "" };
             a.push(item);
           }))
           cb(a);
@@ -2473,7 +2472,7 @@ export default {
     },
     // 点击事件
     handleSelect(item){
-      console.log(item,"item");
+      // console.log(item,"item");
       if(this.actionMap == 1) {
         if(item.imei) {
           // 根据imei查询设备
@@ -2484,8 +2483,10 @@ export default {
           })
         }
       } else if (this.actionMap == 2) {
-        // 事件的搜索
-
+        if(item.location) {
+          let location = item.location?.split(',');
+          this.map.setZoomAndCenter(16,[location[0],location[1]]);
+        }
       } else if (this.actionMap == 3) {
         // 车辆的搜索
       } else if(this.actionMap == 4) {
diff --git a/src/views/components/newEvent/index.vue b/src/views/components/newEvent/index.vue
index 2cda9f3..064159f 100644
--- a/src/views/components/newEvent/index.vue
+++ b/src/views/components/newEvent/index.vue
@@ -190,7 +190,8 @@ export default {
           openTime: "",                      // 事件发生时间
           randNumber: "",                    // 事件流水号 年月日时分秒毫秒
           type: "",                          // 事件类型
-          videoUrl: ""                       // 事件视频
+          videoUrl: "",                      // 事件视频
+          location:""                        // 事件经纬度 
         }
       },
       rules: {
@@ -212,15 +213,15 @@ export default {
         "reportEventObj.meshOccurs":[
           { required: true, message: '请选择发生网格', trigger: 'change' }
         ],
-        "reportEventObj.imgUrl":[
-          { required: true, message: '请选择事件照片', trigger: 'blur' },
-        ],
-        "reportEventObj.videoUrl":[
-          { required: true, message: '请选择事件视频', trigger: 'blur' },
-        ],
-        "reportEventObj.audioUrl":[
-          { required: true, message: '请选择事件音频', trigger: 'blur' },
-        ],
+        // "reportEventObj.imgUrl":[
+        //   { required: true, message: '请选择事件照片', trigger: 'blur' },
+        // ],
+        // "reportEventObj.videoUrl":[
+        //   { required: true, message: '请选择事件视频', trigger: 'blur' },
+        // ],
+        // "reportEventObj.audioUrl":[
+        //   { required: true, message: '请选择事件音频', trigger: 'blur' },
+        // ],
       },
       baseUrl: process.env.VUE_APP_BASE_API,
       formInfo:{
@@ -242,16 +243,23 @@ export default {
       gridOptions:[],
       options:[],
       marker:null,
+      lnglat:"",
     }
   },
   methods:{
     open(obj) {
       // console.log(obj,'obj');
       this.$refs.dialog5.open('3');
-      console.log(this.getCurrentTime());
       this.$nextTick(()=>{
         this.formInline.reportEventObj.address = obj?.address;
         this.marker = obj?.marker;
+        if(obj?.lnglat) {
+          let arr = [];
+          arr[0] = obj.lnglat.lng;
+          arr[1] = obj.lnglat.lat;
+          this.lnglat = arr.join(',');
+          console.log(this.lnglat,'lnglat');
+        }
       })
       this.getTypeEnum();
       this.getGridEnum();
@@ -306,13 +314,21 @@ export default {
       // this.formInline.reportEventObj.audioUrl = this.baseUrl + this.formInline.reportEventObj.audioUrl;
       // this.formInline.reportEventObj.meshOccurs = this.formInline.reportEventObj.meshOccurs.join(',');
       // this.formInline.reportEventObj.type = this.formInline.reportEventObj.type.join(',');
-      console.log(this.formInline);
-
+      // location
       this.$refs[formName].validate((valid) => {
         if(valid){
-          this.formInline.reportEventObj.imgUrl = this.baseUrl + this.formInline.reportEventObj.imgUrl;
-          this.formInline.reportEventObj.videoUrl = this.baseUrl + this.formInline.reportEventObj.videoUrl;
-          this.formInline.reportEventObj.audioUrl = this.baseUrl + this.formInline.reportEventObj.audioUrl;
+          if(this.formInline.reportEventObj.imgUrl) {
+            this.formInline.reportEventObj.imgUrl = this.baseUrl + this.formInline.reportEventObj.imgUrl;
+          }
+          if(this.formInline.reportEventObj.videoUrl) {
+            this.formInline.reportEventObj.videoUrl = this.baseUrl + this.formInline.reportEventObj.videoUrl;
+          }
+          if(this.formInline.reportEventObj.audioUrl) {
+            this.formInline.reportEventObj.audioUrl = this.baseUrl + this.formInline.reportEventObj.audioUrl;
+          }
+          if(this.lnglat) {
+            this.formInline.reportEventObj.location = this.lnglat;
+          }
           this.formInline.reportEventObj.meshOccurs = this.formInline.reportEventObj.meshOccurs.join(',');
           this.formInline.reportEventObj.type = this.formInline.reportEventObj.type.join(',');
           this.formInline.reportEventObj.randNumber = this.getCurrentTime();