From 8d3e04e9feb35f8f354632ca8b167f4eb8128b3f Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Tue, 4 Jun 2024 10:19:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81-=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=90=8E=E7=AB=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gatebaseinfo/components/camera.vue        | 45 ++++++++++---------
 .../gatebaseinfo/components/channel.vue       |  4 +-
 .../gatebaseinfo/components/equipment.vue     |  4 +-
 .../gatebaseinfo/components/list.vue          |  4 +-
 4 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/camera.vue b/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/camera.vue
index 41bbb6b..49867af 100644
--- a/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/camera.vue
+++ b/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/camera.vue
@@ -69,8 +69,8 @@
           <el-button type="info" icon="el-icon-location-information" size="mini" @click="handleMap(row)">定位</el-button>
           <el-button v-show="!row.PLATFORMVIDEOMANAGEMENT_ID" type="warning" icon="el-icon-caret-right" size="mini" @click="showVideoBack(row.VIDEOURL)">回放</el-button>
           <el-button v-show="row.PLATFORMVIDEOMANAGEMENT_ID" type="warning" size="mini" @click="getRTSP(row)">获取rtsp地址</el-button>
-          <el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.VIDEO_RESOURCE_ID)">编辑</el-button>
-          <el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="handleDelete(row.VIDEO_RESOURCE_ID)">删除</el-button>
+          <el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row)">编辑</el-button>
+          <el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="handleDelete(row.GATE_VIDEO_ID)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -99,11 +99,11 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="110px" style="width: 500px;">
         <el-form-item label="视频类型">
           <el-radio-group v-model="form.VIDEO_TYPE" @change="changeType($event)">
-            <el-radio :label="0">移动摄像头</el-radio>
-            <el-radio :label="1">固定摄像头</el-radio>
+            <el-radio :label="1">移动摄像头</el-radio>
+            <el-radio :label="2">固定摄像头</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-if="form.VIDEO_TYPE===0" label="视频监控信息" prop="VIDEO_RESOURCES_ID">
+        <el-form-item v-if="form.VIDEO_TYPE===1" label="视频监控信息" prop="VIDEO_RESOURCES_ID">
           <el-button type="success" icon="el-icon-caret-right" size="mini" @click="selectBobileVideo()">选择</el-button>
           <!--          <el-select v-model="form.VIDEO_RESOURCES_ID" filterable placeholder="输入可筛选" @change="changeRid($event)">-->
           <!--            <el-option-->
@@ -114,14 +114,14 @@
           <!--          </el-select>-->
         </el-form-item>
 
-        <el-form-item v-if="form.VIDEO_TYPE===1" label="视频选择">
+        <el-form-item v-if="form.VIDEO_TYPE===2" label="视频选择">
           <el-button type="success" icon="el-icon-caret-right" size="mini" @click="selectVideo()">选择</el-button>
         </el-form-item>
 
         <el-form-item label="视频名称" prop="VIDEONAME">
           <el-input :disabled="true" v-model="form.VIDEONAME" placeholder="这里输入视频名称..." />
         </el-form-item>
-        <el-form-item v-if="form.VIDEO_TYPE===0" label="播放地址" prop="VIDEOURL">
+        <el-form-item v-if="form.VIDEO_TYPE===1" label="播放地址" prop="VIDEOURL">
           <el-input :disabled="true" v-model="form.VIDEOURL" placeholder="这里输入播放地址..." />
         </el-form-item>
 
@@ -529,10 +529,10 @@ export default {
     },
 
     // 修改
