Merge branch 'hongrunHaotian' into 'shandong-hongrunshihua'

merge hongrunHaotian into shandong-hongrunshihua

See merge request duoji/duoji-frontend!7

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
         },
 

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>

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>