From 3b7ec4e1ddbab576877bab69a13698e69f487e7a Mon Sep 17 00:00:00 2001
From: yangzongjia <yangzongjia>
Date: Tue, 22 Aug 2023 18:49:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=80=9A=E5=B7=9D=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/monitor/videos/index.vue              |  6 ++++--
 src/views/shebeitaizhang/shebeitaizhangAdd.vue  | 13 +++++++++----
 src/views/shebeitaizhang/shebeitaizhangInfo.vue |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/views/monitor/videos/index.vue b/src/views/monitor/videos/index.vue
index 72d6450..bd7a0a8 100644
--- a/src/views/monitor/videos/index.vue
+++ b/src/views/monitor/videos/index.vue
@@ -76,8 +76,8 @@
                       <p @click="getVedioPcRec(item.id)">回放视频</p>
                     </div>
                     <div class="seenconsc shipin_out noneDiv" style="top:0px;left:-250px">
-                      <p>设备名称：{{ item.name }}</p>
-                      <p>设备通道：{{ item.channelNo }}</p>
+                      <!-- <p>设备名称：{{ item.name }}</p>
+                      <p>设备通道：{{ item.channelNo }}</p> -->
                     </div>
                   </div>
                 </div>
@@ -393,6 +393,7 @@ export default {
         if (res.code == 200) {
           this.zc_list = res.data
         }
+        console.log("jddkz",this.zc_list)
       })
 
       getOtherList({ type: 2, ckId: item }).then((res) => {
@@ -651,6 +652,7 @@ export default {
           this.ckId = res.data[0].sid
           this.cangkuImage = '/image/' + res.data[0].sid + '.png'
         }
+        // 1 摄像头
         getOtherList({ type: 1, ckId: this.ckId }).then((res) => {
           if (res.code == 200) {
             this.zc_list = res.data
diff --git a/src/views/shebeitaizhang/shebeitaizhangAdd.vue b/src/views/shebeitaizhang/shebeitaizhangAdd.vue
index 787bd08..41ad3d0 100644
--- a/src/views/shebeitaizhang/shebeitaizhangAdd.vue
+++ b/src/views/shebeitaizhang/shebeitaizhangAdd.vue
@@ -122,9 +122,14 @@
                     class="addinputw" />
                 </el-select>
               </el-form-item>
-              <!-- <el-form-item prop="topPosition">
-                <el-input v-model="addForm.topPosition" maxlength="20" placeholder="请填写仓库" class="addinputw" clearable />
-              </el-form-item> -->
+            </el-col>
+            <el-col :span="4" class="tleftb" v-if="ckFlag">
+              <span><span class="icon">*</span>验证码</span>
+            </el-col>
+            <el-col :span="8" v-if="ckFlag">
+              <el-form-item prop="nvrCode">
+                <el-input v-model="addForm.nvrCode" maxlength="20" placeholder="请填写验证码" class="addinputw" clearable />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row v-if="sxtFlag">
@@ -243,7 +248,7 @@ export default {
           message: '请填写设备名称',
           trigger: 'blur'
         }],
-        vCode: [{
+        nvrCode: [{
           required: true,
           message: '请填写验证码',
           trigger: 'blur'
diff --git a/src/views/shebeitaizhang/shebeitaizhangInfo.vue b/src/views/shebeitaizhang/shebeitaizhangInfo.vue
index 1722904..791ca4b 100644
--- a/src/views/shebeitaizhang/shebeitaizhangInfo.vue
+++ b/src/views/shebeitaizhang/shebeitaizhangInfo.vue
@@ -191,7 +191,7 @@ export default {
     },
     getCkTitle(item) {
       for (var i = 0; i < this.ckList.length; i++) {
-        if (this.ckList[i].id == item) {
+        if (this.ckList[i].sid == item) {
           return this.ckList[i].name
         }
       }