Merge remote-tracking branch 'origin/maanshan' into maanshan

doum

9 小时以前 5e6da22fb6f3b65e4dbf83896ad2a05d6d971432

Merge remote-tracking branch 'origin/maanshan' into maanshan

 screen/src/router/index.js

@@ -5,80 +5,84 @@
  routes: [
    {
      path: '/',
      component: () => import('../views/EnergyConsum.vue')
    },
    {
      path: '/PlatformCall', // 月台叫号大屏
      name: 'PlatformCall',
      meta: {
        title: '安泰物流月台叫号大屏'
      },
      component: () => import('../views/PlatformCall.vue')
    },
    {
      path: '/EnergyConsum', // 能耗看板 - 安泰智慧物流园区-绿色低碳运营
      name: 'EnergyConsum',
      meta: {
        title: '安泰智慧物流园区-绿色低碳运营'
      },
      component: () => import('../views/EnergyConsum.vue')
    },
    {
      path: '/LogisticsEfficiency', // 物流运行调度看板- 调度能效
      name: 'LogisticsEfficiency',
      meta: {
        title: '安泰智慧物流园区-调度能效跟踪'
      },
      component: () => import('../views/LogisticsEfficiency.vue')
    },
    {
      path: '/SecurityControl',  // 安防管控大屏 -
      name: 'SecurityControl',
      meta: {
        title: '安泰智慧物流园区-智能安防监测'
      },
      component: () => import('../views/SecurityControl.vue')
    },
    {
      path: '/LogisticsCenter', //全省物流在途-物流中心
      name: 'LogisticsCenter',
      meta: {
        title: '安徽中烟数智成品管控'
      },
      component: () => import('../views/LogisticsCenter.vue')
    },
    {
      path: '/FireFighting', //消防监控
      name: 'FireFighting',
      meta: {
        title: '安泰智慧物流园区-消防态势监控'
      },
      component: () => import('../views/FireFighting.vue')
    },
    {
      path: '/FireFighting1', //消防监控
      name: 'FireFighting1',
      meta: {
        title: '安泰智慧物流园区-消防态势监控'
      },
      component: () => import('../views/FireFighting1.vue')
    },
    {
      path: '/TaskEfficiency', //场内调度看板 -作业能效
      name: 'TaskEfficiency',
      meta: {
        title: '安泰智慧物流园区-作业效能统筹'
      },
      component: () => import('../views/TaskEfficiency.vue')
    },
    {
      path: '/KeyCabinet', // 钥匙柜数据看板
      name: 'KeyCabinet',
      meta: {
        title: '钥匙柜数据看板'
      },
      component: () => import('../views/KeyCabinet.vue')
    },
    }
    // ,
    // {
    //   path: '/PlatformCall', // 月台叫号大屏
    //   name: 'PlatformCall',
    //   meta: {
    //     title: '安泰物流月台叫号大屏'
    //   },
    //   component: () => import('../views/PlatformCall.vue')
    // },
    // {
    //   path: '/EnergyConsum', // 能耗看板 - 安泰智慧物流园区-绿色低碳运营
    //   name: 'EnergyConsum',
    //   meta: {
    //     title: '安泰智慧物流园区-绿色低碳运营'
    //   },
    //   component: () => import('../views/EnergyConsum.vue')
    // },
    // {
    //   path: '/LogisticsEfficiency', // 物流运行调度看板- 调度能效
    //   name: 'LogisticsEfficiency',
    //   meta: {
    //     title: '安泰智慧物流园区-调度能效跟踪'
    //   },
    //   component: () => import('../views/LogisticsEfficiency.vue')
    // },
    // {
    //   path: '/SecurityControl',  // 安防管控大屏 -
    //   name: 'SecurityControl',
    //   meta: {
    //     title: '安泰智慧物流园区-智能安防监测'
    //   },
    //   component: () => import('../views/SecurityControl.vue')
    // },
    // {
    //   path: '/LogisticsCenter', //全省物流在途-物流中心
    //   name: 'LogisticsCenter',
    //   meta: {
    //     title: '安徽中烟数智成品管控'
    //   },
    //   component: () => import('../views/LogisticsCenter.vue')
    // },
    // {
    //   path: '/FireFighting', //消防监控
    //   name: 'FireFighting',
    //   meta: {
    //     title: '安泰智慧物流园区-消防态势监控'
    //   },
    //   component: () => import('../views/FireFighting.vue')
    // },
    // {
    //   path: '/FireFighting1', //消防监控
    //   name: 'FireFighting1',
    //   meta: {
    //     title: '安泰智慧物流园区-消防态势监控'
    //   },
    //   component: () => import('../views/FireFighting1.vue')
    // },
    // {
    //   path: '/TaskEfficiency', //场内调度看板 -作业能效
    //   name: 'TaskEfficiency',
    //   meta: {
    //     title: '安泰智慧物流园区-作业效能统筹'
    //   },
    //   component: () => import('../views/TaskEfficiency.vue')
    // },
    // {
    //   path: '/KeyCabinet', // 钥匙柜数据看板
    //   name: 'KeyCabinet',
    //   meta: {
    //     title: '钥匙柜数据看板'
    //   },
    //   component: () => import('../views/KeyCabinet.vue')
    // },
  ]
})


 screen/src/utils/request.js

@@ -1,7 +1,7 @@
import axios from "axios"

const instance = axios.create({
  baseURL: '/gateway_interface',
  baseURL: '/system_gateway',
  timeout: 30000,
  withCredentials: true,
  headers: {
@@ -33,4 +33,4 @@
    method: 'get',
    data
  })
}
}

 screen/vite.config.js

@@ -24,8 +24,9 @@
  },
  server: {
    proxy: {
      "/gateway_interface": {
        target: "http://192.168.1.45:10010",
      "/system_gateway": {
        // target: "http://192.168.1.45:10010",
        target: "http://192.168.0.7/system_gateway",
        // target: "http://10.50.250.253:8088/gateway_interface",
        // target: "https://atwl.ahzyssl.com/zhyq_interface",
        changeOrigin: true,