From 8ec6c116d035d80761a51023fbdc69d218d952d8 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: Wed, 20 Dec 2023 14:43:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8F=AA=E6=9C=89=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auth.json                                |   4 +-
 src/layouts/AsideMenu.vue                |   7 +-
 src/layouts/PageContent.vue              |   2 +-
 src/router/index.js                      | 194 +++++++++++------------
 src/views/checkManage/checkOperation.vue |  25 +--
 src/views/guide.vue                      |   2 +-
 6 files changed, 112 insertions(+), 122 deletions(-)

diff --git a/auth.json b/auth.json
index ddc8ab0..a2f7d82 100644
--- a/auth.json
+++ b/auth.json
@@ -3,8 +3,8 @@
     "type": -1,
     "rights": "duojiSystem",
     "children": [{
-        "description": "实时视频流",
+        "description": "盘点管理",
         "type": 1,
-        "rights": "realTimeMonitoring"
+        "rights": "checkManage"
     }]
 }
diff --git a/src/layouts/AsideMenu.vue b/src/layouts/AsideMenu.vue
index be956a0..523118e 100644
--- a/src/layouts/AsideMenu.vue
+++ b/src/layouts/AsideMenu.vue
@@ -71,7 +71,12 @@ export default {
                 parents = this.$router.options.routes[0].children.filter(ele => {
                     if (
                         this.userInfo.permissionList.some(item => {
-                            return item.rights === ele.name && ele.name.indexOf("center") < 0 && item.rights === ele.name && ele.name.indexOf("ioTable") < 0 && item.rights === ele.name && ele.name.indexOf("realTimeMonitoringModel") < 0 && item.rights === ele.name && ele.name.indexOf("plcStatus") < 0 && item.rights === ele.name && ele.name.indexOf("cameraManageModel") < 0 && item.rights === ele.name && ele.name.indexOf("checkOperation") < 0;
+                            return item.rights === ele.name && ele.name.indexOf("center") < 0 
+                            && item.rights === ele.name && ele.name.indexOf("ioTable") < 0 
+                            && item.rights === ele.name && ele.name.indexOf("realTimeMonitoringModel") < 0 
+                            && item.rights === ele.name && ele.name.indexOf("plcStatus") < 0 
+                            && item.rights === ele.name && ele.name.indexOf("cameraManageModel") < 0 
+                            && item.rights === ele.name && ele.name.indexOf("checkOperation") < 0;
                         })
                     ) {
                         return ele;
diff --git a/src/layouts/PageContent.vue b/src/layouts/PageContent.vue
index fbc6b32..222c960 100644
--- a/src/layouts/PageContent.vue
+++ b/src/layouts/PageContent.vue
@@ -2,7 +2,7 @@
     <div class="wrap">
         <!-- 面包屑下标题 -->
         
-        <keep-alive include="checkManage" exclude="realTimeMonitoring,videoWall,cameraManage,cameraManageModel">      
+        <keep-alive include="checkManage" exclude="checkManage,videoWall,cameraManage,cameraManageModel">      
             <router-view class="table" />    
         </keep-alive>    
         
diff --git a/src/router/index.js b/src/router/index.js
index d319efd..931d28d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -25,57 +25,57 @@ VueRouter.prototype.push = function push(location) {
 const routes = [{
     path: '/',
     redirect: {
-        name: 'realTimeMonitoring'
+        name: 'checkManage'
     },
     component: () => import('@/views/index'),
     children: [
-        {
-            path: 'videoWall1`',
-            name: 'videoWall1`',
-            meta: {
-                icon: 'desktop',
-                name: '视频墙1'
-            },
-            component: () => import('@/views/videoWall/index'),
-        },
-        {
-            path: 'videoWall2',
-            name: 'videoWall2',
-            meta: {
-                icon: 'desktop',
-                name: '视频墙2'
-            },
-            component: () => import('@/views/videoWall2/index'),
-        },
-        {
-            path: 'realTimeMonitoring',
-            name: 'realTimeMonitoring',
-            meta: {
-                icon: 'video-camera',
-                name: '实时视频流'
-            },
-            component: () => import('@/views/realTimeMonitoring/index'),
+        // {
+        //     path: 'videoWall1`',
+        //     name: 'videoWall1`',
+        //     meta: {
+        //         icon: 'desktop',
+        //         name: '视频墙1'
+        //     },
+        //     component: () => import('@/views/videoWall/index'),
+        // },
+        // {
+        //     path: 'videoWall2',
+        //     name: 'videoWall2',
+        //     meta: {
+        //         icon: 'desktop',
+        //         name: '视频墙2'
+        //     },
+        //     component: () => import('@/views/videoWall2/index'),
+        // },
+        // {
+        //     path: 'realTimeMonitoring',
+        //     name: 'realTimeMonitoring',
+        //     meta: {
+        //         icon: 'video-camera',
+        //         name: '实时视频流'
+        //     },
+        //     component: () => import('@/views/realTimeMonitoring/index'),
 
-        },
+        // },
        
-        {
-            path: 'historyMonitoring',
-            name: 'historyMonitoring',
-            meta: {
-                icon: 'book',
-                name: '历史数据'
-            },
-            component: () => import('@/views/historyMonitoring/index')
-        },
-        {
-            path: 'alarmLog',
-            name: 'alarmLog',
-            meta: {
-                icon: 'eye',
-                name: '告警日志'
-            },
-            component: () => import('@/views/alarmVideos/alarmLog')
-        },
+        // {
+        //     path: 'historyMonitoring',
+        //     name: 'historyMonitoring',
+        //     meta: {
+        //         icon: 'book',
+        //         name: '历史数据'
+        //     },
+        //     component: () => import('@/views/historyMonitoring/index')
+        // },
+        // {
+        //     path: 'alarmLog',
+        //     name: 'alarmLog',
+        //     meta: {
+        //         icon: 'eye',
+        //         name: '告警日志'
+        //     },
+        //     component: () => import('@/views/alarmVideos/alarmLog')
+        // },
         {
             path: 'checkManage',
             name: 'checkManage',
@@ -128,66 +128,66 @@ const routes = [{
             },
             component: () => import('@/views/roadwayManage/index')
         },
-        {
-            path: 'cameraManage',
-            name: 'cameraManage',
-            meta: {
-                icon: 'camera',
-                name: '球机管理'
-            },
-            component: () => import('@/views/cameraManage/index')
-        },
-        {
-            path: 'cameraManage/model',
-            name: 'cameraManageModel',
-            meta: {
-                name: '球机管理测试or配置'
-            },
-            component: () => import('@/views/cameraManage/model')
-        },
         // {
-        //     path: 'productSpecManage',
-        //     name: 'productSpecManage',
+        //     path: 'cameraManage',
+        //     name: 'cameraManage',
         //     meta: {
-        //         icon: 'pushpin',
-        //         name: '品规管理'
+        //         icon: 'camera',
+        //         name: '球机管理'
         //     },
-        //     component: () => import('@/views/productSpecManage/index')
+        //     component: () => import('@/views/cameraManage/index')
         // },
         // {
-        //     path: 'repertoryManage',
-        //     name: 'repertoryManage',
+        //     path: 'cameraManage/model',
+        //     name: 'cameraManageModel',
         //     meta: {
-        //         icon: 'wallet',
-        //         name: '库存管理'
+        //         name: '球机管理测试or配置'
         //     },
-        //     component: () => import('@/views/repertoryManage/index')
+        //     component: () => import('@/views/cameraManage/model')
         // },
+        // // {
+        // //     path: 'productSpecManage',
+        // //     name: 'productSpecManage',
+        // //     meta: {
+        // //         icon: 'pushpin',
+        // //         name: '品规管理'
+        // //     },
+        // //     component: () => import('@/views/productSpecManage/index')
+        // // },
+        // // {
+        // //     path: 'repertoryManage',
+        // //     name: 'repertoryManage',
+        // //     meta: {
+        // //         icon: 'wallet',
+        // //         name: '库存管理'
+        // //     },
+        // //     component: () => import('@/views/repertoryManage/index')
+        // // },
         
-        {
-            path: 'cameraManage/ioTable',
-            name: 'ioTable',
-            meta: {
-                name: 'IO表配置'
-            },
-            component: () => import('@/views/cameraManage/ioTable')
-        },
-        {
-            path: 'center',
-            name: 'center',
-            meta: {
-                name: '个人中心'
-            },
-            component: () => import('@/views/center')
-        },
-        {
-            path: 'plcStatus',
-            name: 'plcStatus',
-            meta: {
-                name: 'PLC状态'
-            },
-            component: () => import('@/views/plcStatus')
-        }
+        // {
+        //     path: 'cameraManage/ioTable',
+        //     name: 'ioTable',
+        //     meta: {
+        //         name: 'IO表配置'
+        //     },
+        //     component: () => import('@/views/cameraManage/ioTable')
+        // },
+        // {
+        //     path: 'center',
+        //     name: 'center',
+        //     meta: {
+        //         name: '个人中心'
+        //     },
+        //     component: () => import('@/views/center')
+        // },
+        // {
+        //     path: 'plcStatus',
+        //     name: 'plcStatus',
+        //     meta: {
+        //         name: 'PLC状态'
+        //     },
+        //     component: () => import('@/views/plcStatus')
+        // }
     ]
 },
 {
diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index 5468b6c..276c7ea 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -3,7 +3,7 @@
 
         <div>
             <div class="carousel-page">
-                <div class="carousel-page-content">
+                <div class="carousel-page-content" style="margin-bottom: 150px;">
                     <div class="img-box">
                         <ul>
                             <li>
@@ -11,7 +11,7 @@
                                     位置:
                                 </span>
                                 <span class="img-box-value">
-                                    {{checkObj.streetName}}-{{checkObj.direction }}-{{checkObj.column}}列-{{checkObj.row}}层
+                                    {{checkObj.streetName}}-{{direction==1?"左":"右"}}-{{side==1?"浅":"深"}}-{{checkObj.column}}列-{{checkObj.row}}层
                                 </span>
                             </li>
                             <li>
@@ -34,7 +34,7 @@
                         </ul>
                     </div>
                     <div class="img-box">
-                            <viewer v-if="checkObj.checkPic" style="height: 300px">
+                            <viewer v-if="checkObj.checkPic" style="height: 600px">
                                 <img :src="imgUrl+checkObj.checkPic"/>
                             </viewer>
                         <div
@@ -44,17 +44,6 @@
                         </div>
                         <p>盘点图1</p>
                     </div>
-                    <div class="img-box">
-                            <viewer v-if="checkObj.checkPic" style="height: 300px">
-                                <img :src="imgUrl+checkObj.checkPic2"/>
-                            </viewer>
-                        <div
-                            v-else
-                            style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;">
-                            暂无图片
-                        </div>
-                        <p>盘点图2</p>
-                    </div>
                     <!-- <div class="img-box">
                         <viewer v-if="checkObj.preoperationPic" style="height:300px;">
                             <img  :src="imgUrl+checkObj.preoperationPic"/>
@@ -93,7 +82,7 @@
                         @click="checkfalse(checkObj.row,checkObj.column,checkObj.shelveId,index)"
                 >核对错误
                 </a-button>
-		<a-button class="btn"
+		        <a-button class="btn"
                         type="primary"
                         style="background:#29c12b;border-color:#29c12b;"
                         @click="nextOne(checkObj.id)">
@@ -143,11 +132,7 @@ export default {
                 },
                 {
                     label:'托盘码',
-                    key: 'wmsCode'
-                },
-                {
-                    label:'托盘码描述',
-                    key: 'wmsCategory'
+                    key: 'trayCode'
                 },
                 {
                     label:'盘点时间',
diff --git a/src/views/guide.vue b/src/views/guide.vue
index c07a664..75b81c4 100644
--- a/src/views/guide.vue
+++ b/src/views/guide.vue
@@ -27,7 +27,7 @@ export default {
     methods: {
         go(index) {
             if (index === 0) {
-                this.$router.push({ name: "realTimeMonitoring" });
+                this.$router.push({ name: "checkManage" });
             } else {
                 this.$message.info("暂未开放");
             }