From afc3897af8de95aae47ff7dce334a3617256748a Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 17 三月 2026 16:03:48 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShiGe/LingPaoCheShenKu
---
项目代码/WCS/WCSClient/src/router/viewGird.js | 4 ++--
项目代码/WMS/WMSClient/src/router/viewGird.js | 11 +----------
项目代码/WMS/WMSClient/src/views/widesea_wms/basicinfo/Dt_StationManager.vue | 2 +-
3 files changed, 4 insertions(+), 13 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/router/viewGird.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/router/viewGird.js"
index fca7c03..fbac5a6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/router/viewGird.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSClient/src/router/viewGird.js"
@@ -88,8 +88,8 @@
},
{
- path: '/StationManager',
- name: 'StationManager',
+ path: '/Dt_StationManager',
+ name: 'Dt_StationManager',
component: () => import('@/views/basicinfo/Dt_StationManager.vue'),
meta: {
keepAlive: false
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/router/viewGird.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/router/viewGird.js"
index 04ee216..f15f493 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/router/viewGird.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/router/viewGird.js"
@@ -117,16 +117,7 @@
meta: {
keepAlive: false
}
- },
- {
- path: '/Dt_StationManager',
- name: 'Dt_StationManager',
- component: () => import('@/views/basicinfo/Dt_StationManager.vue'),
- meta: {
- keepAlive: false
- }
-
- },
+ }
]
export default viewgird
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/basicinfo/Dt_StationManager.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/basicinfo/Dt_StationManager.vue"
index 6ac5ca4..a5da637 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/basicinfo/Dt_StationManager.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/basicinfo/Dt_StationManager.vue"
@@ -16,7 +16,7 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'areaID',
+ key: 'stationID',
footer: "Foots",
cnName: '绔欏彴淇℃伅',
name: 'basicinfo/Dt_StationManager',
--
Gitblit v1.9.3