From be105687d5ced737450928e5fc4637ff76c66e0b Mon Sep 17 00:00:00 2001
From: yiming <wang.yiming@hzleaper.com>
Date: Mon, 14 Nov 2022 11:27:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E4=BA=AC=E4=B8=AD=E7=83=9Fweb?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/PageHeader.vue        | 20 +++------
 src/router/index.js               | 70 +++++++++++++++----------------
 src/views/roadwayManage/index.vue |  5 +--
 src/views/roadwayManage/model.vue | 13 +-----
 4 files changed, 42 insertions(+), 66 deletions(-)

diff --git a/src/layouts/PageHeader.vue b/src/layouts/PageHeader.vue
index 8a06236..6b8c7ab 100644
--- a/src/layouts/PageHeader.vue
+++ b/src/layouts/PageHeader.vue
@@ -11,24 +11,13 @@
             </a-layout-header>
         </div>
         <div class="header-right">
-            <div class="header-top-right-circle" @click="visible = !visible"></div>
             <a-badge :count="count" @click="openPlc">
                 <a-icon type="bell" style="font-size:20px;cursor:pointer"/>
             </a-badge>
+            <div class="header-top-right-circle" @click="visible = !visible"></div>
+            <div style="width:15px"/>
             <a-popover id="popover" v-model="visible" placement="bottom" trigger="click">
-                <a href="javascript:;" style="margin:0 10px">
-                    {{
-                    userInfo.name ? userInfo.name : "userName"
-                    }}
-                </a>
-                <div class="flex flex-column" :style="{ 'min-width': '78px' }" slot="content">
-                    <a
-                        class="block mb16"
-                        href="javascript:;"
-                        @click="visible = false;$router.push({name: 'center'})"
-                    >个人中心</a>
-                    <a href="javascript:;" @click="logout">退出登录</a>
-                </div>
+                <img :src="indexlogo" style="width:200px">
             </a-popover>
         </div>
     </div>
@@ -56,7 +45,8 @@ export default {
             visible: false,
             collapsed: false,
             count: 0,
-            title: ""
+            title: "",
+            indexlogo:require('@/assets/indexlogo.png'),
         };
     },
     mounted() {
diff --git a/src/router/index.js b/src/router/index.js
index 79362cf..de3e7e9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -93,23 +93,23 @@ const routes = [{
             },
             component: () => import('@/views/historyCheck/index'),
         },
-        {
-            path: 'stockHistory',
-            name: 'stockHistory',
-            meta: {
-                icon: 'file-excel',
-                name: '库位历史',
-            },
-            component: () => import('@/views/stockLog/index'),
-        },
-        {
-            path: 'stockLogDetail',
-            name: 'stockLogDetail',
-            meta: {
-                name: '库位历史详情',
-            },
-            component: () => import('@/views/stockLog/logPage'),
-        },
+        // {
+        //     path: 'stockHistory',
+        //     name: 'stockHistory',
+        //     meta: {
+        //         icon: 'file-excel',
+        //         name: '库位历史',
+        //     },
+        //     component: () => import('@/views/stockLog/index'),
+        // },
+        // {
+        //     path: 'stockLogDetail',
+        //     name: 'stockLogDetail',
+        //     meta: {
+        //         name: '库位历史详情',
+        //     },
+        //     component: () => import('@/views/stockLog/logPage'),
+        // },
         {
             path: 'roadwayManage',
             name: 'roadwayManage',
@@ -136,24 +136,24 @@ const routes = [{
             },
             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: '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',
diff --git a/src/views/roadwayManage/index.vue b/src/views/roadwayManage/index.vue
index c0d9f40..c3f66cb 100644
--- a/src/views/roadwayManage/index.vue
+++ b/src/views/roadwayManage/index.vue
@@ -102,10 +102,7 @@ const columns = [
         title: '光源IP',
         scopedSlots: { customRender: 'lightSourceIp' }
     },
-    {
-        title: 'plc',
-        scopedSlots: { customRender: 'plc' }
-    },
+    
     {
         title: 'RFID',
         scopedSlots: { customRender: 'RFID' }
diff --git a/src/views/roadwayManage/model.vue b/src/views/roadwayManage/model.vue
index e53e0f3..fd55296 100644
--- a/src/views/roadwayManage/model.vue
+++ b/src/views/roadwayManage/model.vue
@@ -26,18 +26,7 @@
                         />
                     </a-form-item>
                 </div>
-                <div class="across-layout">
-                    <a-form-item label="PLC IP" :label-col="formItemAcrossLayout.labelCol">
-                        <a-input
-                            v-decorator="['plcIp']"
-                        />
-                    </a-form-item>
-                    <a-form-item label="PLC PORT" :label-col="formItemAcrossLayout.labelCol">
-                        <a-input
-                            v-decorator="['plcPort']"
-                        />
-                    </a-form-item>
-                </div>
+                
                 <div class="across-layout">
                     <a-form-item label="光源IP" :label-col="formItemAcrossLayout.labelCol">
                         <a-input