From 2390b48511f0cdab47896c93160207d0b3f36e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Sun, 18 Jun 2023 15:42:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=85=A7=E7=89=87=E6=94=BE=E5=A4=A7=20?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                       | 36 +++++++++++------------
 src/views/emptyCheckManage/Subsection.vue |  6 ++--
 src/views/emptyCheckManage/index.vue      |  2 +-
 src/views/historyMonitoring/index.vue     | 14 +++++----
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 391e2aa..dfac89f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -67,15 +67,15 @@ const routes = [{
         //     },
         //     component: () => import('@/views/alarmVideos/alarmLog')
         // },
-        {
-            path: 'checkSummary',
-            name: 'checkSummary',
-            meta: {
-                icon: 'eye',
-                name: '盘点统计'
-            },
-            component: () => import('@/views/checkSummary/index')
-        },
+        // {
+        //     path: 'checkSummary',
+        //     name: 'checkSummary',
+        //     meta: {
+        //         icon: 'eye',
+        //         name: '盘点统计'
+        //     },
+        //     component: () => import('@/views/checkSummary/index')
+        // },
         {
             path: 'emptyCheckManage',
             name: 'emptyCheckManage',
@@ -154,15 +154,15 @@ const routes = [{
             },
             component: () => import('@/views/cameraManage/model')
         },
-        {
-            path: 'checkMonitoring',
-            name: 'checkMonitoring',
-            meta: {
-                icon: "eye",
-                name: '实时盘点监控'
-            },
-            component: () => import('@/views/checkMonitoring/index')
-        },
+        // {
+        //     path: 'checkMonitoring',
+        //     name: 'checkMonitoring',
+        //     meta: {
+        //         icon: "eye",
+        //         name: '实时盘点监控'
+        //     },
+        //     component: () => import('@/views/checkMonitoring/index')
+        // },
         // {
         //     path: 'productSpecManage',
         //     name: 'productSpecManage',
diff --git a/src/views/emptyCheckManage/Subsection.vue b/src/views/emptyCheckManage/Subsection.vue
index e898af2..005a2da 100644
--- a/src/views/emptyCheckManage/Subsection.vue
+++ b/src/views/emptyCheckManage/Subsection.vue
@@ -10,7 +10,7 @@
                         >
                             <span slot="tab" >
                                 {{  getRandom(latticeRow + 1 -index, latticeRow, nums.row, total.row) }}
-                                <a-icon type="close-circle" v-if="status.row[index] === 0" style="color: #d81e06"/>
+                                <a-icon type="close-circle" v-if="status.row[index] === 0" style="color: #dacb2e"/>
                                 <a-icon type="check-circle" v-else-if="status.row[index] === 2" style="color: #1afa29" />
                                 <a-icon type="exclamation-circle" v-else style="color: #909399" />
                             </span>
@@ -48,7 +48,7 @@
                             <span slot="tab">
                                 {{  getRandom(index, latticeColumn, nums.column, total.column) }}
                                 <!-- <a-icon :id="`${shelveId}-row-${getRandom(index,latticeRow,nums.row,total.row)}`"/> -->
-                                <a-icon type="close-circle" v-if="status.column[index] === 0" style="color: #d81e06" />
+                                <a-icon type="close-circle" v-if="status.column[index] === 0" style="color: #dacb2e" />
                                 <a-icon type="check-circle" v-else-if="status.column[index] === 2" style="color: #1afa29" />
                                 <a-icon type="exclamation-circle" v-else style="color: #909399" />
                             </span>
@@ -217,7 +217,7 @@ export default {
         
         getStatusBg(row,column,status) {
             var dom = document.getElementById(this.direction+"-"+this.side+"-"+row+'-'+column);
-            var color = status == 0 ?'#d81e06': (status == 1) ? '#1afa29': '#bfbfbf';
+            var color = status == 0 ?'#dacb2e': (status == 1) ? '#1afa29': '#bfbfbf';
             dom.style.background = color
         },
 
diff --git a/src/views/emptyCheckManage/index.vue b/src/views/emptyCheckManage/index.vue
index fbb225f..ad77d5c 100644
--- a/src/views/emptyCheckManage/index.vue
+++ b/src/views/emptyCheckManage/index.vue
@@ -4,7 +4,7 @@
         <div class="title-info">
             <span class="explain">颜色说明：</span>
             <span class="info-text">
-               <a-tag color="#d81e06" style="width:30px;height:20px;margin-right:6px"></a-tag>
+               <a-tag color="#dacb2e" style="width:30px;height:20px;margin-right:6px"></a-tag>
                未知
            </span>
             <span class="info-text">
diff --git a/src/views/historyMonitoring/index.vue b/src/views/historyMonitoring/index.vue
index bddab43..f0963cf 100644
--- a/src/views/historyMonitoring/index.vue
+++ b/src/views/historyMonitoring/index.vue
@@ -44,8 +44,9 @@
                 <span style="height:100%;">
                     <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box" style="height:30px;">
                       
-                        <img class="historyImg"  :src="imgUrl+text.intoStockPic"
-                                />
+                        <viewer :images="text.intoStockPic">
+                        <img class="historyImg"  :src="imgUrl+text.intoStockPic" />
+                        </viewer>
                     </happy-scroll>
                 </span>
                 
@@ -57,9 +58,11 @@
             <template>
                 <span style="height:100%;">
                     <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box" style="height:30px;">
-                      
-                        <img class="historyImg"  :src="imgUrl+text.intoStockOverPic"
-                                />
+                        
+                        <viewer :images="text.intoStockOverPic">
+                        <img class="historyImg"  :src="imgUrl+text.intoStockOverPic" />
+                        
+                    </viewer>
                     </happy-scroll>
                 </span>
                 
@@ -113,7 +116,6 @@ export default {
                 },
                 {
                     title: "入库顶部照片",
-                    
                     scopedSlots: {customRender: 'intoStockPic'},
                     width:200
                 },