From 9bef504cb75a3933745b9d7c0938d7ddb3e439d7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sat, 2 Apr 2022 17:35:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/antd_color.less                   |  4 ++--
 src/layouts/PageContent.vue              |  8 ++++----
 src/views/checkManage/Subsection.vue     |  3 +--
 src/views/checkManage/checkOperation.vue | 11 ++++++++++-
 src/views/checkManage/index.vue          | 12 +++++++++---
 5 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/public/antd_color.less b/public/antd_color.less
index b746b9c..50eb96c 100644
--- a/public/antd_color.less
+++ b/public/antd_color.less
@@ -30,7 +30,7 @@ button::-moz-focus-inner,
 [type='submit']::-moz-focus-inner {border-style: none;}
 fieldset {border: 0;}
 legend {color: inherit;}
-mark {background-color: #feffe6;}
+mark {background-color: color(~`colorPalette("@{text-color}", 1)`);}
 ::selection {color: #fff;background: @primary-color;}
 .anticon {color: inherit;}
 html {--antd-wave-shadow-color: @primary-color;}
@@ -1383,7 +1383,7 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;}
 .ant-tag-volcano-inverse {color: #fff;background: #fa541c;border-color: #fa541c;}
 .ant-tag-orange {color: #fa8c16;background: #fff7e6;border-color: #ffd591;}
 .ant-tag-orange-inverse {color: #fff;background: #fa8c16;border-color: #fa8c16;}
-.ant-tag-yellow {color: #fadb14;background: #feffe6;border-color: #fffb8f;}
+.ant-tag-yellow {color: #fadb14;background: color(~`colorPalette("@{text-color}", 1)`);border-color: #fffb8f;}
 .ant-tag-yellow-inverse {color: #fff;background: #fadb14;border-color: #fadb14;}
 .ant-tag-gold {color: #faad14;background: #fffbe6;border-color: #ffe58f;}
 .ant-tag-gold-inverse {color: #fff;background: #faad14;border-color: #faad14;}
diff --git a/src/layouts/PageContent.vue b/src/layouts/PageContent.vue
index 3caca8d..fbc6b32 100644
--- a/src/layouts/PageContent.vue
+++ b/src/layouts/PageContent.vue
@@ -1,10 +1,10 @@
 <template>
     <div class="wrap">
         <!-- 面包屑下标题 -->
-        <router-view :exclude="['checkManage','realTimeMonitoring']" class="table"></router-view>
-        <!-- <keep-alive>
-            
-        </keep-alive> -->
+        
+        <keep-alive include="checkManage" exclude="realTimeMonitoring,videoWall,cameraManage,cameraManageModel">      
+            <router-view class="table" />    
+        </keep-alive>    
         
         <!-- footer -->
         <div class="wrap-footer bg-white">
diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue
index 1c98041..a06e63f 100644
--- a/src/views/checkManage/Subsection.vue
+++ b/src/views/checkManage/Subsection.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="subsection">
-        <a-layout style="width: 900px">
+        <a-layout style="width: 1500px">
             <a-layout style="width: 100%;height: 310px">
                 <a-layout-sider width="110px">
                     <a-tabs default-active-key="1" tab-position="left" @change="changeTabLeft" v-if="total.row > nums.row">
@@ -82,7 +82,6 @@ export default {
             }
         },
         nums: {
-            // 行20个 列10个
             type: Object,
             default: () => {
                 return {
diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index 8209799..d2929d6 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -181,6 +181,10 @@ export default {
                     label:'扫描条码号',
                     key: 'code'
                 },
+                {
+                    label:'盘点时间',
+                    key: 'exportTime'
+                },
                 
             ],
             statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"核对正确"}
@@ -190,7 +194,12 @@ export default {
     beforeRouteLeave(to ,form, next) {
         // 修复第二次进入界面不执行created
         this.$destroy();
-        //next();
+        if (to.name == 'checkManage') {
+            to.meta.isUseCache = true;    
+        }else{
+            to.meta.isUseCache = false;
+        }   
+        next();
     },
     created() {
         this.imgUrl = imgUrl
diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue
index 9bf9077..93e0918 100644
--- a/src/views/checkManage/index.vue
+++ b/src/views/checkManage/index.vue
@@ -111,9 +111,15 @@ export default {
     created(){
 
     },
-    // activated() {
-    //     this.request();
-    // },
+    activated() {
+        if(!this.$route.meta.isUseCache){   
+            console.log("$route.meta.isUseCache false")         
+            // 清空原有数据
+            this.request();// 这是我们获取数据的函数
+        }else{
+            console.log("$route.meta.isUseCache true")        
+        }
+    },
     // beforeRouteLeave(to, form, next) {
     //     this.timer && clearInterval(this.timer);
     //     next();