-    handleEdit(id) {
+    handleEdit(row) {
       this.msg = 'edit'
-      this.form.VIDEO_RESOURCE_ID = id
-      this.getData()
+      this.getData(row)
+      this.form.GATE_VIDEO_ID = row.GATE_VIDEO_ID
       this.dialogForm = true
     },
 
@@ -557,22 +557,24 @@ export default {
     },
 
     // 获取详情
-    getData() {
+    getData(row) {
       this.listLoading = true
+
       requestFN(
         'mkmjGateVideo/getVideo',
         {
-          VIDEO_RESOURCE_ID: this.form.VIDEO_RESOURCE_ID
+          AREA_GATE_ID: row.AREA_GATE_ID ,
+          AREA_ID: row.AREA_ID
         }
       ).then((data) => {
         Object.assign(this.form, data.pd)
         if (this.form.PLATFORMVIDEOMANAGEMENT_ID) {
-          this.form.VIDEO_TYPE = 1
+          this.form.VIDEO_TYPE = 2
         } else {
           if (this.form.VIDEO_RESOURCES_ID) {
-            this.form.VIDEO_TYPE = 0
-          } else {
             this.form.VIDEO_TYPE = 1
+          } else {
+            this.form.VIDEO_TYPE = 2
           }
         }
         this.VIDEOURL = data.pd.VIDEOURL + '&aspect=600x380'
@@ -593,10 +595,9 @@ export default {
           requestFN(
             '/mkmjGateVideo/' + this.msg,
             {
-              VIDEO_RESOURCE_ID: this.form.VIDEO_RESOURCE_ID,
-              VIDEO_RESOURCES_ID: this.form.VIDEO_TYPE === 0 ? this.form.VIDEO_RESOURCES_ID : '',
+              VIDEO_RESOURCE_ID: this.form.VIDEO_TYPE === 1 ? this.form.VIDEO_RESOURCES_ID : this.form.PLATFORMVIDEOMANAGEMENT_ID,
               VIDEONAME: this.form.VIDEONAME,
-              VIDEOURL: this.form.VIDEO_TYPE === 0 ? this.form.VIDEOURL : '',
+              VIDEOURL: this.form.VIDEO_TYPE === 1 ? this.form.VIDEOURL : '',
               CODE: this.form.CODE,
               LONGITUDE: this.form.LONGITUDE,
               LATITUDE: this.form.LATITUDE,
@@ -604,7 +605,7 @@ export default {
               AREA_ID: this.$parent.CAMERA_TYPE === 'area' ? this.$parent.CAMERA_ID : '',
               AREA_GATE_ID: this.$parent.CAMERA_TYPE === 'equipment' ? this.$parent.CAMERA_ID : '',
               DEVICE_TYPE: this.$parent.CAMERA_TYPE === 'area' ? 1 : 2,
-              PLATFORMVIDEOMANAGEMENT_ID: this.form.VIDEO_TYPE === 1 ? this.form.PLATFORMVIDEOMANAGEMENT_ID : ''
+              GATE_VIDEO_ID: this.form.GATE_VIDEO_ID
             }
           ).then((data) => {
             this.listLoading = false
@@ -626,7 +627,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.listLoading = true
-        console.log(this.VIDEO_RESOURCE_ID)
+        console.log(this.GATE_VIDEO_ID)
         requestFN(
           '/mkmjGateVideo/removeByIds',
           {
@@ -657,7 +658,7 @@ export default {
         return false
       }
       const ids = _selectData.map((item, index) => {
-        return item.VIDEO_RESOURCE_ID
+        return item.GATE_VIDEO_ID
       }).join(',')
 
       this.$confirm('确定要删除选中的数据吗?', {
@@ -708,7 +709,7 @@ export default {
       if (e === 1) {
         this.form.VIDEO_TYPE = 1
       } else {
-        this.form.VIDEO_TYPE = 0
+        this.form.VIDEO_TYPE = 2
       }
       this.form.VIDEO_RESOURCES_ID = ''
       this.form.VIDEONAME = ''
diff --git a/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/channel.vue b/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/channel.vue
index 65c2463..193b4b7 100644
--- a/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/channel.vue
+++ b/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/channel.vue
@@ -202,9 +202,7 @@ export default {
           PASSAGE_STATUS: [
             { required: true, message: '请选择状态', trigger: 'change' }
           ],
-          LONGITUDE: [
-            { required: true, message: '请选择位置', trigger: 'change' }
-          ]
+
         }
       },
       mapDialog: {
diff --git a/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/equipment.vue b/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/equipment.vue
index cdc986f..0dd5337 100644
--- a/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/equipment.vue
+++ b/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/equipment.vue
@@ -248,9 +248,7 @@ export default {
           GATE_POSITION: [
             { required: true, message: '请输入闸机位置', trigger: 'blur' }
           ],
-          LONGITUDE: [
-            { required: true, message: '请选择位置', trigger: 'change' }
-          ]
+
         }
       },
       mapDialog: {
diff --git a/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/list.vue b/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/list.vue
index f5d6974..9f8db0e 100644
--- a/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/list.vue
+++ b/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/list.vue
@@ -245,9 +245,7 @@ export default {
           AREA_STATUS: [
             { required: true, message: '请选择状态', trigger: 'change' }
           ],
-          LONGITUDE: [
-            { required: true, message: '请选择位置', trigger: 'change' }
-          ]
+
         }
       },
       mapDialog: {