From 5e6da22fb6f3b65e4dbf83896ad2a05d6d971432 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 26 十一月 2025 17:08:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan
---
screen/src/utils/request.js | 4
screen/vite.config.js | 5 +
screen/src/router/index.js | 144 ++++++++++++++++++++++++-----------------------
3 files changed, 79 insertions(+), 74 deletions(-)
diff --git a/screen/src/router/index.js b/screen/src/router/index.js
index a11e0eb..0b68655 100644
--- a/screen/src/router/index.js
+++ b/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')
+ // },
]
})
diff --git a/screen/src/utils/request.js b/screen/src/utils/request.js
index 0beb37a..94fce10 100644
--- a/screen/src/utils/request.js
+++ b/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
})
-}
\ No newline at end of file
+}
diff --git a/screen/vite.config.js b/screen/vite.config.js
index 1f65c7a..4a58ae8 100644
--- a/screen/vite.config.js
+++ b/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,
--
Gitblit v1.9.3