Jelajahi Sumber

权限菜单

AaronBruin 6 bulan lalu
induk
melakukan
c84a3ae0cf

+ 5 - 5
src/components/centerControl.vue

@@ -397,12 +397,12 @@
       getDeviceAttachment(T_sn, CoolerName, deptId) {
         return new Promise((resolve, inject) => {
           const that = this
-          // that.eventSource[T_sn] = new EventSource(
-          //   `http://182.43.247.65:6280/api/waybill/newlocus?T_sn=${T_sn}&Id=${deptId.dept.id}&CoolerName=${CoolerName}`
-          // ); //测试
           that.eventSource[T_sn] = new EventSource(
-            `https://colddelivery.coldbaozhida.com/cold_delivery/api/waybill/newlocus?T_sn=${T_sn}&Id=${deptId.dept.id}&CoolerName=${CoolerName}`
-          ); //正式
+            `http://colddeliverytest.coldbaozhida.com:9090/cold_delivery/api/waybill/newlocus?T_sn=${T_sn}&Id=${deptId.dept.id}&CoolerName=${CoolerName}`
+          ); //测试
+          // that.eventSource[T_sn] = new EventSource(
+          //   `https://colddelivery.coldbaozhida.com/cold_delivery/api/waybill/newlocus?T_sn=${T_sn}&Id=${deptId.dept.id}&CoolerName=${CoolerName}`
+          // ); //正式
           that.eventSource[T_sn].onopen = function(e) {
             // console.log('Connection to SSE opened.', e);
           };

+ 58 - 40
src/config/deliveryman.js

@@ -22,46 +22,64 @@ export const deliverymanRouter = {
     },
     component: () => import('@/views/system/addressBook'),
   }, {
-    path: '/IceManagement',
-    name: 'IceManagement',
-    meta: {
-      icon: 'icon-bingpaiguanli',
-      title: '冰排管理'
-    },
-    component: () => import('@/views/IceCreamFreezer/IceManagement'),
-  }, {
-    path: '/IceTracingManagement',
-    name: 'IceTracingManagement',
-    meta: {
-      icon: 'icon-iceTracing',
-      title: '冰排追溯管理'
-    },
-    component: () => import('@/views/IceCreamFreezer/IceTracingManagement'),
-  }, {
-    path: '/IncubatorManagement',
-    name: 'IncubatorManagement',
-    meta: {
-      icon: 'icon-baowenxiangguanli',
-      title: '保温箱管理'
-    },
-    component: () => import('@/views/incubator/IncubatorManagement'),
-  }, {
-    path: '/IncubatorTraceability',
-    name: 'IncubatorTraceability',
-    meta: {
-      icon: 'icon-trace',
-      title: '保温箱追溯'
-    },
-    component: () => import('@/views/incubator/IncubatorTraceability'),
-  }, {
-    path: '/FreezerManagement',
-    name: 'FreezerManagement',
-    meta: {
-      icon: 'icon-binggui',
-      title: '冷冻柜管理'
-    },
-    component: () => import('@/views/IceCreamFreezer/FreezerManagement'),
-  }, {
+      path: '/incubatorView',
+      name: 'incubatorView',
+      meta: {
+        icon: 'icon-trace',
+        title: '设备定位'
+      },
+      component: () => import('@/views/page/incubatorView'),
+    }, {
+      path: '/IceCreamFreezer',
+      name: 'IceCreamFreezer',
+      meta: {
+        icon: 'icon-yundan',
+        title: '设备管理'
+      },
+      component: () => import('@/views/IceCreamFreezer/index'),
+      redirect: '/IceCreamFreezer/IceManagement',
+      children: [{
+        path: 'IceManagement',
+        name: 'IceManagement',
+        meta: {
+          icon: 'icon-bingpaiguanli',
+          title: '冰排管理'
+        },
+        component: () => import('@/views/IceCreamFreezer/IceManagement'),
+      }, {
+        path: 'IceTracingManagement',
+        name: 'IceTracingManagement',
+        meta: {
+          icon: 'icon-iceTracing',
+          title: '冰排追溯管理'
+        },
+        component: () => import('@/views/IceCreamFreezer/IceTracingManagement'),
+      }, {
+        path: 'IncubatorManagement',
+        name: 'IncubatorManagement',
+        meta: {
+          icon: 'icon-baowenxiangguanli',
+          title: '保温箱管理'
+        },
+        component: () => import('@/views/incubator/IncubatorManagement'),
+      }, {
+        path: 'IncubatorTraceability',
+        name: 'IncubatorTraceability',
+        meta: {
+          icon: 'icon-trace',
+          title: '保温箱追溯'
+        },
+        component: () => import('@/views/incubator/IncubatorTraceability'),
+      }, {
+        path: 'FreezerManagement',
+        name: 'FreezerManagement',
+        meta: {
+          icon: 'icon-binggui',
+          title: '冷冻柜管理'
+        },
+        component: () => import('@/views/IceCreamFreezer/FreezerManagement'),
+      }],
+    }, {
     path: '/OrderManagement',
     name: 'OrderManagement',
     meta: {

+ 8 - 8
src/config/intendant.js

@@ -14,14 +14,6 @@ export const intendantRouter = {
       // component: () => import('@/views/page/Home'),
       component: () => import('@/views/page/homeView'),
     }, {
-      path: '/incubatorView',
-      name: 'incubatorView',
-      meta: {
-        icon: 'icon-trace',
-        title: '设备定位'
-      },
-      component: () => import('@/views/page/incubatorView'),
-    }, {
       path: '/UserManagement',
       name: 'UserManagement',
       meta: {
@@ -46,6 +38,14 @@ export const intendantRouter = {
       },
       component: () => import('@/views/IceCreamFreezer/storeManagement'),
     }, {
+      path: '/incubatorView',
+      name: 'incubatorView',
+      meta: {
+        icon: 'icon-trace',
+        title: '设备定位'
+      },
+      component: () => import('@/views/page/incubatorView'),
+    }, {
       path: '/IceCreamFreezer',
       name: 'IceCreamFreezer',
       meta: {

+ 2 - 1
src/utils/request.js

@@ -9,7 +9,8 @@ import {
   refreshToken
 } from '@/api/login'
 // 创建 axios 实例
-const Url = "https://colddelivery.coldbaozhida.com/cold_delivery"
+// const Url = "https://colddelivery.coldbaozhida.com/cold_delivery"
+const Url = "http://colddeliverytest.coldbaozhida.com:9090/cold_delivery" //测试
 const token = localStorage.getItem('T_tokey')
 // const Url = "http://192.168.11.77:6280" //测试
 const request = axios.create({

+ 1 - 1
src/views/common/topNav.vue

@@ -3,7 +3,7 @@
     <el-image style="height: 35px;width: 35px;flex: none;" :src="require('@/assets/logo3.png')"></el-image>
     <div class="head_title">智配送安全追溯AI管理平台</div>
     <!-- <i class="card_unpack" :class="iconFlag ? 'el-icon-s-unfold' : 'el-icon-s-fold'" @click="getUnpack"></i> -->
-    <div style="width: 1000px;flex: none;margin-left: 20px;">
+    <div style="width: 1200px;flex: none;margin-left: 20px;">
       <el-menu mode="horizontal" :default-active="$route.path" class="el-menu-vertical-demo" router @open="handleOpen"
         @close="handleClose">
         <template v-for="menu in menus">

+ 1 - 1
src/views/login.vue

@@ -18,7 +18,7 @@
           </el-form-item>
           <el-form-item prop="captcha">
             <div style="display: flex;">
-              <el-input v-model.number="form.captcha" placeholder="请输入验证码"></el-input>
+              <el-input v-model="form.captcha" placeholder="请输入验证码"></el-input>
               <div style="margin-left: 5px;cursor: pointer;" @click="refreshCode">
                 <identifyingCode :identify-code="identifyCode" :contentWidth="140"></identifyingCode>
               </div>

+ 2 - 2
vue.config.js

@@ -16,8 +16,8 @@ module.exports = defineConfig({
   devServer: {
     proxy: {
       '/api': {
-        target: 'https://colddelivery.coldbaozhida.com/cold_delivery',
-        // target: 'http://182.43.247.65:6280', //测试
+        // target: 'https://colddelivery.coldbaozhida.com/cold_delivery',
+        target: 'http://colddeliverytest.coldbaozhida.com:9090/cold_delivery', //测试
         // target: 'http://192.168.11.15:6280', //本地
         ws: false,
         changeOrigin: true,