diff --git a/config/index.js b/config/index.js
index 358b560..ab8f4e5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -19,7 +19,7 @@
}
},
// Various Dev Server settings
- // host: '0.0.0.0', // can be overwritten by process.env.HOST
+ host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
diff --git a/config/index.js b/config/index.js
index 358b560..ab8f4e5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -19,7 +19,7 @@
}
},
// Various Dev Server settings
- // host: '0.0.0.0', // can be overwritten by process.env.HOST
+ host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
diff --git a/index.html b/index.html
index 82a7058..bd3a89f 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
+
管理者驾驶舱
diff --git a/config/index.js b/config/index.js
index 358b560..ab8f4e5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -19,7 +19,7 @@
}
},
// Various Dev Server settings
- // host: '0.0.0.0', // can be overwritten by process.env.HOST
+ host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
diff --git a/index.html b/index.html
index 82a7058..bd3a89f 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
+
管理者驾驶舱
diff --git a/src/api/hca.js b/src/api/hca.js
index 3ff004a..9439c1c 100644
--- a/src/api/hca.js
+++ b/src/api/hca.js
@@ -8,7 +8,7 @@
export function getHighConsequence() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01',
diff --git a/config/index.js b/config/index.js
index 358b560..ab8f4e5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -19,7 +19,7 @@
}
},
// Various Dev Server settings
- // host: '0.0.0.0', // can be overwritten by process.env.HOST
+ host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
diff --git a/index.html b/index.html
index 82a7058..bd3a89f 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
+
管理者驾驶舱
diff --git a/src/api/hca.js b/src/api/hca.js
index 3ff004a..9439c1c 100644
--- a/src/api/hca.js
+++ b/src/api/hca.js
@@ -8,7 +8,7 @@
export function getHighConsequence() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01',
diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index cca1e27..9770a42 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -15,7 +15,7 @@
export function getAreaSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
@@ -71,7 +71,7 @@
export function getUserSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
diff --git a/config/index.js b/config/index.js
index 358b560..ab8f4e5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -19,7 +19,7 @@
}
},
// Various Dev Server settings
- // host: '0.0.0.0', // can be overwritten by process.env.HOST
+ host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
diff --git a/index.html b/index.html
index 82a7058..bd3a89f 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
+
管理者驾驶舱
diff --git a/src/api/hca.js b/src/api/hca.js
index 3ff004a..9439c1c 100644
--- a/src/api/hca.js
+++ b/src/api/hca.js
@@ -8,7 +8,7 @@
export function getHighConsequence() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01',
diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index cca1e27..9770a42 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -15,7 +15,7 @@
export function getAreaSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
@@ -71,7 +71,7 @@
export function getUserSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
diff --git a/src/api/pipe.js b/src/api/pipe.js
index 5d0b3d2..a5662f8 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -7,7 +7,7 @@
export function getEarthquakeList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD53_09,WD53_05,WD53_06,WD53_07,WD53_08,WD53_04',
@@ -35,7 +35,7 @@
export function getRoutesData(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
diff --git a/config/index.js b/config/index.js
index 358b560..ab8f4e5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -19,7 +19,7 @@
}
},
// Various Dev Server settings
- // host: '0.0.0.0', // can be overwritten by process.env.HOST
+ host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
diff --git a/index.html b/index.html
index 82a7058..bd3a89f 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
+
管理者驾驶舱
diff --git a/src/api/hca.js b/src/api/hca.js
index 3ff004a..9439c1c 100644
--- a/src/api/hca.js
+++ b/src/api/hca.js
@@ -8,7 +8,7 @@
export function getHighConsequence() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01',
diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index cca1e27..9770a42 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -15,7 +15,7 @@
export function getAreaSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
@@ -71,7 +71,7 @@
export function getUserSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
diff --git a/src/api/pipe.js b/src/api/pipe.js
index 5d0b3d2..a5662f8 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -7,7 +7,7 @@
export function getEarthquakeList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD53_09,WD53_05,WD53_06,WD53_07,WD53_08,WD53_04',
@@ -35,7 +35,7 @@
export function getRoutesData(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
diff --git a/src/api/threat.js b/src/api/threat.js
index bebd145..51a6f27 100644
--- a/src/api/threat.js
+++ b/src/api/threat.js
@@ -8,7 +8,7 @@
export function getWaterThreat() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
diff --git a/config/index.js b/config/index.js
index 358b560..ab8f4e5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -19,7 +19,7 @@
}
},
// Various Dev Server settings
- // host: '0.0.0.0', // can be overwritten by process.env.HOST
+ host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
diff --git a/index.html b/index.html
index 82a7058..bd3a89f 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
+
管理者驾驶舱
diff --git a/src/api/hca.js b/src/api/hca.js
index 3ff004a..9439c1c 100644
--- a/src/api/hca.js
+++ b/src/api/hca.js
@@ -8,7 +8,7 @@
export function getHighConsequence() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01',
diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index cca1e27..9770a42 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -15,7 +15,7 @@
export function getAreaSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
@@ -71,7 +71,7 @@
export function getUserSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
diff --git a/src/api/pipe.js b/src/api/pipe.js
index 5d0b3d2..a5662f8 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -7,7 +7,7 @@
export function getEarthquakeList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD53_09,WD53_05,WD53_06,WD53_07,WD53_08,WD53_04',
@@ -35,7 +35,7 @@
export function getRoutesData(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
diff --git a/src/api/threat.js b/src/api/threat.js
index bebd145..51a6f27 100644
--- a/src/api/threat.js
+++ b/src/api/threat.js
@@ -8,7 +8,7 @@
export function getWaterThreat() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
diff --git a/src/api/weather.js b/src/api/weather.js
index 0beebbb..9f84011 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -7,7 +7,7 @@
export function getWeatherList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD51_20,WD51_21,WD51_22,WD51_08,WD51_10,WD51_12,WD51_14,WD51_15',
@@ -41,7 +41,7 @@
export function getDisasterList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD52_03,WD52_05,WD52_06,WD52_07,WD52_08,WD52_09,WD52_10,WD52_12,WD52_13',
diff --git a/config/index.js b/config/index.js
index 358b560..ab8f4e5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -19,7 +19,7 @@
}
},
// Various Dev Server settings
- // host: '0.0.0.0', // can be overwritten by process.env.HOST
+ host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
diff --git a/index.html b/index.html
index 82a7058..bd3a89f 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
+
管理者驾驶舱
diff --git a/src/api/hca.js b/src/api/hca.js
index 3ff004a..9439c1c 100644
--- a/src/api/hca.js
+++ b/src/api/hca.js
@@ -8,7 +8,7 @@
export function getHighConsequence() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01',
diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index cca1e27..9770a42 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -15,7 +15,7 @@
export function getAreaSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
@@ -71,7 +71,7 @@
export function getUserSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
diff --git a/src/api/pipe.js b/src/api/pipe.js
index 5d0b3d2..a5662f8 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -7,7 +7,7 @@
export function getEarthquakeList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD53_09,WD53_05,WD53_06,WD53_07,WD53_08,WD53_04',
@@ -35,7 +35,7 @@
export function getRoutesData(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
diff --git a/src/api/threat.js b/src/api/threat.js
index bebd145..51a6f27 100644
--- a/src/api/threat.js
+++ b/src/api/threat.js
@@ -8,7 +8,7 @@
export function getWaterThreat() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
diff --git a/src/api/weather.js b/src/api/weather.js
index 0beebbb..9f84011 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -7,7 +7,7 @@
export function getWeatherList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD51_20,WD51_21,WD51_22,WD51_08,WD51_10,WD51_12,WD51_14,WD51_15',
@@ -41,7 +41,7 @@
export function getDisasterList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD52_03,WD52_05,WD52_06,WD52_07,WD52_08,WD52_09,WD52_10,WD52_12,WD52_13',
diff --git a/src/assets/login_images/app-login-back.png b/src/assets/login_images/app-login-back.png
new file mode 100644
index 0000000..6a4f010
--- /dev/null
+++ b/src/assets/login_images/app-login-back.png
Binary files differ
diff --git a/config/index.js b/config/index.js
index 358b560..ab8f4e5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -19,7 +19,7 @@
}
},
// Various Dev Server settings
- // host: '0.0.0.0', // can be overwritten by process.env.HOST
+ host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
diff --git a/index.html b/index.html
index 82a7058..bd3a89f 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
+
管理者驾驶舱
diff --git a/src/api/hca.js b/src/api/hca.js
index 3ff004a..9439c1c 100644
--- a/src/api/hca.js
+++ b/src/api/hca.js
@@ -8,7 +8,7 @@
export function getHighConsequence() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01',
diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index cca1e27..9770a42 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -15,7 +15,7 @@
export function getAreaSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
@@ -71,7 +71,7 @@
export function getUserSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
diff --git a/src/api/pipe.js b/src/api/pipe.js
index 5d0b3d2..a5662f8 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -7,7 +7,7 @@
export function getEarthquakeList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD53_09,WD53_05,WD53_06,WD53_07,WD53_08,WD53_04',
@@ -35,7 +35,7 @@
export function getRoutesData(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
diff --git a/src/api/threat.js b/src/api/threat.js
index bebd145..51a6f27 100644
--- a/src/api/threat.js
+++ b/src/api/threat.js
@@ -8,7 +8,7 @@
export function getWaterThreat() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
diff --git a/src/api/weather.js b/src/api/weather.js
index 0beebbb..9f84011 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -7,7 +7,7 @@
export function getWeatherList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD51_20,WD51_21,WD51_22,WD51_08,WD51_10,WD51_12,WD51_14,WD51_15',
@@ -41,7 +41,7 @@
export function getDisasterList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD52_03,WD52_05,WD52_06,WD52_07,WD52_08,WD52_09,WD52_10,WD52_12,WD52_13',
diff --git a/src/assets/login_images/app-login-back.png b/src/assets/login_images/app-login-back.png
new file mode 100644
index 0000000..6a4f010
--- /dev/null
+++ b/src/assets/login_images/app-login-back.png
Binary files differ
diff --git a/src/assets/login_images/logo-simple.png b/src/assets/login_images/logo-simple.png
new file mode 100644
index 0000000..63ab65b
--- /dev/null
+++ b/src/assets/login_images/logo-simple.png
Binary files differ
diff --git a/config/index.js b/config/index.js
index 358b560..ab8f4e5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -19,7 +19,7 @@
}
},
// Various Dev Server settings
- // host: '0.0.0.0', // can be overwritten by process.env.HOST
+ host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
diff --git a/index.html b/index.html
index 82a7058..bd3a89f 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
+
管理者驾驶舱
diff --git a/src/api/hca.js b/src/api/hca.js
index 3ff004a..9439c1c 100644
--- a/src/api/hca.js
+++ b/src/api/hca.js
@@ -8,7 +8,7 @@
export function getHighConsequence() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01',
diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index cca1e27..9770a42 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -15,7 +15,7 @@
export function getAreaSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
@@ -71,7 +71,7 @@
export function getUserSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
diff --git a/src/api/pipe.js b/src/api/pipe.js
index 5d0b3d2..a5662f8 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -7,7 +7,7 @@
export function getEarthquakeList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD53_09,WD53_05,WD53_06,WD53_07,WD53_08,WD53_04',
@@ -35,7 +35,7 @@
export function getRoutesData(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
diff --git a/src/api/threat.js b/src/api/threat.js
index bebd145..51a6f27 100644
--- a/src/api/threat.js
+++ b/src/api/threat.js
@@ -8,7 +8,7 @@
export function getWaterThreat() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
diff --git a/src/api/weather.js b/src/api/weather.js
index 0beebbb..9f84011 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -7,7 +7,7 @@
export function getWeatherList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD51_20,WD51_21,WD51_22,WD51_08,WD51_10,WD51_12,WD51_14,WD51_15',
@@ -41,7 +41,7 @@
export function getDisasterList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD52_03,WD52_05,WD52_06,WD52_07,WD52_08,WD52_09,WD52_10,WD52_12,WD52_13',
diff --git a/src/assets/login_images/app-login-back.png b/src/assets/login_images/app-login-back.png
new file mode 100644
index 0000000..6a4f010
--- /dev/null
+++ b/src/assets/login_images/app-login-back.png
Binary files differ
diff --git a/src/assets/login_images/logo-simple.png b/src/assets/login_images/logo-simple.png
new file mode 100644
index 0000000..63ab65b
--- /dev/null
+++ b/src/assets/login_images/logo-simple.png
Binary files differ
diff --git a/src/layout/LayoutApp.vue b/src/layout/LayoutApp.vue
new file mode 100644
index 0000000..37f4449
--- /dev/null
+++ b/src/layout/LayoutApp.vue
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
diff --git a/config/index.js b/config/index.js
index 358b560..ab8f4e5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -19,7 +19,7 @@
}
},
// Various Dev Server settings
- // host: '0.0.0.0', // can be overwritten by process.env.HOST
+ host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
diff --git a/index.html b/index.html
index 82a7058..bd3a89f 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
+
管理者驾驶舱
diff --git a/src/api/hca.js b/src/api/hca.js
index 3ff004a..9439c1c 100644
--- a/src/api/hca.js
+++ b/src/api/hca.js
@@ -8,7 +8,7 @@
export function getHighConsequence() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01',
diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index cca1e27..9770a42 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -15,7 +15,7 @@
export function getAreaSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
@@ -71,7 +71,7 @@
export function getUserSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
diff --git a/src/api/pipe.js b/src/api/pipe.js
index 5d0b3d2..a5662f8 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -7,7 +7,7 @@
export function getEarthquakeList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD53_09,WD53_05,WD53_06,WD53_07,WD53_08,WD53_04',
@@ -35,7 +35,7 @@
export function getRoutesData(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
diff --git a/src/api/threat.js b/src/api/threat.js
index bebd145..51a6f27 100644
--- a/src/api/threat.js
+++ b/src/api/threat.js
@@ -8,7 +8,7 @@
export function getWaterThreat() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
diff --git a/src/api/weather.js b/src/api/weather.js
index 0beebbb..9f84011 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -7,7 +7,7 @@
export function getWeatherList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD51_20,WD51_21,WD51_22,WD51_08,WD51_10,WD51_12,WD51_14,WD51_15',
@@ -41,7 +41,7 @@
export function getDisasterList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD52_03,WD52_05,WD52_06,WD52_07,WD52_08,WD52_09,WD52_10,WD52_12,WD52_13',
diff --git a/src/assets/login_images/app-login-back.png b/src/assets/login_images/app-login-back.png
new file mode 100644
index 0000000..6a4f010
--- /dev/null
+++ b/src/assets/login_images/app-login-back.png
Binary files differ
diff --git a/src/assets/login_images/logo-simple.png b/src/assets/login_images/logo-simple.png
new file mode 100644
index 0000000..63ab65b
--- /dev/null
+++ b/src/assets/login_images/logo-simple.png
Binary files differ
diff --git a/src/layout/LayoutApp.vue b/src/layout/LayoutApp.vue
new file mode 100644
index 0000000..37f4449
--- /dev/null
+++ b/src/layout/LayoutApp.vue
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/permission.js b/src/permission.js
index 8be90f6..ba87122 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
NProgress.configure({ showSpinner: false })// NProgress configuration
-const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/applogin', '/appFaceLogin', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
// 全局钩子
router.beforeEach((to, from, next) => {
NProgress.start() // 加载进度条
@@ -21,7 +21,11 @@
next({ path: '/login' })
NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
} else if (to.path === '/dashboard') {
- next()
+ if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
+ next('/appIndex') // 否则全部重定向到登录页
+ } else {
+ next()
+ }
NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
} else {
// 当进入非登陆页或非主页时
@@ -83,7 +87,11 @@
next('/401') // 否则全部重定向到401没有权限页面
})
} else {
- next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
+ if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
+ next(`/applogin`) // 否则全部重定向到登录页
+ } else {
+ next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
+ }
}
NProgress.done()
}
diff --git a/config/index.js b/config/index.js
index 358b560..ab8f4e5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -19,7 +19,7 @@
}
},
// Various Dev Server settings
- // host: '0.0.0.0', // can be overwritten by process.env.HOST
+ host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
diff --git a/index.html b/index.html
index 82a7058..bd3a89f 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
+
管理者驾驶舱
diff --git a/src/api/hca.js b/src/api/hca.js
index 3ff004a..9439c1c 100644
--- a/src/api/hca.js
+++ b/src/api/hca.js
@@ -8,7 +8,7 @@
export function getHighConsequence() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01',
diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index cca1e27..9770a42 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -15,7 +15,7 @@
export function getAreaSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
@@ -71,7 +71,7 @@
export function getUserSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
diff --git a/src/api/pipe.js b/src/api/pipe.js
index 5d0b3d2..a5662f8 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -7,7 +7,7 @@
export function getEarthquakeList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD53_09,WD53_05,WD53_06,WD53_07,WD53_08,WD53_04',
@@ -35,7 +35,7 @@
export function getRoutesData(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
diff --git a/src/api/threat.js b/src/api/threat.js
index bebd145..51a6f27 100644
--- a/src/api/threat.js
+++ b/src/api/threat.js
@@ -8,7 +8,7 @@
export function getWaterThreat() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
diff --git a/src/api/weather.js b/src/api/weather.js
index 0beebbb..9f84011 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -7,7 +7,7 @@
export function getWeatherList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD51_20,WD51_21,WD51_22,WD51_08,WD51_10,WD51_12,WD51_14,WD51_15',
@@ -41,7 +41,7 @@
export function getDisasterList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD52_03,WD52_05,WD52_06,WD52_07,WD52_08,WD52_09,WD52_10,WD52_12,WD52_13',
diff --git a/src/assets/login_images/app-login-back.png b/src/assets/login_images/app-login-back.png
new file mode 100644
index 0000000..6a4f010
--- /dev/null
+++ b/src/assets/login_images/app-login-back.png
Binary files differ
diff --git a/src/assets/login_images/logo-simple.png b/src/assets/login_images/logo-simple.png
new file mode 100644
index 0000000..63ab65b
--- /dev/null
+++ b/src/assets/login_images/logo-simple.png
Binary files differ
diff --git a/src/layout/LayoutApp.vue b/src/layout/LayoutApp.vue
new file mode 100644
index 0000000..37f4449
--- /dev/null
+++ b/src/layout/LayoutApp.vue
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/permission.js b/src/permission.js
index 8be90f6..ba87122 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
NProgress.configure({ showSpinner: false })// NProgress configuration
-const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/applogin', '/appFaceLogin', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
// 全局钩子
router.beforeEach((to, from, next) => {
NProgress.start() // 加载进度条
@@ -21,7 +21,11 @@
next({ path: '/login' })
NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
} else if (to.path === '/dashboard') {
- next()
+ if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
+ next('/appIndex') // 否则全部重定向到登录页
+ } else {
+ next()
+ }
NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
} else {
// 当进入非登陆页或非主页时
@@ -83,7 +87,11 @@
next('/401') // 否则全部重定向到401没有权限页面
})
} else {
- next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
+ if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
+ next(`/applogin`) // 否则全部重定向到登录页
+ } else {
+ next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
+ }
}
NProgress.done()
}
diff --git a/src/router/index.js b/src/router/index.js
index ee331f4..e52e173 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -41,6 +41,10 @@
},
// 登录页面
{ path: '/login', component: () => import('@/views/login/index'), hidden: true },
+ { path: '/applogin', component: () => import('@/views/login/appLogin'), hidden: true },
+ { path: '/appFaceLogin', component: () => import('@/views/login/appFaceLogin'), hidden: true },
+ { path: '/appIndex', component: () => import('@/views/dashboard/appIndex'), hidden: true, meta: { keepAlive: true }},
+ { path: '/appSubject', component: () => import('@/layout/LayoutApp'), hidden: true },
// 404错误页面
{ path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
// 401 错误页面
diff --git a/config/index.js b/config/index.js
index 358b560..ab8f4e5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -19,7 +19,7 @@
}
},
// Various Dev Server settings
- // host: '0.0.0.0', // can be overwritten by process.env.HOST
+ host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
diff --git a/index.html b/index.html
index 82a7058..bd3a89f 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
+
管理者驾驶舱
diff --git a/src/api/hca.js b/src/api/hca.js
index 3ff004a..9439c1c 100644
--- a/src/api/hca.js
+++ b/src/api/hca.js
@@ -8,7 +8,7 @@
export function getHighConsequence() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01',
diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index cca1e27..9770a42 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -15,7 +15,7 @@
export function getAreaSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
@@ -71,7 +71,7 @@
export function getUserSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
diff --git a/src/api/pipe.js b/src/api/pipe.js
index 5d0b3d2..a5662f8 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -7,7 +7,7 @@
export function getEarthquakeList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD53_09,WD53_05,WD53_06,WD53_07,WD53_08,WD53_04',
@@ -35,7 +35,7 @@
export function getRoutesData(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
diff --git a/src/api/threat.js b/src/api/threat.js
index bebd145..51a6f27 100644
--- a/src/api/threat.js
+++ b/src/api/threat.js
@@ -8,7 +8,7 @@
export function getWaterThreat() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
diff --git a/src/api/weather.js b/src/api/weather.js
index 0beebbb..9f84011 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -7,7 +7,7 @@
export function getWeatherList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD51_20,WD51_21,WD51_22,WD51_08,WD51_10,WD51_12,WD51_14,WD51_15',
@@ -41,7 +41,7 @@
export function getDisasterList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD52_03,WD52_05,WD52_06,WD52_07,WD52_08,WD52_09,WD52_10,WD52_12,WD52_13',
diff --git a/src/assets/login_images/app-login-back.png b/src/assets/login_images/app-login-back.png
new file mode 100644
index 0000000..6a4f010
--- /dev/null
+++ b/src/assets/login_images/app-login-back.png
Binary files differ
diff --git a/src/assets/login_images/logo-simple.png b/src/assets/login_images/logo-simple.png
new file mode 100644
index 0000000..63ab65b
--- /dev/null
+++ b/src/assets/login_images/logo-simple.png
Binary files differ
diff --git a/src/layout/LayoutApp.vue b/src/layout/LayoutApp.vue
new file mode 100644
index 0000000..37f4449
--- /dev/null
+++ b/src/layout/LayoutApp.vue
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/permission.js b/src/permission.js
index 8be90f6..ba87122 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
NProgress.configure({ showSpinner: false })// NProgress configuration
-const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/applogin', '/appFaceLogin', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
// 全局钩子
router.beforeEach((to, from, next) => {
NProgress.start() // 加载进度条
@@ -21,7 +21,11 @@
next({ path: '/login' })
NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
} else if (to.path === '/dashboard') {
- next()
+ if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
+ next('/appIndex') // 否则全部重定向到登录页
+ } else {
+ next()
+ }
NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
} else {
// 当进入非登陆页或非主页时
@@ -83,7 +87,11 @@
next('/401') // 否则全部重定向到401没有权限页面
})
} else {
- next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
+ if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
+ next(`/applogin`) // 否则全部重定向到登录页
+ } else {
+ next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
+ }
}
NProgress.done()
}
diff --git a/src/router/index.js b/src/router/index.js
index ee331f4..e52e173 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -41,6 +41,10 @@
},
// 登录页面
{ path: '/login', component: () => import('@/views/login/index'), hidden: true },
+ { path: '/applogin', component: () => import('@/views/login/appLogin'), hidden: true },
+ { path: '/appFaceLogin', component: () => import('@/views/login/appFaceLogin'), hidden: true },
+ { path: '/appIndex', component: () => import('@/views/dashboard/appIndex'), hidden: true, meta: { keepAlive: true }},
+ { path: '/appSubject', component: () => import('@/layout/LayoutApp'), hidden: true },
// 404错误页面
{ path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
// 401 错误页面
diff --git a/src/utils/request.js b/src/utils/request.js
index 73cdc6e..b1869b8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -38,19 +38,22 @@
} else if (res.code !== 200) {
// 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了;
if (res.code === 401 || res.code === 50012 || res.code === 50014) {
- MessageBox.confirm(
- '你已被登出，可以取消继续留在该页面，或者重新登录',
- '确定登出',
- {
- confirmButtonText: '重新登录',
- cancelButtonText: '取消',
- type: 'warning'
- }
- ).then(() => {
- store.dispatch('FedLogOut').then(() => {
- location.reload() // 为了重新实例化vue-router对象 避免bug
- })
+ store.dispatch('FedLogOut').then(() => {
+ location.reload() // 为了重新实例化vue-router对象 避免bug
})
+ // MessageBox.confirm(
+ // '你已被登出，可以取消继续留在该页面，或者重新登录',
+ // '确定登出',
+ // {
+ // confirmButtonText: '重新登录',
+ // cancelButtonText: '取消',
+ // type: 'warning'
+ // }
+ // ).then(() => {
+ // store.dispatch('FedLogOut').then(() => {
+ // location.reload() // 为了重新实例化vue-router对象 避免bug
+ // })
+ // })
} else if (res.status === 1000 || res.status === 200) {
// 天气网的正常返回, 数据中台的正常返回
return response.data
diff --git a/config/index.js b/config/index.js
index 358b560..ab8f4e5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -19,7 +19,7 @@
}
},
// Various Dev Server settings
- // host: '0.0.0.0', // can be overwritten by process.env.HOST
+ host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
diff --git a/index.html b/index.html
index 82a7058..bd3a89f 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
+
管理者驾驶舱
diff --git a/src/api/hca.js b/src/api/hca.js
index 3ff004a..9439c1c 100644
--- a/src/api/hca.js
+++ b/src/api/hca.js
@@ -8,7 +8,7 @@
export function getHighConsequence() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01',
diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index cca1e27..9770a42 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -15,7 +15,7 @@
export function getAreaSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
@@ -71,7 +71,7 @@
export function getUserSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
diff --git a/src/api/pipe.js b/src/api/pipe.js
index 5d0b3d2..a5662f8 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -7,7 +7,7 @@
export function getEarthquakeList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD53_09,WD53_05,WD53_06,WD53_07,WD53_08,WD53_04',
@@ -35,7 +35,7 @@
export function getRoutesData(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
diff --git a/src/api/threat.js b/src/api/threat.js
index bebd145..51a6f27 100644
--- a/src/api/threat.js
+++ b/src/api/threat.js
@@ -8,7 +8,7 @@
export function getWaterThreat() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
diff --git a/src/api/weather.js b/src/api/weather.js
index 0beebbb..9f84011 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -7,7 +7,7 @@
export function getWeatherList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD51_20,WD51_21,WD51_22,WD51_08,WD51_10,WD51_12,WD51_14,WD51_15',
@@ -41,7 +41,7 @@
export function getDisasterList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD52_03,WD52_05,WD52_06,WD52_07,WD52_08,WD52_09,WD52_10,WD52_12,WD52_13',
diff --git a/src/assets/login_images/app-login-back.png b/src/assets/login_images/app-login-back.png
new file mode 100644
index 0000000..6a4f010
--- /dev/null
+++ b/src/assets/login_images/app-login-back.png
Binary files differ
diff --git a/src/assets/login_images/logo-simple.png b/src/assets/login_images/logo-simple.png
new file mode 100644
index 0000000..63ab65b
--- /dev/null
+++ b/src/assets/login_images/logo-simple.png
Binary files differ
diff --git a/src/layout/LayoutApp.vue b/src/layout/LayoutApp.vue
new file mode 100644
index 0000000..37f4449
--- /dev/null
+++ b/src/layout/LayoutApp.vue
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/permission.js b/src/permission.js
index 8be90f6..ba87122 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
NProgress.configure({ showSpinner: false })// NProgress configuration
-const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/applogin', '/appFaceLogin', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
// 全局钩子
router.beforeEach((to, from, next) => {
NProgress.start() // 加载进度条
@@ -21,7 +21,11 @@
next({ path: '/login' })
NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
} else if (to.path === '/dashboard') {
- next()
+ if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
+ next('/appIndex') // 否则全部重定向到登录页
+ } else {
+ next()
+ }
NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
} else {
// 当进入非登陆页或非主页时
@@ -83,7 +87,11 @@
next('/401') // 否则全部重定向到401没有权限页面
})
} else {
- next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
+ if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
+ next(`/applogin`) // 否则全部重定向到登录页
+ } else {
+ next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
+ }
}
NProgress.done()
}
diff --git a/src/router/index.js b/src/router/index.js
index ee331f4..e52e173 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -41,6 +41,10 @@
},
// 登录页面
{ path: '/login', component: () => import('@/views/login/index'), hidden: true },
+ { path: '/applogin', component: () => import('@/views/login/appLogin'), hidden: true },
+ { path: '/appFaceLogin', component: () => import('@/views/login/appFaceLogin'), hidden: true },
+ { path: '/appIndex', component: () => import('@/views/dashboard/appIndex'), hidden: true, meta: { keepAlive: true }},
+ { path: '/appSubject', component: () => import('@/layout/LayoutApp'), hidden: true },
// 404错误页面
{ path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
// 401 错误页面
diff --git a/src/utils/request.js b/src/utils/request.js
index 73cdc6e..b1869b8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -38,19 +38,22 @@
} else if (res.code !== 200) {
// 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了;
if (res.code === 401 || res.code === 50012 || res.code === 50014) {
- MessageBox.confirm(
- '你已被登出，可以取消继续留在该页面，或者重新登录',
- '确定登出',
- {
- confirmButtonText: '重新登录',
- cancelButtonText: '取消',
- type: 'warning'
- }
- ).then(() => {
- store.dispatch('FedLogOut').then(() => {
- location.reload() // 为了重新实例化vue-router对象 避免bug
- })
+ store.dispatch('FedLogOut').then(() => {
+ location.reload() // 为了重新实例化vue-router对象 避免bug
})
+ // MessageBox.confirm(
+ // '你已被登出，可以取消继续留在该页面，或者重新登录',
+ // '确定登出',
+ // {
+ // confirmButtonText: '重新登录',
+ // cancelButtonText: '取消',
+ // type: 'warning'
+ // }
+ // ).then(() => {
+ // store.dispatch('FedLogOut').then(() => {
+ // location.reload() // 为了重新实例化vue-router对象 避免bug
+ // })
+ // })
} else if (res.status === 1000 || res.status === 200) {
// 天气网的正常返回, 数据中台的正常返回
return response.data
diff --git a/src/views/dashboard/appIndex.vue b/src/views/dashboard/appIndex.vue
new file mode 100644
index 0000000..5a6974b
--- /dev/null
+++ b/src/views/dashboard/appIndex.vue
@@ -0,0 +1,190 @@
+
+
+
+
![]()
+
+ 管理者驾驶舱
+
+
+
+
+
+
+
+
+
![]()
+
+ 管理者驾驶舱
+
+
+
+
+
+
+
+
+
![]()
+
+ 管理者驾驶舱
+
+
+
+
+
+
+
+
+
![]()
+
+ 管理者驾驶舱
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/config/index.js b/config/index.js
index 358b560..ab8f4e5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -19,7 +19,7 @@
}
},
// Various Dev Server settings
- // host: '0.0.0.0', // can be overwritten by process.env.HOST
+ host: '0.0.0.0', // can be overwritten by process.env.HOST
port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
diff --git a/index.html b/index.html
index 82a7058..bd3a89f 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
+
管理者驾驶舱
diff --git a/src/api/hca.js b/src/api/hca.js
index 3ff004a..9439c1c 100644
--- a/src/api/hca.js
+++ b/src/api/hca.js
@@ -8,7 +8,7 @@
export function getHighConsequence() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01',
diff --git a/src/api/needSupply.js b/src/api/needSupply.js
index cca1e27..9770a42 100644
--- a/src/api/needSupply.js
+++ b/src/api/needSupply.js
@@ -15,7 +15,7 @@
export function getAreaSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD09_05,DL01,DL02,DL03',
@@ -71,7 +71,7 @@
export function getUserSupply(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03',
diff --git a/src/api/pipe.js b/src/api/pipe.js
index 5d0b3d2..a5662f8 100644
--- a/src/api/pipe.js
+++ b/src/api/pipe.js
@@ -7,7 +7,7 @@
export function getEarthquakeList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD53_09,WD53_05,WD53_06,WD53_07,WD53_08,WD53_04',
@@ -35,7 +35,7 @@
export function getRoutesData(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12,WD60_13',
diff --git a/src/api/threat.js b/src/api/threat.js
index bebd145..51a6f27 100644
--- a/src/api/threat.js
+++ b/src/api/threat.js
@@ -8,7 +8,7 @@
export function getWaterThreat() {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD01_03,WD54_03,WD56_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10',
diff --git a/src/api/weather.js b/src/api/weather.js
index 0beebbb..9f84011 100644
--- a/src/api/weather.js
+++ b/src/api/weather.js
@@ -7,7 +7,7 @@
export function getWeatherList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD51_20,WD51_21,WD51_22,WD51_08,WD51_10,WD51_12,WD51_14,WD51_15',
@@ -41,7 +41,7 @@
export function getDisasterList(date) {
const { sign, username, timestamp } = getSignTimeStamp()
return request({
- url: 'http://172.26.2.128:9001/factdata/index/getData',
+ url: 'http://10.100.252.13:9001/factdata/index/getData',
method: 'post',
data: {
'showField': 'WD52_03,WD52_05,WD52_06,WD52_07,WD52_08,WD52_09,WD52_10,WD52_12,WD52_13',
diff --git a/src/assets/login_images/app-login-back.png b/src/assets/login_images/app-login-back.png
new file mode 100644
index 0000000..6a4f010
--- /dev/null
+++ b/src/assets/login_images/app-login-back.png
Binary files differ
diff --git a/src/assets/login_images/logo-simple.png b/src/assets/login_images/logo-simple.png
new file mode 100644
index 0000000..63ab65b
--- /dev/null
+++ b/src/assets/login_images/logo-simple.png
Binary files differ
diff --git a/src/layout/LayoutApp.vue b/src/layout/LayoutApp.vue
new file mode 100644
index 0000000..37f4449
--- /dev/null
+++ b/src/layout/LayoutApp.vue
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/permission.js b/src/permission.js
index 8be90f6..ba87122 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,7 +8,7 @@
NProgress.configure({ showSpinner: false })// NProgress configuration
-const whiteList = ['/login', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
+const whiteList = ['/login', '/applogin', '/appFaceLogin', '/404', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/routeTopic', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather', '/full/needTopic', '/full/supplyTopic', '/full/pipeOverview', '/full/overview'] // 不重定向白名单
// 全局钩子
router.beforeEach((to, from, next) => {
NProgress.start() // 加载进度条
@@ -21,7 +21,11 @@
next({ path: '/login' })
NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
} else if (to.path === '/dashboard') {
- next()
+ if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
+ next('/appIndex') // 否则全部重定向到登录页
+ } else {
+ next()
+ }
NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it
} else {
// 当进入非登陆页或非主页时
@@ -83,7 +87,11 @@
next('/401') // 否则全部重定向到401没有权限页面
})
} else {
- next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
+ if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
+ next(`/applogin`) // 否则全部重定向到登录页
+ } else {
+ next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
+ }
}
NProgress.done()
}
diff --git a/src/router/index.js b/src/router/index.js
index ee331f4..e52e173 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -41,6 +41,10 @@
},
// 登录页面
{ path: '/login', component: () => import('@/views/login/index'), hidden: true },
+ { path: '/applogin', component: () => import('@/views/login/appLogin'), hidden: true },
+ { path: '/appFaceLogin', component: () => import('@/views/login/appFaceLogin'), hidden: true },
+ { path: '/appIndex', component: () => import('@/views/dashboard/appIndex'), hidden: true, meta: { keepAlive: true }},
+ { path: '/appSubject', component: () => import('@/layout/LayoutApp'), hidden: true },
// 404错误页面
{ path: '/404', component: () => import('@/views/errorPage/404'), hidden: true },
// 401 错误页面
diff --git a/src/utils/request.js b/src/utils/request.js
index 73cdc6e..b1869b8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -38,19 +38,22 @@
} else if (res.code !== 200) {
// 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了;
if (res.code === 401 || res.code === 50012 || res.code === 50014) {
- MessageBox.confirm(
- '你已被登出，可以取消继续留在该页面，或者重新登录',
- '确定登出',
- {
- confirmButtonText: '重新登录',
- cancelButtonText: '取消',
- type: 'warning'
- }
- ).then(() => {
- store.dispatch('FedLogOut').then(() => {
- location.reload() // 为了重新实例化vue-router对象 避免bug
- })
+ store.dispatch('FedLogOut').then(() => {
+ location.reload() // 为了重新实例化vue-router对象 避免bug
})
+ // MessageBox.confirm(
+ // '你已被登出，可以取消继续留在该页面，或者重新登录',
+ // '确定登出',
+ // {
+ // confirmButtonText: '重新登录',
+ // cancelButtonText: '取消',
+ // type: 'warning'
+ // }
+ // ).then(() => {
+ // store.dispatch('FedLogOut').then(() => {
+ // location.reload() // 为了重新实例化vue-router对象 避免bug
+ // })
+ // })
} else if (res.status === 1000 || res.status === 200) {
// 天气网的正常返回, 数据中台的正常返回
return response.data
diff --git a/src/views/dashboard/appIndex.vue b/src/views/dashboard/appIndex.vue
new file mode 100644
index 0000000..5a6974b
--- /dev/null
+++ b/src/views/dashboard/appIndex.vue
@@ -0,0 +1,190 @@
+
+
+
+
![]()
+
+ 管理者驾驶舱
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/login/appLogin.vue b/src/views/login/appLogin.vue
new file mode 100644
index 0000000..108abc3
--- /dev/null
+++ b/src/views/login/appLogin.vue
@@ -0,0 +1,177 @@
+
+
+
+
+
![]()
+
+ 管理者驾驶舱
+
+
+
+
+
+
![]()
+
+ 管理者驾驶舱
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/login/appLogin.vue b/src/views/login/appLogin.vue
new file mode 100644
index 0000000..108abc3
--- /dev/null
+++ b/src/views/login/appLogin.vue
@@ -0,0 +1,177 @@
+
+
+
+
+
![]()
+
+ 管理者驾驶舱
+
+
+
+