From 84588b0dff9d7d5fa8b03ce336e5522b917f69b8 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 3 Jul 2023 15:46:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E5=83=8F=E9=87=87=E9=9B=86=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/imageCapture.vue               | 30 ++++++++++++++---
 .../components/videoCapture.vue               | 32 +++++++++++++++----
 2 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue b/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue
index ae9f7a5..c71f23d 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue
@@ -13,9 +13,19 @@
             <el-option
               v-for="item in accesslist"
               :key="item.channelid"
-              :label="item.channelname"
+              :label="
+                item.alias !== null && item.alias !== ''
+                  ? item.alias
+                  : item.channelname
+              "
               :value="item.channelid"
-            ></el-option>
+            >
+              {{
+                item.alias !== null && item.alias !== ""
+                  ? item.alias
+                  : item.channelname
+              }}
+            </el-option>
           </el-select>
         </div>
         <div class="flexno bt30">
@@ -95,9 +105,19 @@
               <el-option
                 v-for="item in accesslist"
                 :key="item.channelid"
-                :label="item.channelname"
+                :label="
+                  item.alias !== null && item.alias !== ''
+                    ? item.alias
+                    : item.channelname
+                "
                 :value="item.channelid"
-              ></el-option>
+              >
+                {{
+                  item.alias !== null && item.alias !== ""
+                    ? item.alias
+                    : item.channelname
+                }}
+              </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="色彩选择" prop="color">
@@ -246,7 +266,7 @@ export default {
       this.searchloading = true;
       getPhotoParamApi({
         channelId: this.selaccess,
-        cmdId: this.selcmdId,
+        termId: this.seltermid,
       })
         .then((res) => {
           if (res.code == 200) {
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue b/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue
index 8d37ce8..9424bab 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue
@@ -13,9 +13,19 @@
             <el-option
               v-for="item in accesslist"
               :key="item.channelid"
-              :label="item.channelname"
+              :label="
+                item.alias !== null && item.alias !== ''
+                  ? item.alias
+                  : item.channelname
+              "
               :value="item.channelid"
-            ></el-option>
+            >
+              {{
+                item.alias !== null && item.alias !== ""
+                  ? item.alias
+                  : item.channelname
+              }}
+            </el-option>
           </el-select>
         </div>
         <div class="flexno bt30">
@@ -78,9 +88,19 @@
               <el-option
                 v-for="item in accesslist"
                 :key="item.channelid"
-                :label="item.channelname"
+                :label="
+                  item.alias !== null && item.alias !== ''
+                    ? item.alias
+                    : item.channelname
+                "
                 :value="item.channelid"
-              ></el-option>
+              >
+                {{
+                  item.alias !== null && item.alias !== ""
+                    ? item.alias
+                    : item.channelname
+                }}
+              </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="视频分辨率" prop="videoFormat">
@@ -142,7 +162,7 @@ export default {
       selaccess: "", //选中的通道
       capturenr: {}, //查询后的内容
       setForm: {
-        preset: 255
+        preset: 255,
       }, //设置参数
       rules: {
         channelId: [{ required: true, message: "请选择通道", trigger: "blur" }],
@@ -169,7 +189,7 @@ export default {
     //获取设备通道
     getSingleAccess(val) {
       this.setForm = {
-        preset: 255
+        preset: 255,
       };
       console.log(val);
       this.seltermid = val.id;