From 24290c9970d6630783396d7ca6b3bdc0cf38a15c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Sat, 26 Aug 2023 11:49:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/project/surProject/index.vue    |  7 ++-
 .../src/views/project/videoConfig/index.vue   | 57 ++++++++++++++-----
 .../project/videoConfig/videoConfigDrawer.vue |  3 -
 3 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/ruoyi-ui/src/views/project/surProject/index.vue b/ruoyi-ui/src/views/project/surProject/index.vue
index 8510a4e7..580b3f57 100644
--- a/ruoyi-ui/src/views/project/surProject/index.vue
+++ b/ruoyi-ui/src/views/project/surProject/index.vue
@@ -373,6 +373,7 @@
               'project:materialSeal:list',
               'project:projectDeptWroks:list',
               'project:surProjectAttendance:add',
+              'project:videoConfig:list',
               'project:surProject:remove',
             ]"
           >
@@ -447,9 +448,9 @@
                 >今日出勤</el-dropdown-item
               >
               <el-dropdown-item
-                command="handVideoConfig"
+                command="handleVideoConfig"
                 icon="el-icon-video-camera-solid"
-                v-hasPermi="['project:videoConfig:add']"
+                v-hasPermi="['project:videoConfig:list']"
                 >视频配置</el-dropdown-item
               >
               <el-dropdown-item
@@ -1088,7 +1089,7 @@ export default {
         case "handleProjectMaterialSeal":
           this.$refs.materialSeal.show(row);
           break;
-        case "handVideoConfig":
+        case "handleVideoConfig":
           this.$refs.videoConfig.show(row);
           break;
         default:
diff --git a/ruoyi-ui/src/views/project/videoConfig/index.vue b/ruoyi-ui/src/views/project/videoConfig/index.vue
index 4c001642..8493c9e5 100644
--- a/ruoyi-ui/src/views/project/videoConfig/index.vue
+++ b/ruoyi-ui/src/views/project/videoConfig/index.vue
@@ -55,7 +55,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -65,7 +65,7 @@
           v-hasPermi="['project:videoConfig:add']"
           >新增</el-button
         >
-      </el-col> -->
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -159,9 +159,21 @@
           <dict-tag :options="dict.type.sys_common_isdel" :value="scope.row.isDel" />
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="200"
+      >
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['project:videoConfig:edit']"
+            >实时视频</el-button
+          >
           <el-button
             size="mini"
             type="text"
@@ -193,12 +205,22 @@
     <!-- 添加或修改视频配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="项目名称" prop="projectName">
-          <el-input
-            v-model="form.projectName"
-            placeholder="请输入项目名称"
-            :disabled="true"
-          />
+        <el-form-item label="项目名称" prop="projectId">
+          <el-select
+            v-model="form.projectId"
+            filterable
+            clearable
+            placeholder="请选择所属项目"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in projectOptions"
+              :key="item.id"
+              :label="item.projectName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="设备名称" prop="videoName">
           <el-input v-model="form.videoName" placeholder="请输入设备名称" />
@@ -212,9 +234,6 @@
         <el-form-item label="通信密码" prop="signalCode">
           <el-input v-model="form.signalCode" placeholder="请输入通信密码" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
         <el-divider content-position="center">设备通道信息</el-divider>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
@@ -283,6 +302,7 @@ export default {
   dicts: ["project_video_type", "project_video_signal_state", "sys_common_isdel"],
   data() {
     return {
+      projectOptions: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -350,6 +370,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getProjectList();
   },
   methods: {
     /** 查询视频配置列表 */
@@ -361,6 +382,16 @@ export default {
         this.loading = false;
       });
     },
+    // 获取项目列表
+    getProjectList() {
+      let param = {
+        data: {},
+      };
+      //获取项目列表的接口
+      this.$api.publics.getMyProjectList(param).then((response) => {
+        this.projectOptions = response.rows;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
diff --git a/ruoyi-ui/src/views/project/videoConfig/videoConfigDrawer.vue b/ruoyi-ui/src/views/project/videoConfig/videoConfigDrawer.vue
index 2bb5da4b..53c1dd27 100644
--- a/ruoyi-ui/src/views/project/videoConfig/videoConfigDrawer.vue
+++ b/ruoyi-ui/src/views/project/videoConfig/videoConfigDrawer.vue
@@ -166,9 +166,6 @@
           <el-form-item label="通信密码" prop="signalCode">
             <el-input v-model="form.signalCode" placeholder="请输入通信密码" />
           </el-form-item>
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" placeholder="请输入备注" />
-          </el-form-item>
           <el-divider content-position="center">设备通道信息</el-divider>
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">