From 0097a8f8c0da8e0420d8c9d6cd009138f66eecb0 Mon Sep 17 00:00:00 2001
From: wanghaotian <wang.haotian@hzleaper>
Date: Mon, 27 Mar 2023 17:53:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=B8=E5=AF=B9=E9=94=99=E8=AF=AF=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=B8=E5=AF=B9=E6=AD=A3=E7=A1=AE=EF=BC=8C=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E6=A0=B8=E5=AF=B9=EF=BC=8C=E6=9C=AA=E7=9B=98=E7=82=B9=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/checkManage/Subsection.vue | 11 ++++++++++-
 src/views/checkManage/index.vue      |  8 ++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue
index 3816502..13d26ad 100644
--- a/src/views/checkManage/Subsection.vue
+++ b/src/views/checkManage/Subsection.vue
@@ -217,7 +217,16 @@ export default {
         
         getStatusBg(row,column,status) {
             var dom = document.getElementById(this.direction+"-"+this.side+"-"+row+'-'+column);
-            var color = status == 1 ?'#d81e06': (status == 2|| status == 3) ? '#1afa29': '#bfbfbf';
+            var color;
+            if(status == -1){
+                color = '#bfbfbf';
+            }else if(status == 2|| status == 3){
+                color = '#1afa29';
+            }else if(status == 0 ){
+                color = '#fbb33d';
+            }else{
+                color = '#d81e06';
+            }
             dom.style.background = color
         },
 
diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue
index 371ace1..ac4ce43 100644
--- a/src/views/checkManage/index.vue
+++ b/src/views/checkManage/index.vue
@@ -12,11 +12,15 @@
             <span class="explain">颜色说明：</span>
             <span class="info-text">
                <a-tag color="#d81e06" style="width:30px;height:20px;margin-right:6px"></a-tag>
-               盘点错误
+               核对错误
            </span>
             <span class="info-text">
                 <a-tag color="#1afa29" style="width:30px;height:20px;margin-right:6px"></a-tag>
-               盘点正确
+               核对正确
+           </span>
+           <span class="info-text">
+                <a-tag color="#fbb33d" style="width:30px;height:20px;margin-right:6px"></a-tag>
+               需要核对
            </span>
             <span class="info-text">
                 <a-tag color="#bfbfbf" style="width:30px;height:20px;margin-right:6px"></a-tag>

From dab571a8a3c46dc92cae0406a0485bba5b4c090e Mon Sep 17 00:00:00 2001
From: wanghaotian <wang.haotian@hzleaper>
Date: Wed, 29 Mar 2023 14:57:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=A2=99=E5=A4=AA?=
 =?UTF-8?q?=E6=89=81=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=88=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8B=E6=8B=89=E6=A1=86=EF=BC=8C=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E6=8C=89=E4=B8=AA=E6=95=B0=E5=8E=8B=E7=BC=A9?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/videoWall/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/videoWall/index.vue b/src/views/videoWall/index.vue
index 271222c..142979c 100644
--- a/src/views/videoWall/index.vue
+++ b/src/views/videoWall/index.vue
@@ -1,10 +1,10 @@
 <template>
-    <div id="videos">
+    <div id="videos" style="overflow-y:scroll">
         
         <a-button type="primary" @click="full" v-if="!isFullscreen"> 全屏<a-icon type="right" /> </a-button>
         <a-button type="primary" @click="full" v-if="isFullscreen"><a-icon type="left" /> 退出全屏 </a-button>
         <a-row v-for='rowIndex in row' :key='rowIndex'>
-            <a-col v-for='colIndex in column' :key='colIndex' :span="24/column" :style="{height: videoHeight}" >
+            <a-col v-for='colIndex in column' :key='colIndex' :span="24/column" >
                 <video class="camera" :id="rowIndex+'-'+colIndex" autoplay muted :style="{'height': '100%',width:'100%','object-fit':'fill'}" ></video>
             </a-col>
         </a-row>
@@ -101,7 +101,7 @@ export default {
             this.$api.httpApi.getAllCameras({
                 params: {
                     //todo index是分组，一个填0  ，另一个填1
-                    index: 1
+                    index: 0
                 }
             }).then(res => {
                 if(res.code == 200) {