diff --git a/.env.development b/.env.development
index 46f24ee..b55553d 100644
--- a/.env.development
+++ b/.env.development
@@ -13,4 +13,4 @@
#标注产品化及项目分别
#NAN_PING:南平海绵
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/.env.development b/.env.development
index 46f24ee..b55553d 100644
--- a/.env.development
+++ b/.env.development
@@ -13,4 +13,4 @@
#标注产品化及项目分别
#NAN_PING:南平海绵
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/.env.production b/.env.production
index 9c52b1e..1374bd4 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@
VITE_BUILD_COMPRESS = gzip
#地图插件内的地址环境判断
-VITE_APP_MAP_SRC = '/NFProduct/'
+VITE_APP_MAP_SRC = '/bigSgreen/'
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/.env.development b/.env.development
index 46f24ee..b55553d 100644
--- a/.env.development
+++ b/.env.development
@@ -13,4 +13,4 @@
#标注产品化及项目分别
#NAN_PING:南平海绵
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/.env.production b/.env.production
index 9c52b1e..1374bd4 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@
VITE_BUILD_COMPRESS = gzip
#地图插件内的地址环境判断
-VITE_APP_MAP_SRC = '/NFProduct/'
+VITE_APP_MAP_SRC = '/bigSgreen/'
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/index.html b/index.html
index 8b6d1b3..e7abcc8 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
海绵智慧管理系统
+
diff --git a/.env.development b/.env.development
index 46f24ee..b55553d 100644
--- a/.env.development
+++ b/.env.development
@@ -13,4 +13,4 @@
#标注产品化及项目分别
#NAN_PING:南平海绵
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/.env.production b/.env.production
index 9c52b1e..1374bd4 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@
VITE_BUILD_COMPRESS = gzip
#地图插件内的地址环境判断
-VITE_APP_MAP_SRC = '/NFProduct/'
+VITE_APP_MAP_SRC = '/bigSgreen/'
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/index.html b/index.html
index 8b6d1b3..e7abcc8 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
海绵智慧管理系统
+
diff --git a/public/static/images/nalaodian.png b/public/static/images/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/public/static/images/nalaodian.png
Binary files differ
diff --git a/.env.development b/.env.development
index 46f24ee..b55553d 100644
--- a/.env.development
+++ b/.env.development
@@ -13,4 +13,4 @@
#标注产品化及项目分别
#NAN_PING:南平海绵
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/.env.production b/.env.production
index 9c52b1e..1374bd4 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@
VITE_BUILD_COMPRESS = gzip
#地图插件内的地址环境判断
-VITE_APP_MAP_SRC = '/NFProduct/'
+VITE_APP_MAP_SRC = '/bigSgreen/'
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/index.html b/index.html
index 8b6d1b3..e7abcc8 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
海绵智慧管理系统
+
diff --git a/public/static/images/nalaodian.png b/public/static/images/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/public/static/images/nalaodian.png
Binary files differ
diff --git a/src/api/dataAnalysis/syntherticData.js b/src/api/dataAnalysis/syntherticData.js
index a35ec7c..c8bfcfe 100644
--- a/src/api/dataAnalysis/syntherticData.js
+++ b/src/api/dataAnalysis/syntherticData.js
@@ -183,9 +183,8 @@
// 预案方案列表
export function screenMapLayerList(query) {
return request({
- url: '/business/screen-map-layer/list-type',
+ url: `/business/screen-map-layer/list-type/${query}`,
method: 'get',
- params: query,
});
}
// 站点对比分析-对比数据
diff --git a/.env.development b/.env.development
index 46f24ee..b55553d 100644
--- a/.env.development
+++ b/.env.development
@@ -13,4 +13,4 @@
#标注产品化及项目分别
#NAN_PING:南平海绵
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/.env.production b/.env.production
index 9c52b1e..1374bd4 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@
VITE_BUILD_COMPRESS = gzip
#地图插件内的地址环境判断
-VITE_APP_MAP_SRC = '/NFProduct/'
+VITE_APP_MAP_SRC = '/bigSgreen/'
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/index.html b/index.html
index 8b6d1b3..e7abcc8 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
海绵智慧管理系统
+
diff --git a/public/static/images/nalaodian.png b/public/static/images/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/public/static/images/nalaodian.png
Binary files differ
diff --git a/src/api/dataAnalysis/syntherticData.js b/src/api/dataAnalysis/syntherticData.js
index a35ec7c..c8bfcfe 100644
--- a/src/api/dataAnalysis/syntherticData.js
+++ b/src/api/dataAnalysis/syntherticData.js
@@ -183,9 +183,8 @@
// 预案方案列表
export function screenMapLayerList(query) {
return request({
- url: '/business/screen-map-layer/list-type',
+ url: `/business/screen-map-layer/list-type/${query}`,
method: 'get',
- params: query,
});
}
// 站点对比分析-对比数据
diff --git a/src/assets/icons/monitor/nalaodian.png b/src/assets/icons/monitor/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/src/assets/icons/monitor/nalaodian.png
Binary files differ
diff --git a/.env.development b/.env.development
index 46f24ee..b55553d 100644
--- a/.env.development
+++ b/.env.development
@@ -13,4 +13,4 @@
#标注产品化及项目分别
#NAN_PING:南平海绵
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/.env.production b/.env.production
index 9c52b1e..1374bd4 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@
VITE_BUILD_COMPRESS = gzip
#地图插件内的地址环境判断
-VITE_APP_MAP_SRC = '/NFProduct/'
+VITE_APP_MAP_SRC = '/bigSgreen/'
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/index.html b/index.html
index 8b6d1b3..e7abcc8 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
海绵智慧管理系统
+
diff --git a/public/static/images/nalaodian.png b/public/static/images/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/public/static/images/nalaodian.png
Binary files differ
diff --git a/src/api/dataAnalysis/syntherticData.js b/src/api/dataAnalysis/syntherticData.js
index a35ec7c..c8bfcfe 100644
--- a/src/api/dataAnalysis/syntherticData.js
+++ b/src/api/dataAnalysis/syntherticData.js
@@ -183,9 +183,8 @@
// 预案方案列表
export function screenMapLayerList(query) {
return request({
- url: '/business/screen-map-layer/list-type',
+ url: `/business/screen-map-layer/list-type/${query}`,
method: 'get',
- params: query,
});
}
// 站点对比分析-对比数据
diff --git a/src/assets/icons/monitor/nalaodian.png b/src/assets/icons/monitor/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/src/assets/icons/monitor/nalaodian.png
Binary files differ
diff --git a/src/components/BackHome/index.vue b/src/components/BackHome/index.vue
index a96b066..b0064f1 100644
--- a/src/components/BackHome/index.vue
+++ b/src/components/BackHome/index.vue
@@ -1,7 +1,7 @@
diff --git a/.env.development b/.env.development
index 46f24ee..b55553d 100644
--- a/.env.development
+++ b/.env.development
@@ -13,4 +13,4 @@
#标注产品化及项目分别
#NAN_PING:南平海绵
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/.env.production b/.env.production
index 9c52b1e..1374bd4 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@
VITE_BUILD_COMPRESS = gzip
#地图插件内的地址环境判断
-VITE_APP_MAP_SRC = '/NFProduct/'
+VITE_APP_MAP_SRC = '/bigSgreen/'
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/index.html b/index.html
index 8b6d1b3..e7abcc8 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
海绵智慧管理系统
+
diff --git a/public/static/images/nalaodian.png b/public/static/images/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/public/static/images/nalaodian.png
Binary files differ
diff --git a/src/api/dataAnalysis/syntherticData.js b/src/api/dataAnalysis/syntherticData.js
index a35ec7c..c8bfcfe 100644
--- a/src/api/dataAnalysis/syntherticData.js
+++ b/src/api/dataAnalysis/syntherticData.js
@@ -183,9 +183,8 @@
// 预案方案列表
export function screenMapLayerList(query) {
return request({
- url: '/business/screen-map-layer/list-type',
+ url: `/business/screen-map-layer/list-type/${query}`,
method: 'get',
- params: query,
});
}
// 站点对比分析-对比数据
diff --git a/src/assets/icons/monitor/nalaodian.png b/src/assets/icons/monitor/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/src/assets/icons/monitor/nalaodian.png
Binary files differ
diff --git a/src/components/BackHome/index.vue b/src/components/BackHome/index.vue
index a96b066..b0064f1 100644
--- a/src/components/BackHome/index.vue
+++ b/src/components/BackHome/index.vue
@@ -1,7 +1,7 @@
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index fb64c1c..c939f6c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -90,7 +90,7 @@
if (process.env.NODE_ENV == 'development') {
router.push('/')
} else {
- location.href = 'http://192.168.1.39:8132/door';
+ location.href = 'https://server1.wh-nf.cn:8127/door';
}
next(); // 否则全部重定向到登录页
NProgress.done();
diff --git a/.env.development b/.env.development
index 46f24ee..b55553d 100644
--- a/.env.development
+++ b/.env.development
@@ -13,4 +13,4 @@
#标注产品化及项目分别
#NAN_PING:南平海绵
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/.env.production b/.env.production
index 9c52b1e..1374bd4 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@
VITE_BUILD_COMPRESS = gzip
#地图插件内的地址环境判断
-VITE_APP_MAP_SRC = '/NFProduct/'
+VITE_APP_MAP_SRC = '/bigSgreen/'
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/index.html b/index.html
index 8b6d1b3..e7abcc8 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
海绵智慧管理系统
+
diff --git a/public/static/images/nalaodian.png b/public/static/images/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/public/static/images/nalaodian.png
Binary files differ
diff --git a/src/api/dataAnalysis/syntherticData.js b/src/api/dataAnalysis/syntherticData.js
index a35ec7c..c8bfcfe 100644
--- a/src/api/dataAnalysis/syntherticData.js
+++ b/src/api/dataAnalysis/syntherticData.js
@@ -183,9 +183,8 @@
// 预案方案列表
export function screenMapLayerList(query) {
return request({
- url: '/business/screen-map-layer/list-type',
+ url: `/business/screen-map-layer/list-type/${query}`,
method: 'get',
- params: query,
});
}
// 站点对比分析-对比数据
diff --git a/src/assets/icons/monitor/nalaodian.png b/src/assets/icons/monitor/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/src/assets/icons/monitor/nalaodian.png
Binary files differ
diff --git a/src/components/BackHome/index.vue b/src/components/BackHome/index.vue
index a96b066..b0064f1 100644
--- a/src/components/BackHome/index.vue
+++ b/src/components/BackHome/index.vue
@@ -1,7 +1,7 @@
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index fb64c1c..c939f6c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -90,7 +90,7 @@
if (process.env.NODE_ENV == 'development') {
router.push('/')
} else {
- location.href = 'http://192.168.1.39:8132/door';
+ location.href = 'https://server1.wh-nf.cn:8127/door';
}
next(); // 否则全部重定向到登录页
NProgress.done();
diff --git a/src/permission.js b/src/permission.js
index 4637aeb..0f00dd2 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -23,7 +23,7 @@
if (process.env.NODE_ENV == 'development') {
router.push('/login')
} else {
- location.href = 'http://192.168.1.39:8132/door';
+ location.href = 'https://server1.wh-nf.cn:8127/door/#/';
}
next(); // 否则全部重定向到登录页
NProgress.done();
diff --git a/.env.development b/.env.development
index 46f24ee..b55553d 100644
--- a/.env.development
+++ b/.env.development
@@ -13,4 +13,4 @@
#标注产品化及项目分别
#NAN_PING:南平海绵
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/.env.production b/.env.production
index 9c52b1e..1374bd4 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@
VITE_BUILD_COMPRESS = gzip
#地图插件内的地址环境判断
-VITE_APP_MAP_SRC = '/NFProduct/'
+VITE_APP_MAP_SRC = '/bigSgreen/'
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/index.html b/index.html
index 8b6d1b3..e7abcc8 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
海绵智慧管理系统
+
diff --git a/public/static/images/nalaodian.png b/public/static/images/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/public/static/images/nalaodian.png
Binary files differ
diff --git a/src/api/dataAnalysis/syntherticData.js b/src/api/dataAnalysis/syntherticData.js
index a35ec7c..c8bfcfe 100644
--- a/src/api/dataAnalysis/syntherticData.js
+++ b/src/api/dataAnalysis/syntherticData.js
@@ -183,9 +183,8 @@
// 预案方案列表
export function screenMapLayerList(query) {
return request({
- url: '/business/screen-map-layer/list-type',
+ url: `/business/screen-map-layer/list-type/${query}`,
method: 'get',
- params: query,
});
}
// 站点对比分析-对比数据
diff --git a/src/assets/icons/monitor/nalaodian.png b/src/assets/icons/monitor/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/src/assets/icons/monitor/nalaodian.png
Binary files differ
diff --git a/src/components/BackHome/index.vue b/src/components/BackHome/index.vue
index a96b066..b0064f1 100644
--- a/src/components/BackHome/index.vue
+++ b/src/components/BackHome/index.vue
@@ -1,7 +1,7 @@
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index fb64c1c..c939f6c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -90,7 +90,7 @@
if (process.env.NODE_ENV == 'development') {
router.push('/')
} else {
- location.href = 'http://192.168.1.39:8132/door';
+ location.href = 'https://server1.wh-nf.cn:8127/door';
}
next(); // 否则全部重定向到登录页
NProgress.done();
diff --git a/src/permission.js b/src/permission.js
index 4637aeb..0f00dd2 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -23,7 +23,7 @@
if (process.env.NODE_ENV == 'development') {
router.push('/login')
} else {
- location.href = 'http://192.168.1.39:8132/door';
+ location.href = 'https://server1.wh-nf.cn:8127/door/#/';
}
next(); // 否则全部重定向到登录页
NProgress.done();
diff --git a/src/utils/gis/NewFiberMapUtils.js b/src/utils/gis/NewFiberMapUtils.js
index e5f72be..1b40ab3 100644
--- a/src/utils/gis/NewFiberMapUtils.js
+++ b/src/utils/gis/NewFiberMapUtils.js
@@ -32,6 +32,9 @@
'NAN_PING':{
center: [118.09335687862085, 27.36991075178898]
},
+ 'NAN_PING_':{
+ center: [118.09335687862085, 27.36991075178898]
+ },
'WU_HU':{
center: [118.43303301141083,31.350763350582454],
}
diff --git a/.env.development b/.env.development
index 46f24ee..b55553d 100644
--- a/.env.development
+++ b/.env.development
@@ -13,4 +13,4 @@
#标注产品化及项目分别
#NAN_PING:南平海绵
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/.env.production b/.env.production
index 9c52b1e..1374bd4 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@
VITE_BUILD_COMPRESS = gzip
#地图插件内的地址环境判断
-VITE_APP_MAP_SRC = '/NFProduct/'
+VITE_APP_MAP_SRC = '/bigSgreen/'
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/index.html b/index.html
index 8b6d1b3..e7abcc8 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
海绵智慧管理系统
+
diff --git a/public/static/images/nalaodian.png b/public/static/images/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/public/static/images/nalaodian.png
Binary files differ
diff --git a/src/api/dataAnalysis/syntherticData.js b/src/api/dataAnalysis/syntherticData.js
index a35ec7c..c8bfcfe 100644
--- a/src/api/dataAnalysis/syntherticData.js
+++ b/src/api/dataAnalysis/syntherticData.js
@@ -183,9 +183,8 @@
// 预案方案列表
export function screenMapLayerList(query) {
return request({
- url: '/business/screen-map-layer/list-type',
+ url: `/business/screen-map-layer/list-type/${query}`,
method: 'get',
- params: query,
});
}
// 站点对比分析-对比数据
diff --git a/src/assets/icons/monitor/nalaodian.png b/src/assets/icons/monitor/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/src/assets/icons/monitor/nalaodian.png
Binary files differ
diff --git a/src/components/BackHome/index.vue b/src/components/BackHome/index.vue
index a96b066..b0064f1 100644
--- a/src/components/BackHome/index.vue
+++ b/src/components/BackHome/index.vue
@@ -1,7 +1,7 @@
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index fb64c1c..c939f6c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -90,7 +90,7 @@
if (process.env.NODE_ENV == 'development') {
router.push('/')
} else {
- location.href = 'http://192.168.1.39:8132/door';
+ location.href = 'https://server1.wh-nf.cn:8127/door';
}
next(); // 否则全部重定向到登录页
NProgress.done();
diff --git a/src/permission.js b/src/permission.js
index 4637aeb..0f00dd2 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -23,7 +23,7 @@
if (process.env.NODE_ENV == 'development') {
router.push('/login')
} else {
- location.href = 'http://192.168.1.39:8132/door';
+ location.href = 'https://server1.wh-nf.cn:8127/door/#/';
}
next(); // 否则全部重定向到登录页
NProgress.done();
diff --git a/src/utils/gis/NewFiberMapUtils.js b/src/utils/gis/NewFiberMapUtils.js
index e5f72be..1b40ab3 100644
--- a/src/utils/gis/NewFiberMapUtils.js
+++ b/src/utils/gis/NewFiberMapUtils.js
@@ -32,6 +32,9 @@
'NAN_PING':{
center: [118.09335687862085, 27.36991075178898]
},
+ 'NAN_PING_':{
+ center: [118.09335687862085, 27.36991075178898]
+ },
'WU_HU':{
center: [118.43303301141083,31.350763350582454],
}
diff --git a/src/utils/request.js b/src/utils/request.js
index f405ed4..ef90ca2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -96,11 +96,11 @@
useUserStore()
.logOut()
.then(() => {
- if (process.env.NODE_ENV == 'development') {
- location.href = '/index';
- } else {
- location.href = 'http://192.168.1.39:8132/door';
- }
+ if (process.env.NODE_ENV == 'development ') {
+ location.href = '/';
+ } else {
+ location.href = 'https://server1.wh-nf.cn:8127/door';
+ }
});
})
.catch(() => {
diff --git a/.env.development b/.env.development
index 46f24ee..b55553d 100644
--- a/.env.development
+++ b/.env.development
@@ -13,4 +13,4 @@
#标注产品化及项目分别
#NAN_PING:南平海绵
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/.env.production b/.env.production
index 9c52b1e..1374bd4 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@
VITE_BUILD_COMPRESS = gzip
#地图插件内的地址环境判断
-VITE_APP_MAP_SRC = '/NFProduct/'
+VITE_APP_MAP_SRC = '/bigSgreen/'
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/index.html b/index.html
index 8b6d1b3..e7abcc8 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
海绵智慧管理系统
+
diff --git a/public/static/images/nalaodian.png b/public/static/images/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/public/static/images/nalaodian.png
Binary files differ
diff --git a/src/api/dataAnalysis/syntherticData.js b/src/api/dataAnalysis/syntherticData.js
index a35ec7c..c8bfcfe 100644
--- a/src/api/dataAnalysis/syntherticData.js
+++ b/src/api/dataAnalysis/syntherticData.js
@@ -183,9 +183,8 @@
// 预案方案列表
export function screenMapLayerList(query) {
return request({
- url: '/business/screen-map-layer/list-type',
+ url: `/business/screen-map-layer/list-type/${query}`,
method: 'get',
- params: query,
});
}
// 站点对比分析-对比数据
diff --git a/src/assets/icons/monitor/nalaodian.png b/src/assets/icons/monitor/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/src/assets/icons/monitor/nalaodian.png
Binary files differ
diff --git a/src/components/BackHome/index.vue b/src/components/BackHome/index.vue
index a96b066..b0064f1 100644
--- a/src/components/BackHome/index.vue
+++ b/src/components/BackHome/index.vue
@@ -1,7 +1,7 @@
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index fb64c1c..c939f6c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -90,7 +90,7 @@
if (process.env.NODE_ENV == 'development') {
router.push('/')
} else {
- location.href = 'http://192.168.1.39:8132/door';
+ location.href = 'https://server1.wh-nf.cn:8127/door';
}
next(); // 否则全部重定向到登录页
NProgress.done();
diff --git a/src/permission.js b/src/permission.js
index 4637aeb..0f00dd2 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -23,7 +23,7 @@
if (process.env.NODE_ENV == 'development') {
router.push('/login')
} else {
- location.href = 'http://192.168.1.39:8132/door';
+ location.href = 'https://server1.wh-nf.cn:8127/door/#/';
}
next(); // 否则全部重定向到登录页
NProgress.done();
diff --git a/src/utils/gis/NewFiberMapUtils.js b/src/utils/gis/NewFiberMapUtils.js
index e5f72be..1b40ab3 100644
--- a/src/utils/gis/NewFiberMapUtils.js
+++ b/src/utils/gis/NewFiberMapUtils.js
@@ -32,6 +32,9 @@
'NAN_PING':{
center: [118.09335687862085, 27.36991075178898]
},
+ 'NAN_PING_':{
+ center: [118.09335687862085, 27.36991075178898]
+ },
'WU_HU':{
center: [118.43303301141083,31.350763350582454],
}
diff --git a/src/utils/request.js b/src/utils/request.js
index f405ed4..ef90ca2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -96,11 +96,11 @@
useUserStore()
.logOut()
.then(() => {
- if (process.env.NODE_ENV == 'development') {
- location.href = '/index';
- } else {
- location.href = 'http://192.168.1.39:8132/door';
- }
+ if (process.env.NODE_ENV == 'development ') {
+ location.href = '/';
+ } else {
+ location.href = 'https://server1.wh-nf.cn:8127/door';
+ }
});
})
.catch(() => {
diff --git a/src/views/Sponge_screen/Map.vue b/src/views/Sponge_screen/Map.vue
index 9ddab92..7420f22 100644
--- a/src/views/Sponge_screen/Map.vue
+++ b/src/views/Sponge_screen/Map.vue
@@ -56,7 +56,7 @@
? "/static/images/降雨.png"
: i.siteType == "RtuSite-WaterLevel"
? "/static/images/水位监测点.png"
- : undefined
+ : "/static/images/nalaodian.png"
);
if (!!i.geometry) obj[i.siteType].push(i);
});
diff --git a/.env.development b/.env.development
index 46f24ee..b55553d 100644
--- a/.env.development
+++ b/.env.development
@@ -13,4 +13,4 @@
#标注产品化及项目分别
#NAN_PING:南平海绵
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/.env.production b/.env.production
index 9c52b1e..1374bd4 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@
VITE_BUILD_COMPRESS = gzip
#地图插件内的地址环境判断
-VITE_APP_MAP_SRC = '/NFProduct/'
+VITE_APP_MAP_SRC = '/bigSgreen/'
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/index.html b/index.html
index 8b6d1b3..e7abcc8 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
海绵智慧管理系统
+
diff --git a/public/static/images/nalaodian.png b/public/static/images/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/public/static/images/nalaodian.png
Binary files differ
diff --git a/src/api/dataAnalysis/syntherticData.js b/src/api/dataAnalysis/syntherticData.js
index a35ec7c..c8bfcfe 100644
--- a/src/api/dataAnalysis/syntherticData.js
+++ b/src/api/dataAnalysis/syntherticData.js
@@ -183,9 +183,8 @@
// 预案方案列表
export function screenMapLayerList(query) {
return request({
- url: '/business/screen-map-layer/list-type',
+ url: `/business/screen-map-layer/list-type/${query}`,
method: 'get',
- params: query,
});
}
// 站点对比分析-对比数据
diff --git a/src/assets/icons/monitor/nalaodian.png b/src/assets/icons/monitor/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/src/assets/icons/monitor/nalaodian.png
Binary files differ
diff --git a/src/components/BackHome/index.vue b/src/components/BackHome/index.vue
index a96b066..b0064f1 100644
--- a/src/components/BackHome/index.vue
+++ b/src/components/BackHome/index.vue
@@ -1,7 +1,7 @@
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index fb64c1c..c939f6c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -90,7 +90,7 @@
if (process.env.NODE_ENV == 'development') {
router.push('/')
} else {
- location.href = 'http://192.168.1.39:8132/door';
+ location.href = 'https://server1.wh-nf.cn:8127/door';
}
next(); // 否则全部重定向到登录页
NProgress.done();
diff --git a/src/permission.js b/src/permission.js
index 4637aeb..0f00dd2 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -23,7 +23,7 @@
if (process.env.NODE_ENV == 'development') {
router.push('/login')
} else {
- location.href = 'http://192.168.1.39:8132/door';
+ location.href = 'https://server1.wh-nf.cn:8127/door/#/';
}
next(); // 否则全部重定向到登录页
NProgress.done();
diff --git a/src/utils/gis/NewFiberMapUtils.js b/src/utils/gis/NewFiberMapUtils.js
index e5f72be..1b40ab3 100644
--- a/src/utils/gis/NewFiberMapUtils.js
+++ b/src/utils/gis/NewFiberMapUtils.js
@@ -32,6 +32,9 @@
'NAN_PING':{
center: [118.09335687862085, 27.36991075178898]
},
+ 'NAN_PING_':{
+ center: [118.09335687862085, 27.36991075178898]
+ },
'WU_HU':{
center: [118.43303301141083,31.350763350582454],
}
diff --git a/src/utils/request.js b/src/utils/request.js
index f405ed4..ef90ca2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -96,11 +96,11 @@
useUserStore()
.logOut()
.then(() => {
- if (process.env.NODE_ENV == 'development') {
- location.href = '/index';
- } else {
- location.href = 'http://192.168.1.39:8132/door';
- }
+ if (process.env.NODE_ENV == 'development ') {
+ location.href = '/';
+ } else {
+ location.href = 'https://server1.wh-nf.cn:8127/door';
+ }
});
})
.catch(() => {
diff --git a/src/views/Sponge_screen/Map.vue b/src/views/Sponge_screen/Map.vue
index 9ddab92..7420f22 100644
--- a/src/views/Sponge_screen/Map.vue
+++ b/src/views/Sponge_screen/Map.vue
@@ -56,7 +56,7 @@
? "/static/images/降雨.png"
: i.siteType == "RtuSite-WaterLevel"
? "/static/images/水位监测点.png"
- : undefined
+ : "/static/images/nalaodian.png"
);
if (!!i.geometry) obj[i.siteType].push(i);
});
diff --git a/src/views/Sponge_screen/TuLi/index.vue b/src/views/Sponge_screen/TuLi/index.vue
index 92e40fe..c5e587a 100644
--- a/src/views/Sponge_screen/TuLi/index.vue
+++ b/src/views/Sponge_screen/TuLi/index.vue
@@ -2,12 +2,12 @@
-
- {{ item.layerName }}
+
+ {{ item?.children[0].layerName }}
@@ -22,8 +22,9 @@
});
// 获取图例数据
const getTuLiData = () => {
- screenMapLayerList().then((res) => {
+ screenMapLayerList('Project').then((res) => {
if (res.code == 200) {
+ console.log(res.data,'res.datares.data');
AllData.TuLiData = res.data;
// 建立关系数组
// let ArrayGX = [
diff --git a/.env.development b/.env.development
index 46f24ee..b55553d 100644
--- a/.env.development
+++ b/.env.development
@@ -13,4 +13,4 @@
#标注产品化及项目分别
#NAN_PING:南平海绵
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/.env.production b/.env.production
index 9c52b1e..1374bd4 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@
VITE_BUILD_COMPRESS = gzip
#地图插件内的地址环境判断
-VITE_APP_MAP_SRC = '/NFProduct/'
+VITE_APP_MAP_SRC = '/bigSgreen/'
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/index.html b/index.html
index 8b6d1b3..e7abcc8 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
海绵智慧管理系统
+
diff --git a/public/static/images/nalaodian.png b/public/static/images/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/public/static/images/nalaodian.png
Binary files differ
diff --git a/src/api/dataAnalysis/syntherticData.js b/src/api/dataAnalysis/syntherticData.js
index a35ec7c..c8bfcfe 100644
--- a/src/api/dataAnalysis/syntherticData.js
+++ b/src/api/dataAnalysis/syntherticData.js
@@ -183,9 +183,8 @@
// 预案方案列表
export function screenMapLayerList(query) {
return request({
- url: '/business/screen-map-layer/list-type',
+ url: `/business/screen-map-layer/list-type/${query}`,
method: 'get',
- params: query,
});
}
// 站点对比分析-对比数据
diff --git a/src/assets/icons/monitor/nalaodian.png b/src/assets/icons/monitor/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/src/assets/icons/monitor/nalaodian.png
Binary files differ
diff --git a/src/components/BackHome/index.vue b/src/components/BackHome/index.vue
index a96b066..b0064f1 100644
--- a/src/components/BackHome/index.vue
+++ b/src/components/BackHome/index.vue
@@ -1,7 +1,7 @@
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index fb64c1c..c939f6c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -90,7 +90,7 @@
if (process.env.NODE_ENV == 'development') {
router.push('/')
} else {
- location.href = 'http://192.168.1.39:8132/door';
+ location.href = 'https://server1.wh-nf.cn:8127/door';
}
next(); // 否则全部重定向到登录页
NProgress.done();
diff --git a/src/permission.js b/src/permission.js
index 4637aeb..0f00dd2 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -23,7 +23,7 @@
if (process.env.NODE_ENV == 'development') {
router.push('/login')
} else {
- location.href = 'http://192.168.1.39:8132/door';
+ location.href = 'https://server1.wh-nf.cn:8127/door/#/';
}
next(); // 否则全部重定向到登录页
NProgress.done();
diff --git a/src/utils/gis/NewFiberMapUtils.js b/src/utils/gis/NewFiberMapUtils.js
index e5f72be..1b40ab3 100644
--- a/src/utils/gis/NewFiberMapUtils.js
+++ b/src/utils/gis/NewFiberMapUtils.js
@@ -32,6 +32,9 @@
'NAN_PING':{
center: [118.09335687862085, 27.36991075178898]
},
+ 'NAN_PING_':{
+ center: [118.09335687862085, 27.36991075178898]
+ },
'WU_HU':{
center: [118.43303301141083,31.350763350582454],
}
diff --git a/src/utils/request.js b/src/utils/request.js
index f405ed4..ef90ca2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -96,11 +96,11 @@
useUserStore()
.logOut()
.then(() => {
- if (process.env.NODE_ENV == 'development') {
- location.href = '/index';
- } else {
- location.href = 'http://192.168.1.39:8132/door';
- }
+ if (process.env.NODE_ENV == 'development ') {
+ location.href = '/';
+ } else {
+ location.href = 'https://server1.wh-nf.cn:8127/door';
+ }
});
})
.catch(() => {
diff --git a/src/views/Sponge_screen/Map.vue b/src/views/Sponge_screen/Map.vue
index 9ddab92..7420f22 100644
--- a/src/views/Sponge_screen/Map.vue
+++ b/src/views/Sponge_screen/Map.vue
@@ -56,7 +56,7 @@
? "/static/images/降雨.png"
: i.siteType == "RtuSite-WaterLevel"
? "/static/images/水位监测点.png"
- : undefined
+ : "/static/images/nalaodian.png"
);
if (!!i.geometry) obj[i.siteType].push(i);
});
diff --git a/src/views/Sponge_screen/TuLi/index.vue b/src/views/Sponge_screen/TuLi/index.vue
index 92e40fe..c5e587a 100644
--- a/src/views/Sponge_screen/TuLi/index.vue
+++ b/src/views/Sponge_screen/TuLi/index.vue
@@ -2,12 +2,12 @@
-
- {{ item.layerName }}
+
+ {{ item?.children[0].layerName }}
@@ -22,8 +22,9 @@
});
// 获取图例数据
const getTuLiData = () => {
- screenMapLayerList().then((res) => {
+ screenMapLayerList('Project').then((res) => {
if (res.code == 200) {
+ console.log(res.data,'res.datares.data');
AllData.TuLiData = res.data;
// 建立关系数组
// let ArrayGX = [
diff --git a/src/views/Sponge_screen/components/equipLeft.vue b/src/views/Sponge_screen/components/equipLeft.vue
index d8ebc52..aa3eca0 100644
--- a/src/views/Sponge_screen/components/equipLeft.vue
+++ b/src/views/Sponge_screen/components/equipLeft.vue
@@ -196,7 +196,7 @@
}
// 获取状态统计
function getStatusType() {
- rtuSiteTypeStatusCount({ siteType: props.monitorTargetType }).then((res) => {
+ rtuSiteTypeStatusCount({ monitorTargetType: props.monitorTargetType }).then((res) => {
statusData.value = res.data;
});
}
diff --git a/.env.development b/.env.development
index 46f24ee..b55553d 100644
--- a/.env.development
+++ b/.env.development
@@ -13,4 +13,4 @@
#标注产品化及项目分别
#NAN_PING:南平海绵
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/.env.production b/.env.production
index 9c52b1e..1374bd4 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@
VITE_BUILD_COMPRESS = gzip
#地图插件内的地址环境判断
-VITE_APP_MAP_SRC = '/NFProduct/'
+VITE_APP_MAP_SRC = '/bigSgreen/'
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/index.html b/index.html
index 8b6d1b3..e7abcc8 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
海绵智慧管理系统
+
diff --git a/public/static/images/nalaodian.png b/public/static/images/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/public/static/images/nalaodian.png
Binary files differ
diff --git a/src/api/dataAnalysis/syntherticData.js b/src/api/dataAnalysis/syntherticData.js
index a35ec7c..c8bfcfe 100644
--- a/src/api/dataAnalysis/syntherticData.js
+++ b/src/api/dataAnalysis/syntherticData.js
@@ -183,9 +183,8 @@
// 预案方案列表
export function screenMapLayerList(query) {
return request({
- url: '/business/screen-map-layer/list-type',
+ url: `/business/screen-map-layer/list-type/${query}`,
method: 'get',
- params: query,
});
}
// 站点对比分析-对比数据
diff --git a/src/assets/icons/monitor/nalaodian.png b/src/assets/icons/monitor/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/src/assets/icons/monitor/nalaodian.png
Binary files differ
diff --git a/src/components/BackHome/index.vue b/src/components/BackHome/index.vue
index a96b066..b0064f1 100644
--- a/src/components/BackHome/index.vue
+++ b/src/components/BackHome/index.vue
@@ -1,7 +1,7 @@
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index fb64c1c..c939f6c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -90,7 +90,7 @@
if (process.env.NODE_ENV == 'development') {
router.push('/')
} else {
- location.href = 'http://192.168.1.39:8132/door';
+ location.href = 'https://server1.wh-nf.cn:8127/door';
}
next(); // 否则全部重定向到登录页
NProgress.done();
diff --git a/src/permission.js b/src/permission.js
index 4637aeb..0f00dd2 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -23,7 +23,7 @@
if (process.env.NODE_ENV == 'development') {
router.push('/login')
} else {
- location.href = 'http://192.168.1.39:8132/door';
+ location.href = 'https://server1.wh-nf.cn:8127/door/#/';
}
next(); // 否则全部重定向到登录页
NProgress.done();
diff --git a/src/utils/gis/NewFiberMapUtils.js b/src/utils/gis/NewFiberMapUtils.js
index e5f72be..1b40ab3 100644
--- a/src/utils/gis/NewFiberMapUtils.js
+++ b/src/utils/gis/NewFiberMapUtils.js
@@ -32,6 +32,9 @@
'NAN_PING':{
center: [118.09335687862085, 27.36991075178898]
},
+ 'NAN_PING_':{
+ center: [118.09335687862085, 27.36991075178898]
+ },
'WU_HU':{
center: [118.43303301141083,31.350763350582454],
}
diff --git a/src/utils/request.js b/src/utils/request.js
index f405ed4..ef90ca2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -96,11 +96,11 @@
useUserStore()
.logOut()
.then(() => {
- if (process.env.NODE_ENV == 'development') {
- location.href = '/index';
- } else {
- location.href = 'http://192.168.1.39:8132/door';
- }
+ if (process.env.NODE_ENV == 'development ') {
+ location.href = '/';
+ } else {
+ location.href = 'https://server1.wh-nf.cn:8127/door';
+ }
});
})
.catch(() => {
diff --git a/src/views/Sponge_screen/Map.vue b/src/views/Sponge_screen/Map.vue
index 9ddab92..7420f22 100644
--- a/src/views/Sponge_screen/Map.vue
+++ b/src/views/Sponge_screen/Map.vue
@@ -56,7 +56,7 @@
? "/static/images/降雨.png"
: i.siteType == "RtuSite-WaterLevel"
? "/static/images/水位监测点.png"
- : undefined
+ : "/static/images/nalaodian.png"
);
if (!!i.geometry) obj[i.siteType].push(i);
});
diff --git a/src/views/Sponge_screen/TuLi/index.vue b/src/views/Sponge_screen/TuLi/index.vue
index 92e40fe..c5e587a 100644
--- a/src/views/Sponge_screen/TuLi/index.vue
+++ b/src/views/Sponge_screen/TuLi/index.vue
@@ -2,12 +2,12 @@
-
- {{ item.layerName }}
+
+ {{ item?.children[0].layerName }}
@@ -22,8 +22,9 @@
});
// 获取图例数据
const getTuLiData = () => {
- screenMapLayerList().then((res) => {
+ screenMapLayerList('Project').then((res) => {
if (res.code == 200) {
+ console.log(res.data,'res.datares.data');
AllData.TuLiData = res.data;
// 建立关系数组
// let ArrayGX = [
diff --git a/src/views/Sponge_screen/components/equipLeft.vue b/src/views/Sponge_screen/components/equipLeft.vue
index d8ebc52..aa3eca0 100644
--- a/src/views/Sponge_screen/components/equipLeft.vue
+++ b/src/views/Sponge_screen/components/equipLeft.vue
@@ -196,7 +196,7 @@
}
// 获取状态统计
function getStatusType() {
- rtuSiteTypeStatusCount({ siteType: props.monitorTargetType }).then((res) => {
+ rtuSiteTypeStatusCount({ monitorTargetType: props.monitorTargetType }).then((res) => {
statusData.value = res.data;
});
}
diff --git a/src/views/Sponge_screen/components/jianCePingJia.vue b/src/views/Sponge_screen/components/jianCePingJia.vue
index d4b7f0b..60a0cb9 100644
--- a/src/views/Sponge_screen/components/jianCePingJia.vue
+++ b/src/views/Sponge_screen/components/jianCePingJia.vue
@@ -8,10 +8,9 @@
>
-
{{ item.name }}
-
- {{ item.value }}
-
+
{{ item.name }} {{ item.name!='全部' ? item.value.split(',')[0]+')' :item.value }}
+
@@ -144,8 +143,9 @@
imgUrl: 'lake_icon.png',
key: 'lake',
},
- { name: '海绵设施', value: '', imgUrl: 'gqjc_icon.png', key: 'pipeline' },
- { name: '片区雨量', value: '', imgUrl: 'line_icon.png', key: 'channel' },
+ { name: '海绵设施', value: '', imgUrl: 'gqjc_icon.png', key: 'channel' },
+ { name: '片区雨量', value: '', imgUrl: 'line_icon.png', key: 'pipeline' },
+ { name: '内涝点', value: '', imgUrl: 'nalaodian.png', key: 'waterlogging' },
// { name: '管网', value: '', imgUrl: 'line_icon.png', key: 'pipeline' },
// { name: '典型地块', value: '', imgUrl: 'land_icon.png', key: 'typicalLand' },
]);
@@ -162,6 +162,7 @@
const dialogShow = ref(false);
// 方法
function changeHeadData(warnType) {
+ // debugger
checkedKey.value = warnType;
}
// 获取不同监测类型对应数量
@@ -174,7 +175,7 @@
headArr[2].value = datas.lake; //湖泊监测
headArr[3].value = datas.channel; //港渠监测
headArr[4].value = datas.pipeline; //管网
- headArr[5].value = datas.typical_land; //典型地块
+ headArr[5].value = datas.waterlogging; //典型地块
changeHeadData(""); //默认显示全部
}
};
diff --git a/.env.development b/.env.development
index 46f24ee..b55553d 100644
--- a/.env.development
+++ b/.env.development
@@ -13,4 +13,4 @@
#标注产品化及项目分别
#NAN_PING:南平海绵
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/.env.production b/.env.production
index 9c52b1e..1374bd4 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@
VITE_BUILD_COMPRESS = gzip
#地图插件内的地址环境判断
-VITE_APP_MAP_SRC = '/NFProduct/'
+VITE_APP_MAP_SRC = '/bigSgreen/'
#WU_HU:WU_HU海绵
-VITE_PROJECT_NAME = 'WU_HU'
+VITE_PROJECT_NAME = 'NAN_PING_'
diff --git a/index.html b/index.html
index 8b6d1b3..e7abcc8 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
海绵智慧管理系统
+
diff --git a/public/static/images/nalaodian.png b/public/static/images/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/public/static/images/nalaodian.png
Binary files differ
diff --git a/src/api/dataAnalysis/syntherticData.js b/src/api/dataAnalysis/syntherticData.js
index a35ec7c..c8bfcfe 100644
--- a/src/api/dataAnalysis/syntherticData.js
+++ b/src/api/dataAnalysis/syntherticData.js
@@ -183,9 +183,8 @@
// 预案方案列表
export function screenMapLayerList(query) {
return request({
- url: '/business/screen-map-layer/list-type',
+ url: `/business/screen-map-layer/list-type/${query}`,
method: 'get',
- params: query,
});
}
// 站点对比分析-对比数据
diff --git a/src/assets/icons/monitor/nalaodian.png b/src/assets/icons/monitor/nalaodian.png
new file mode 100644
index 0000000..bd8d2e4
--- /dev/null
+++ b/src/assets/icons/monitor/nalaodian.png
Binary files differ
diff --git a/src/components/BackHome/index.vue b/src/components/BackHome/index.vue
index a96b066..b0064f1 100644
--- a/src/components/BackHome/index.vue
+++ b/src/components/BackHome/index.vue
@@ -1,7 +1,7 @@
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index fb64c1c..c939f6c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -90,7 +90,7 @@
if (process.env.NODE_ENV == 'development') {
router.push('/')
} else {
- location.href = 'http://192.168.1.39:8132/door';
+ location.href = 'https://server1.wh-nf.cn:8127/door';
}
next(); // 否则全部重定向到登录页
NProgress.done();
diff --git a/src/permission.js b/src/permission.js
index 4637aeb..0f00dd2 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -23,7 +23,7 @@
if (process.env.NODE_ENV == 'development') {
router.push('/login')
} else {
- location.href = 'http://192.168.1.39:8132/door';
+ location.href = 'https://server1.wh-nf.cn:8127/door/#/';
}
next(); // 否则全部重定向到登录页
NProgress.done();
diff --git a/src/utils/gis/NewFiberMapUtils.js b/src/utils/gis/NewFiberMapUtils.js
index e5f72be..1b40ab3 100644
--- a/src/utils/gis/NewFiberMapUtils.js
+++ b/src/utils/gis/NewFiberMapUtils.js
@@ -32,6 +32,9 @@
'NAN_PING':{
center: [118.09335687862085, 27.36991075178898]
},
+ 'NAN_PING_':{
+ center: [118.09335687862085, 27.36991075178898]
+ },
'WU_HU':{
center: [118.43303301141083,31.350763350582454],
}
diff --git a/src/utils/request.js b/src/utils/request.js
index f405ed4..ef90ca2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -96,11 +96,11 @@
useUserStore()
.logOut()
.then(() => {
- if (process.env.NODE_ENV == 'development') {
- location.href = '/index';
- } else {
- location.href = 'http://192.168.1.39:8132/door';
- }
+ if (process.env.NODE_ENV == 'development ') {
+ location.href = '/';
+ } else {
+ location.href = 'https://server1.wh-nf.cn:8127/door';
+ }
});
})
.catch(() => {
diff --git a/src/views/Sponge_screen/Map.vue b/src/views/Sponge_screen/Map.vue
index 9ddab92..7420f22 100644
--- a/src/views/Sponge_screen/Map.vue
+++ b/src/views/Sponge_screen/Map.vue
@@ -56,7 +56,7 @@
? "/static/images/降雨.png"
: i.siteType == "RtuSite-WaterLevel"
? "/static/images/水位监测点.png"
- : undefined
+ : "/static/images/nalaodian.png"
);
if (!!i.geometry) obj[i.siteType].push(i);
});
diff --git a/src/views/Sponge_screen/TuLi/index.vue b/src/views/Sponge_screen/TuLi/index.vue
index 92e40fe..c5e587a 100644
--- a/src/views/Sponge_screen/TuLi/index.vue
+++ b/src/views/Sponge_screen/TuLi/index.vue
@@ -2,12 +2,12 @@
-
- {{ item.layerName }}
+
+ {{ item?.children[0].layerName }}
@@ -22,8 +22,9 @@
});
// 获取图例数据
const getTuLiData = () => {
- screenMapLayerList().then((res) => {
+ screenMapLayerList('Project').then((res) => {
if (res.code == 200) {
+ console.log(res.data,'res.datares.data');
AllData.TuLiData = res.data;
// 建立关系数组
// let ArrayGX = [
diff --git a/src/views/Sponge_screen/components/equipLeft.vue b/src/views/Sponge_screen/components/equipLeft.vue
index d8ebc52..aa3eca0 100644
--- a/src/views/Sponge_screen/components/equipLeft.vue
+++ b/src/views/Sponge_screen/components/equipLeft.vue
@@ -196,7 +196,7 @@
}
// 获取状态统计
function getStatusType() {
- rtuSiteTypeStatusCount({ siteType: props.monitorTargetType }).then((res) => {
+ rtuSiteTypeStatusCount({ monitorTargetType: props.monitorTargetType }).then((res) => {
statusData.value = res.data;
});
}
diff --git a/src/views/Sponge_screen/components/jianCePingJia.vue b/src/views/Sponge_screen/components/jianCePingJia.vue
index d4b7f0b..60a0cb9 100644
--- a/src/views/Sponge_screen/components/jianCePingJia.vue
+++ b/src/views/Sponge_screen/components/jianCePingJia.vue
@@ -8,10 +8,9 @@
>
-
{{ item.name }}
-
- {{ item.value }}
-
+
{{ item.name }} {{ item.name!='全部' ? item.value.split(',')[0]+')' :item.value }}
+
@@ -144,8 +143,9 @@
imgUrl: 'lake_icon.png',
key: 'lake',
},
- { name: '海绵设施', value: '', imgUrl: 'gqjc_icon.png', key: 'pipeline' },
- { name: '片区雨量', value: '', imgUrl: 'line_icon.png', key: 'channel' },
+ { name: '海绵设施', value: '', imgUrl: 'gqjc_icon.png', key: 'channel' },
+ { name: '片区雨量', value: '', imgUrl: 'line_icon.png', key: 'pipeline' },
+ { name: '内涝点', value: '', imgUrl: 'nalaodian.png', key: 'waterlogging' },
// { name: '管网', value: '', imgUrl: 'line_icon.png', key: 'pipeline' },
// { name: '典型地块', value: '', imgUrl: 'land_icon.png', key: 'typicalLand' },
]);
@@ -162,6 +162,7 @@
const dialogShow = ref(false);
// 方法
function changeHeadData(warnType) {
+ // debugger
checkedKey.value = warnType;
}
// 获取不同监测类型对应数量
@@ -174,7 +175,7 @@
headArr[2].value = datas.lake; //湖泊监测
headArr[3].value = datas.channel; //港渠监测
headArr[4].value = datas.pipeline; //管网
- headArr[5].value = datas.typical_land; //典型地块
+ headArr[5].value = datas.waterlogging; //典型地块
changeHeadData(""); //默认显示全部
}
};
diff --git a/src/views/login.vue b/src/views/login.vue
index 2e029a3..3759ceb 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -73,9 +73,9 @@
-