diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/static/images/weather_disaster/1101.png b/static/images/weather_disaster/1101.png new file mode 100644 index 0000000..0502be0 --- /dev/null +++ b/static/images/weather_disaster/1101.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/static/images/weather_disaster/1101.png b/static/images/weather_disaster/1101.png new file mode 100644 index 0000000..0502be0 --- /dev/null +++ b/static/images/weather_disaster/1101.png Binary files differ diff --git a/static/images/weather_disaster/1102.png b/static/images/weather_disaster/1102.png new file mode 100644 index 0000000..f76aff3 --- /dev/null +++ b/static/images/weather_disaster/1102.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/static/images/weather_disaster/1101.png b/static/images/weather_disaster/1101.png new file mode 100644 index 0000000..0502be0 --- /dev/null +++ b/static/images/weather_disaster/1101.png Binary files differ diff --git a/static/images/weather_disaster/1102.png b/static/images/weather_disaster/1102.png new file mode 100644 index 0000000..f76aff3 --- /dev/null +++ b/static/images/weather_disaster/1102.png Binary files differ diff --git a/static/images/weather_disaster/1103.png b/static/images/weather_disaster/1103.png new file mode 100644 index 0000000..7c06db9 --- /dev/null +++ b/static/images/weather_disaster/1103.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/static/images/weather_disaster/1101.png b/static/images/weather_disaster/1101.png new file mode 100644 index 0000000..0502be0 --- /dev/null +++ b/static/images/weather_disaster/1101.png Binary files differ diff --git a/static/images/weather_disaster/1102.png b/static/images/weather_disaster/1102.png new file mode 100644 index 0000000..f76aff3 --- /dev/null +++ b/static/images/weather_disaster/1102.png Binary files differ diff --git a/static/images/weather_disaster/1103.png b/static/images/weather_disaster/1103.png new file mode 100644 index 0000000..7c06db9 --- /dev/null +++ b/static/images/weather_disaster/1103.png Binary files differ diff --git a/static/images/weather_disaster/1104.png b/static/images/weather_disaster/1104.png new file mode 100644 index 0000000..ba006c0 --- /dev/null +++ b/static/images/weather_disaster/1104.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/static/images/weather_disaster/1101.png b/static/images/weather_disaster/1101.png new file mode 100644 index 0000000..0502be0 --- /dev/null +++ b/static/images/weather_disaster/1101.png Binary files differ diff --git a/static/images/weather_disaster/1102.png b/static/images/weather_disaster/1102.png new file mode 100644 index 0000000..f76aff3 --- /dev/null +++ b/static/images/weather_disaster/1102.png Binary files differ diff --git a/static/images/weather_disaster/1103.png b/static/images/weather_disaster/1103.png new file mode 100644 index 0000000..7c06db9 --- /dev/null +++ b/static/images/weather_disaster/1103.png Binary files differ diff --git a/static/images/weather_disaster/1104.png b/static/images/weather_disaster/1104.png new file mode 100644 index 0000000..ba006c0 --- /dev/null +++ b/static/images/weather_disaster/1104.png Binary files differ diff --git a/static/images/weather_disaster/1201.png b/static/images/weather_disaster/1201.png new file mode 100644 index 0000000..8dab8ed --- /dev/null +++ b/static/images/weather_disaster/1201.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/static/images/weather_disaster/1101.png b/static/images/weather_disaster/1101.png new file mode 100644 index 0000000..0502be0 --- /dev/null +++ b/static/images/weather_disaster/1101.png Binary files differ diff --git a/static/images/weather_disaster/1102.png b/static/images/weather_disaster/1102.png new file mode 100644 index 0000000..f76aff3 --- /dev/null +++ b/static/images/weather_disaster/1102.png Binary files differ diff --git a/static/images/weather_disaster/1103.png b/static/images/weather_disaster/1103.png new file mode 100644 index 0000000..7c06db9 --- /dev/null +++ b/static/images/weather_disaster/1103.png Binary files differ diff --git a/static/images/weather_disaster/1104.png b/static/images/weather_disaster/1104.png new file mode 100644 index 0000000..ba006c0 --- /dev/null +++ b/static/images/weather_disaster/1104.png Binary files differ diff --git a/static/images/weather_disaster/1201.png b/static/images/weather_disaster/1201.png new file mode 100644 index 0000000..8dab8ed --- /dev/null +++ b/static/images/weather_disaster/1201.png Binary files differ diff --git a/static/images/weather_disaster/1202.png b/static/images/weather_disaster/1202.png new file mode 100644 index 0000000..9b06503 --- /dev/null +++ b/static/images/weather_disaster/1202.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/static/images/weather_disaster/1101.png b/static/images/weather_disaster/1101.png new file mode 100644 index 0000000..0502be0 --- /dev/null +++ b/static/images/weather_disaster/1101.png Binary files differ diff --git a/static/images/weather_disaster/1102.png b/static/images/weather_disaster/1102.png new file mode 100644 index 0000000..f76aff3 --- /dev/null +++ b/static/images/weather_disaster/1102.png Binary files differ diff --git a/static/images/weather_disaster/1103.png b/static/images/weather_disaster/1103.png new file mode 100644 index 0000000..7c06db9 --- /dev/null +++ b/static/images/weather_disaster/1103.png Binary files differ diff --git a/static/images/weather_disaster/1104.png b/static/images/weather_disaster/1104.png new file mode 100644 index 0000000..ba006c0 --- /dev/null +++ b/static/images/weather_disaster/1104.png Binary files differ diff --git a/static/images/weather_disaster/1201.png b/static/images/weather_disaster/1201.png new file mode 100644 index 0000000..8dab8ed --- /dev/null +++ b/static/images/weather_disaster/1201.png Binary files differ diff --git a/static/images/weather_disaster/1202.png b/static/images/weather_disaster/1202.png new file mode 100644 index 0000000..9b06503 --- /dev/null +++ b/static/images/weather_disaster/1202.png Binary files differ diff --git a/static/images/weather_disaster/1203.png b/static/images/weather_disaster/1203.png new file mode 100644 index 0000000..9c1449e --- /dev/null +++ b/static/images/weather_disaster/1203.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/static/images/weather_disaster/1101.png b/static/images/weather_disaster/1101.png new file mode 100644 index 0000000..0502be0 --- /dev/null +++ b/static/images/weather_disaster/1101.png Binary files differ diff --git a/static/images/weather_disaster/1102.png b/static/images/weather_disaster/1102.png new file mode 100644 index 0000000..f76aff3 --- /dev/null +++ b/static/images/weather_disaster/1102.png Binary files differ diff --git a/static/images/weather_disaster/1103.png b/static/images/weather_disaster/1103.png new file mode 100644 index 0000000..7c06db9 --- /dev/null +++ b/static/images/weather_disaster/1103.png Binary files differ diff --git a/static/images/weather_disaster/1104.png b/static/images/weather_disaster/1104.png new file mode 100644 index 0000000..ba006c0 --- /dev/null +++ b/static/images/weather_disaster/1104.png Binary files differ diff --git a/static/images/weather_disaster/1201.png b/static/images/weather_disaster/1201.png new file mode 100644 index 0000000..8dab8ed --- /dev/null +++ b/static/images/weather_disaster/1201.png Binary files differ diff --git a/static/images/weather_disaster/1202.png b/static/images/weather_disaster/1202.png new file mode 100644 index 0000000..9b06503 --- /dev/null +++ b/static/images/weather_disaster/1202.png Binary files differ diff --git a/static/images/weather_disaster/1203.png b/static/images/weather_disaster/1203.png new file mode 100644 index 0000000..9c1449e --- /dev/null +++ b/static/images/weather_disaster/1203.png Binary files differ diff --git a/static/images/weather_disaster/1204.png b/static/images/weather_disaster/1204.png new file mode 100644 index 0000000..f6b2e8e --- /dev/null +++ b/static/images/weather_disaster/1204.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/static/images/weather_disaster/1101.png b/static/images/weather_disaster/1101.png new file mode 100644 index 0000000..0502be0 --- /dev/null +++ b/static/images/weather_disaster/1101.png Binary files differ diff --git a/static/images/weather_disaster/1102.png b/static/images/weather_disaster/1102.png new file mode 100644 index 0000000..f76aff3 --- /dev/null +++ b/static/images/weather_disaster/1102.png Binary files differ diff --git a/static/images/weather_disaster/1103.png b/static/images/weather_disaster/1103.png new file mode 100644 index 0000000..7c06db9 --- /dev/null +++ b/static/images/weather_disaster/1103.png Binary files differ diff --git a/static/images/weather_disaster/1104.png b/static/images/weather_disaster/1104.png new file mode 100644 index 0000000..ba006c0 --- /dev/null +++ b/static/images/weather_disaster/1104.png Binary files differ diff --git a/static/images/weather_disaster/1201.png b/static/images/weather_disaster/1201.png new file mode 100644 index 0000000..8dab8ed --- /dev/null +++ b/static/images/weather_disaster/1201.png Binary files differ diff --git a/static/images/weather_disaster/1202.png b/static/images/weather_disaster/1202.png new file mode 100644 index 0000000..9b06503 --- /dev/null +++ b/static/images/weather_disaster/1202.png Binary files differ diff --git a/static/images/weather_disaster/1203.png b/static/images/weather_disaster/1203.png new file mode 100644 index 0000000..9c1449e --- /dev/null +++ b/static/images/weather_disaster/1203.png Binary files differ diff --git a/static/images/weather_disaster/1204.png b/static/images/weather_disaster/1204.png new file mode 100644 index 0000000..f6b2e8e --- /dev/null +++ b/static/images/weather_disaster/1204.png Binary files differ diff --git a/static/images/weather_disaster/1301.png b/static/images/weather_disaster/1301.png new file mode 100644 index 0000000..b0958cf --- /dev/null +++ b/static/images/weather_disaster/1301.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/static/images/weather_disaster/1101.png b/static/images/weather_disaster/1101.png new file mode 100644 index 0000000..0502be0 --- /dev/null +++ b/static/images/weather_disaster/1101.png Binary files differ diff --git a/static/images/weather_disaster/1102.png b/static/images/weather_disaster/1102.png new file mode 100644 index 0000000..f76aff3 --- /dev/null +++ b/static/images/weather_disaster/1102.png Binary files differ diff --git a/static/images/weather_disaster/1103.png b/static/images/weather_disaster/1103.png new file mode 100644 index 0000000..7c06db9 --- /dev/null +++ b/static/images/weather_disaster/1103.png Binary files differ diff --git a/static/images/weather_disaster/1104.png b/static/images/weather_disaster/1104.png new file mode 100644 index 0000000..ba006c0 --- /dev/null +++ b/static/images/weather_disaster/1104.png Binary files differ diff --git a/static/images/weather_disaster/1201.png b/static/images/weather_disaster/1201.png new file mode 100644 index 0000000..8dab8ed --- /dev/null +++ b/static/images/weather_disaster/1201.png Binary files differ diff --git a/static/images/weather_disaster/1202.png b/static/images/weather_disaster/1202.png new file mode 100644 index 0000000..9b06503 --- /dev/null +++ b/static/images/weather_disaster/1202.png Binary files differ diff --git a/static/images/weather_disaster/1203.png b/static/images/weather_disaster/1203.png new file mode 100644 index 0000000..9c1449e --- /dev/null +++ b/static/images/weather_disaster/1203.png Binary files differ diff --git a/static/images/weather_disaster/1204.png b/static/images/weather_disaster/1204.png new file mode 100644 index 0000000..f6b2e8e --- /dev/null +++ b/static/images/weather_disaster/1204.png Binary files differ diff --git a/static/images/weather_disaster/1301.png b/static/images/weather_disaster/1301.png new file mode 100644 index 0000000..b0958cf --- /dev/null +++ b/static/images/weather_disaster/1301.png Binary files differ diff --git a/static/images/weather_disaster/1302.png b/static/images/weather_disaster/1302.png new file mode 100644 index 0000000..52f8dd7 --- /dev/null +++ b/static/images/weather_disaster/1302.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/static/images/weather_disaster/1101.png b/static/images/weather_disaster/1101.png new file mode 100644 index 0000000..0502be0 --- /dev/null +++ b/static/images/weather_disaster/1101.png Binary files differ diff --git a/static/images/weather_disaster/1102.png b/static/images/weather_disaster/1102.png new file mode 100644 index 0000000..f76aff3 --- /dev/null +++ b/static/images/weather_disaster/1102.png Binary files differ diff --git a/static/images/weather_disaster/1103.png b/static/images/weather_disaster/1103.png new file mode 100644 index 0000000..7c06db9 --- /dev/null +++ b/static/images/weather_disaster/1103.png Binary files differ diff --git a/static/images/weather_disaster/1104.png b/static/images/weather_disaster/1104.png new file mode 100644 index 0000000..ba006c0 --- /dev/null +++ b/static/images/weather_disaster/1104.png Binary files differ diff --git a/static/images/weather_disaster/1201.png b/static/images/weather_disaster/1201.png new file mode 100644 index 0000000..8dab8ed --- /dev/null +++ b/static/images/weather_disaster/1201.png Binary files differ diff --git a/static/images/weather_disaster/1202.png b/static/images/weather_disaster/1202.png new file mode 100644 index 0000000..9b06503 --- /dev/null +++ b/static/images/weather_disaster/1202.png Binary files differ diff --git a/static/images/weather_disaster/1203.png b/static/images/weather_disaster/1203.png new file mode 100644 index 0000000..9c1449e --- /dev/null +++ b/static/images/weather_disaster/1203.png Binary files differ diff --git a/static/images/weather_disaster/1204.png b/static/images/weather_disaster/1204.png new file mode 100644 index 0000000..f6b2e8e --- /dev/null +++ b/static/images/weather_disaster/1204.png Binary files differ diff --git a/static/images/weather_disaster/1301.png b/static/images/weather_disaster/1301.png new file mode 100644 index 0000000..b0958cf --- /dev/null +++ b/static/images/weather_disaster/1301.png Binary files differ diff --git a/static/images/weather_disaster/1302.png b/static/images/weather_disaster/1302.png new file mode 100644 index 0000000..52f8dd7 --- /dev/null +++ b/static/images/weather_disaster/1302.png Binary files differ diff --git a/static/images/weather_disaster/1303.png b/static/images/weather_disaster/1303.png new file mode 100644 index 0000000..1888f89 --- /dev/null +++ b/static/images/weather_disaster/1303.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/static/images/weather_disaster/1101.png b/static/images/weather_disaster/1101.png new file mode 100644 index 0000000..0502be0 --- /dev/null +++ b/static/images/weather_disaster/1101.png Binary files differ diff --git a/static/images/weather_disaster/1102.png b/static/images/weather_disaster/1102.png new file mode 100644 index 0000000..f76aff3 --- /dev/null +++ b/static/images/weather_disaster/1102.png Binary files differ diff --git a/static/images/weather_disaster/1103.png b/static/images/weather_disaster/1103.png new file mode 100644 index 0000000..7c06db9 --- /dev/null +++ b/static/images/weather_disaster/1103.png Binary files differ diff --git a/static/images/weather_disaster/1104.png b/static/images/weather_disaster/1104.png new file mode 100644 index 0000000..ba006c0 --- /dev/null +++ b/static/images/weather_disaster/1104.png Binary files differ diff --git a/static/images/weather_disaster/1201.png b/static/images/weather_disaster/1201.png new file mode 100644 index 0000000..8dab8ed --- /dev/null +++ b/static/images/weather_disaster/1201.png Binary files differ diff --git a/static/images/weather_disaster/1202.png b/static/images/weather_disaster/1202.png new file mode 100644 index 0000000..9b06503 --- /dev/null +++ b/static/images/weather_disaster/1202.png Binary files differ diff --git a/static/images/weather_disaster/1203.png b/static/images/weather_disaster/1203.png new file mode 100644 index 0000000..9c1449e --- /dev/null +++ b/static/images/weather_disaster/1203.png Binary files differ diff --git a/static/images/weather_disaster/1204.png b/static/images/weather_disaster/1204.png new file mode 100644 index 0000000..f6b2e8e --- /dev/null +++ b/static/images/weather_disaster/1204.png Binary files differ diff --git a/static/images/weather_disaster/1301.png b/static/images/weather_disaster/1301.png new file mode 100644 index 0000000..b0958cf --- /dev/null +++ b/static/images/weather_disaster/1301.png Binary files differ diff --git a/static/images/weather_disaster/1302.png b/static/images/weather_disaster/1302.png new file mode 100644 index 0000000..52f8dd7 --- /dev/null +++ b/static/images/weather_disaster/1302.png Binary files differ diff --git a/static/images/weather_disaster/1303.png b/static/images/weather_disaster/1303.png new file mode 100644 index 0000000..1888f89 --- /dev/null +++ b/static/images/weather_disaster/1303.png Binary files differ diff --git a/static/images/weather_disaster/1304.png b/static/images/weather_disaster/1304.png new file mode 100644 index 0000000..78cd75d --- /dev/null +++ b/static/images/weather_disaster/1304.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/static/images/weather_disaster/1101.png b/static/images/weather_disaster/1101.png new file mode 100644 index 0000000..0502be0 --- /dev/null +++ b/static/images/weather_disaster/1101.png Binary files differ diff --git a/static/images/weather_disaster/1102.png b/static/images/weather_disaster/1102.png new file mode 100644 index 0000000..f76aff3 --- /dev/null +++ b/static/images/weather_disaster/1102.png Binary files differ diff --git a/static/images/weather_disaster/1103.png b/static/images/weather_disaster/1103.png new file mode 100644 index 0000000..7c06db9 --- /dev/null +++ b/static/images/weather_disaster/1103.png Binary files differ diff --git a/static/images/weather_disaster/1104.png b/static/images/weather_disaster/1104.png new file mode 100644 index 0000000..ba006c0 --- /dev/null +++ b/static/images/weather_disaster/1104.png Binary files differ diff --git a/static/images/weather_disaster/1201.png b/static/images/weather_disaster/1201.png new file mode 100644 index 0000000..8dab8ed --- /dev/null +++ b/static/images/weather_disaster/1201.png Binary files differ diff --git a/static/images/weather_disaster/1202.png b/static/images/weather_disaster/1202.png new file mode 100644 index 0000000..9b06503 --- /dev/null +++ b/static/images/weather_disaster/1202.png Binary files differ diff --git a/static/images/weather_disaster/1203.png b/static/images/weather_disaster/1203.png new file mode 100644 index 0000000..9c1449e --- /dev/null +++ b/static/images/weather_disaster/1203.png Binary files differ diff --git a/static/images/weather_disaster/1204.png b/static/images/weather_disaster/1204.png new file mode 100644 index 0000000..f6b2e8e --- /dev/null +++ b/static/images/weather_disaster/1204.png Binary files differ diff --git a/static/images/weather_disaster/1301.png b/static/images/weather_disaster/1301.png new file mode 100644 index 0000000..b0958cf --- /dev/null +++ b/static/images/weather_disaster/1301.png Binary files differ diff --git a/static/images/weather_disaster/1302.png b/static/images/weather_disaster/1302.png new file mode 100644 index 0000000..52f8dd7 --- /dev/null +++ b/static/images/weather_disaster/1302.png Binary files differ diff --git a/static/images/weather_disaster/1303.png b/static/images/weather_disaster/1303.png new file mode 100644 index 0000000..1888f89 --- /dev/null +++ b/static/images/weather_disaster/1303.png Binary files differ diff --git a/static/images/weather_disaster/1304.png b/static/images/weather_disaster/1304.png new file mode 100644 index 0000000..78cd75d --- /dev/null +++ b/static/images/weather_disaster/1304.png Binary files differ diff --git a/static/images/weather_disaster/1401.png b/static/images/weather_disaster/1401.png new file mode 100644 index 0000000..7a1d360 --- /dev/null +++ b/static/images/weather_disaster/1401.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/static/images/weather_disaster/1101.png b/static/images/weather_disaster/1101.png new file mode 100644 index 0000000..0502be0 --- /dev/null +++ b/static/images/weather_disaster/1101.png Binary files differ diff --git a/static/images/weather_disaster/1102.png b/static/images/weather_disaster/1102.png new file mode 100644 index 0000000..f76aff3 --- /dev/null +++ b/static/images/weather_disaster/1102.png Binary files differ diff --git a/static/images/weather_disaster/1103.png b/static/images/weather_disaster/1103.png new file mode 100644 index 0000000..7c06db9 --- /dev/null +++ b/static/images/weather_disaster/1103.png Binary files differ diff --git a/static/images/weather_disaster/1104.png b/static/images/weather_disaster/1104.png new file mode 100644 index 0000000..ba006c0 --- /dev/null +++ b/static/images/weather_disaster/1104.png Binary files differ diff --git a/static/images/weather_disaster/1201.png b/static/images/weather_disaster/1201.png new file mode 100644 index 0000000..8dab8ed --- /dev/null +++ b/static/images/weather_disaster/1201.png Binary files differ diff --git a/static/images/weather_disaster/1202.png b/static/images/weather_disaster/1202.png new file mode 100644 index 0000000..9b06503 --- /dev/null +++ b/static/images/weather_disaster/1202.png Binary files differ diff --git a/static/images/weather_disaster/1203.png b/static/images/weather_disaster/1203.png new file mode 100644 index 0000000..9c1449e --- /dev/null +++ b/static/images/weather_disaster/1203.png Binary files differ diff --git a/static/images/weather_disaster/1204.png b/static/images/weather_disaster/1204.png new file mode 100644 index 0000000..f6b2e8e --- /dev/null +++ b/static/images/weather_disaster/1204.png Binary files differ diff --git a/static/images/weather_disaster/1301.png b/static/images/weather_disaster/1301.png new file mode 100644 index 0000000..b0958cf --- /dev/null +++ b/static/images/weather_disaster/1301.png Binary files differ diff --git a/static/images/weather_disaster/1302.png b/static/images/weather_disaster/1302.png new file mode 100644 index 0000000..52f8dd7 --- /dev/null +++ b/static/images/weather_disaster/1302.png Binary files differ diff --git a/static/images/weather_disaster/1303.png b/static/images/weather_disaster/1303.png new file mode 100644 index 0000000..1888f89 --- /dev/null +++ b/static/images/weather_disaster/1303.png Binary files differ diff --git a/static/images/weather_disaster/1304.png b/static/images/weather_disaster/1304.png new file mode 100644 index 0000000..78cd75d --- /dev/null +++ b/static/images/weather_disaster/1304.png Binary files differ diff --git a/static/images/weather_disaster/1401.png b/static/images/weather_disaster/1401.png new file mode 100644 index 0000000..7a1d360 --- /dev/null +++ b/static/images/weather_disaster/1401.png Binary files differ diff --git a/static/images/weather_disaster/1402.png b/static/images/weather_disaster/1402.png new file mode 100644 index 0000000..5303515 --- /dev/null +++ b/static/images/weather_disaster/1402.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/static/images/weather_disaster/1101.png b/static/images/weather_disaster/1101.png new file mode 100644 index 0000000..0502be0 --- /dev/null +++ b/static/images/weather_disaster/1101.png Binary files differ diff --git a/static/images/weather_disaster/1102.png b/static/images/weather_disaster/1102.png new file mode 100644 index 0000000..f76aff3 --- /dev/null +++ b/static/images/weather_disaster/1102.png Binary files differ diff --git a/static/images/weather_disaster/1103.png b/static/images/weather_disaster/1103.png new file mode 100644 index 0000000..7c06db9 --- /dev/null +++ b/static/images/weather_disaster/1103.png Binary files differ diff --git a/static/images/weather_disaster/1104.png b/static/images/weather_disaster/1104.png new file mode 100644 index 0000000..ba006c0 --- /dev/null +++ b/static/images/weather_disaster/1104.png Binary files differ diff --git a/static/images/weather_disaster/1201.png b/static/images/weather_disaster/1201.png new file mode 100644 index 0000000..8dab8ed --- /dev/null +++ b/static/images/weather_disaster/1201.png Binary files differ diff --git a/static/images/weather_disaster/1202.png b/static/images/weather_disaster/1202.png new file mode 100644 index 0000000..9b06503 --- /dev/null +++ b/static/images/weather_disaster/1202.png Binary files differ diff --git a/static/images/weather_disaster/1203.png b/static/images/weather_disaster/1203.png new file mode 100644 index 0000000..9c1449e --- /dev/null +++ b/static/images/weather_disaster/1203.png Binary files differ diff --git a/static/images/weather_disaster/1204.png b/static/images/weather_disaster/1204.png new file mode 100644 index 0000000..f6b2e8e --- /dev/null +++ b/static/images/weather_disaster/1204.png Binary files differ diff --git a/static/images/weather_disaster/1301.png b/static/images/weather_disaster/1301.png new file mode 100644 index 0000000..b0958cf --- /dev/null +++ b/static/images/weather_disaster/1301.png Binary files differ diff --git a/static/images/weather_disaster/1302.png b/static/images/weather_disaster/1302.png new file mode 100644 index 0000000..52f8dd7 --- /dev/null +++ b/static/images/weather_disaster/1302.png Binary files differ diff --git a/static/images/weather_disaster/1303.png b/static/images/weather_disaster/1303.png new file mode 100644 index 0000000..1888f89 --- /dev/null +++ b/static/images/weather_disaster/1303.png Binary files differ diff --git a/static/images/weather_disaster/1304.png b/static/images/weather_disaster/1304.png new file mode 100644 index 0000000..78cd75d --- /dev/null +++ b/static/images/weather_disaster/1304.png Binary files differ diff --git a/static/images/weather_disaster/1401.png b/static/images/weather_disaster/1401.png new file mode 100644 index 0000000..7a1d360 --- /dev/null +++ b/static/images/weather_disaster/1401.png Binary files differ diff --git a/static/images/weather_disaster/1402.png b/static/images/weather_disaster/1402.png new file mode 100644 index 0000000..5303515 --- /dev/null +++ b/static/images/weather_disaster/1402.png Binary files differ diff --git a/static/images/weather_disaster/1403.png b/static/images/weather_disaster/1403.png new file mode 100644 index 0000000..e4efb1a --- /dev/null +++ b/static/images/weather_disaster/1403.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/static/images/weather_disaster/1101.png b/static/images/weather_disaster/1101.png new file mode 100644 index 0000000..0502be0 --- /dev/null +++ b/static/images/weather_disaster/1101.png Binary files differ diff --git a/static/images/weather_disaster/1102.png b/static/images/weather_disaster/1102.png new file mode 100644 index 0000000..f76aff3 --- /dev/null +++ b/static/images/weather_disaster/1102.png Binary files differ diff --git a/static/images/weather_disaster/1103.png b/static/images/weather_disaster/1103.png new file mode 100644 index 0000000..7c06db9 --- /dev/null +++ b/static/images/weather_disaster/1103.png Binary files differ diff --git a/static/images/weather_disaster/1104.png b/static/images/weather_disaster/1104.png new file mode 100644 index 0000000..ba006c0 --- /dev/null +++ b/static/images/weather_disaster/1104.png Binary files differ diff --git a/static/images/weather_disaster/1201.png b/static/images/weather_disaster/1201.png new file mode 100644 index 0000000..8dab8ed --- /dev/null +++ b/static/images/weather_disaster/1201.png Binary files differ diff --git a/static/images/weather_disaster/1202.png b/static/images/weather_disaster/1202.png new file mode 100644 index 0000000..9b06503 --- /dev/null +++ b/static/images/weather_disaster/1202.png Binary files differ diff --git a/static/images/weather_disaster/1203.png b/static/images/weather_disaster/1203.png new file mode 100644 index 0000000..9c1449e --- /dev/null +++ b/static/images/weather_disaster/1203.png Binary files differ diff --git a/static/images/weather_disaster/1204.png b/static/images/weather_disaster/1204.png new file mode 100644 index 0000000..f6b2e8e --- /dev/null +++ b/static/images/weather_disaster/1204.png Binary files differ diff --git a/static/images/weather_disaster/1301.png b/static/images/weather_disaster/1301.png new file mode 100644 index 0000000..b0958cf --- /dev/null +++ b/static/images/weather_disaster/1301.png Binary files differ diff --git a/static/images/weather_disaster/1302.png b/static/images/weather_disaster/1302.png new file mode 100644 index 0000000..52f8dd7 --- /dev/null +++ b/static/images/weather_disaster/1302.png Binary files differ diff --git a/static/images/weather_disaster/1303.png b/static/images/weather_disaster/1303.png new file mode 100644 index 0000000..1888f89 --- /dev/null +++ b/static/images/weather_disaster/1303.png Binary files differ diff --git a/static/images/weather_disaster/1304.png b/static/images/weather_disaster/1304.png new file mode 100644 index 0000000..78cd75d --- /dev/null +++ b/static/images/weather_disaster/1304.png Binary files differ diff --git a/static/images/weather_disaster/1401.png b/static/images/weather_disaster/1401.png new file mode 100644 index 0000000..7a1d360 --- /dev/null +++ b/static/images/weather_disaster/1401.png Binary files differ diff --git a/static/images/weather_disaster/1402.png b/static/images/weather_disaster/1402.png new file mode 100644 index 0000000..5303515 --- /dev/null +++ b/static/images/weather_disaster/1402.png Binary files differ diff --git a/static/images/weather_disaster/1403.png b/static/images/weather_disaster/1403.png new file mode 100644 index 0000000..e4efb1a --- /dev/null +++ b/static/images/weather_disaster/1403.png Binary files differ diff --git a/static/images/weather_disaster/1404.png b/static/images/weather_disaster/1404.png new file mode 100644 index 0000000..20a7743 --- /dev/null +++ b/static/images/weather_disaster/1404.png Binary files differ diff --git a/src/api/weather.js b/src/api/weather.js new file mode 100644 index 0000000..ff56e3f --- /dev/null +++ b/src/api/weather.js @@ -0,0 +1,20 @@ +/** + * 天气接口 + */ +import request from '@/utils/request' +// 气象预报列表 +export function getWeatherList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} +// 气象灾害列表 +export function getDisasterList(params) { + return request({ + url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', + method: 'get', + params + }) +} diff --git a/src/icons/svg/icon-all.svg b/src/icons/svg/icon-all.svg new file mode 100644 index 0000000..d0d1f70 --- /dev/null +++ b/src/icons/svg/icon-all.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-construction.svg b/src/icons/svg/icon-construction.svg new file mode 100644 index 0000000..f1994bc --- /dev/null +++ b/src/icons/svg/icon-construction.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-disaster.svg b/src/icons/svg/icon-disaster.svg new file mode 100644 index 0000000..a5b45fe --- /dev/null +++ b/src/icons/svg/icon-disaster.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-need.svg b/src/icons/svg/icon-need.svg new file mode 100644 index 0000000..356868b --- /dev/null +++ b/src/icons/svg/icon-need.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-people.svg b/src/icons/svg/icon-people.svg new file mode 100644 index 0000000..1547c84 --- /dev/null +++ b/src/icons/svg/icon-people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-route.svg b/src/icons/svg/icon-route.svg new file mode 100644 index 0000000..e395481 --- /dev/null +++ b/src/icons/svg/icon-route.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-sink.svg b/src/icons/svg/icon-sink.svg new file mode 100644 index 0000000..19edcf1 --- /dev/null +++ b/src/icons/svg/icon-sink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-storage.svg b/src/icons/svg/icon-storage.svg new file mode 100644 index 0000000..b2f4ef4 --- /dev/null +++ b/src/icons/svg/icon-storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-supply.svg b/src/icons/svg/icon-supply.svg new file mode 100644 index 0000000..665c11b --- /dev/null +++ b/src/icons/svg/icon-supply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-weather.svg b/src/icons/svg/icon-weather.svg new file mode 100644 index 0000000..555f6cf --- /dev/null +++ b/src/icons/svg/icon-weather.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/well-gas.svg b/src/icons/svg/well-gas.svg deleted file mode 100644 index 50cdd83..0000000 --- a/src/icons/svg/well-gas.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-heat.svg b/src/icons/svg/well-heat.svg deleted file mode 100644 index baee123..0000000 --- a/src/icons/svg/well-heat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-power.svg b/src/icons/svg/well-power.svg deleted file mode 100644 index e731bcd..0000000 --- a/src/icons/svg/well-power.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-rain.svg b/src/icons/svg/well-rain.svg deleted file mode 100644 index f2ef906..0000000 --- a/src/icons/svg/well-rain.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/icons/svg/well-sewage.svg b/src/icons/svg/well-sewage.svg deleted file mode 100644 index a9a1662..0000000 --- a/src/icons/svg/well-sewage.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/layout/layoutMap.vue b/src/layout/layoutMap.vue new file mode 100644 index 0000000..4a1a377 --- /dev/null +++ b/src/layout/layoutMap.vue @@ -0,0 +1,47 @@ + + + + + + diff --git a/src/permission.js b/src/permission.js index aca4864..ef85c55 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,7 +8,7 @@ NProgress.configure({ showSpinner: false })// NProgress configuration -const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip'] // 不重定向白名单 +const whiteList = ['/login', 'config/baseconfig', '/full/storageTopic', '/full/waterThreat', '/full/highConsequence', '/full/constructionThreat', '/full/waterThreat', '/full/sinkThreat', '/full/vip', '/full/weather'] // 不重定向白名单 // 全局钩子 router.beforeEach((to, from, next) => { NProgress.start() // 加载进度条 diff --git a/src/router/index.js b/src/router/index.js index 7d0cec7..d7563ae 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -60,34 +60,70 @@ }, { path: '/full/storageTopic', - name: 'StorageTopic', + name: 'FullStorageTopic', component: () => import('@/views/maps/storageTopic'), meta: { title: '储备专题', icon: '' } }, { path: '/full/constructionThreat', - name: 'ConstructionThreat', + name: 'FullConstructionThreat', component: () => import('@/views/maps/constructionThreat'), meta: { title: '第三方施工', icon: '' } }, { path: '/full/waterThreat', - name: 'WaterThreat', + name: 'FullWaterThreat', component: () => import('@/views/maps/waterThreat'), meta: { title: '水保隐患', icon: '' } }, { path: '/full/sinkThreat', - name: 'SinkThreat', + name: 'FullSinkThreat', component: () => import('@/views/maps/sinkThreat'), meta: { title: '塌陷专题', icon: '' } }, { path: '/full/vip', - name: 'Vip', + name: 'FullVip', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } }, + { + path: '/full/weather', + name: 'FullWeatherTopic', + component: () => import('@/views/maps/weatherTopic'), + meta: { title: '气象专题', icon: '' } + }, + { + path: '/full/routeTopic', + name: 'FullRouteTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '巡线专题', icon: '' } + }, + { + path: '/full/supplyTopic', + name: 'FullSupplyTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '供应专题', icon: '' } + }, + { + path: '/full/needTopic', + name: 'FullNeedTopic', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '需求专题', icon: '' } + }, + { + path: '/full/pipeOverview', + name: 'FullPipeOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '管网分布', icon: '' } + }, + { + path: '/full/overview', + name: 'FullOverview', + component: () => import('@/views/maps/storageTopic'), + meta: { title: '综合业务', icon: '' } + }, // 九宫格 { path: '/dashboard', component: () => import('@/views/dashboard/index'), hidden: true } ] diff --git a/src/router/modules/marsMap.js b/src/router/modules/marsMap.js index c17ce8d..e4027ad 100644 --- a/src/router/modules/marsMap.js +++ b/src/router/modules/marsMap.js @@ -74,7 +74,7 @@ }, { path: '/weatherTopic', name: 'WeatherTopic', - component: () => import('@/views/maps/mapOverview'), + component: () => import('@/views/maps/weatherTopic'), meta: { title: '气象专题', icon: '' } }, { path: '/pipeTopic', @@ -106,6 +106,11 @@ name: 'vipTopic', component: () => import('@/views/maps/vip'), meta: { title: '重点用户', icon: '' } + }, { + path: '/routeTopic', + name: 'routeTopic', + component: () => import('@/views/maps/routeTopic'), + meta: { title: '巡线专题', icon: '' } } ] } diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index f06a24d..235ddca 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -62,13 +62,20 @@ this.$store.commit('SET_SYSTEM', system) // 判断是外部链接还是本项目的路由 if (system.url.indexOf('http') > -1) { + // 跳转数据中台的 + const params = '?token=' + this.$store.getters.token + '&url=' + system.url + const loginUrl = 'http://172.26.2.128:9001/sso/integrationConfig/login' + // window.location.href = loginUrl + params + window.open(loginUrl + params, '_blank') // 取token - const params = '?token=' + this.$store.getters.token - if (this.baseConfig.sameWindow) { - window.location.href = system.url + params - } else { - window.open(system.url + params, '_blank') - } + // const params = '?token=' + this.$store.getters.token + // if (this.baseConfig.sameWindow) { + // window.location.href = system.url + params + // } else { + // window.open(system.url + params, '_blank') + // } + } else if (system.url === '/dataMiddlePlatform') { // 数据中台 + } else { this.$router.push(system.url) } @@ -178,10 +185,13 @@ width:33.333%; height:33.33%; text-align: center; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; color: white; .icon-div{ - height: $iconheight; - padding-top: 20px; + padding-bottom: 20px; font-size:55px; } .system-title-div{ diff --git a/src/views/maps/components/selectRoute.vue b/src/views/maps/components/selectRoute.vue new file mode 100644 index 0000000..18f554b --- /dev/null +++ b/src/views/maps/components/selectRoute.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/views/maps/routeTopic.vue b/src/views/maps/routeTopic.vue new file mode 100644 index 0000000..2e99a0e --- /dev/null +++ b/src/views/maps/routeTopic.vue @@ -0,0 +1,394 @@ + + + + + + diff --git a/src/views/maps/waterThreat.vue b/src/views/maps/waterThreat.vue index 8070d15..0a43a4e 100644 --- a/src/views/maps/waterThreat.vue +++ b/src/views/maps/waterThreat.vue @@ -4,13 +4,7 @@ * @Date: 2021-04-07 --> + + + + diff --git a/static/config/config.json b/static/config/config.json index a21b33a..4639b1e 100644 --- a/static/config/config.json +++ b/static/config/config.json @@ -2,7 +2,7 @@ "map3d": { "scene":{ - "center": {"lat":32.200579,"lng":112.765464,"alt":445072,"heading":353,"pitch":-42}, + "center": {"lat":30.751283,"lng":112.688215,"alt":605050,"heading":353,"pitch":-42}, "shadows":false, "removeDblClick":true, "sceneMode": 3, diff --git a/static/config/weather.json b/static/config/weather.json new file mode 100644 index 0000000..64a0e07 --- /dev/null +++ b/static/config/weather.json @@ -0,0 +1,105 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "wg":14, + "wd":8, + "lng":112.549248, + "lat":37.857014, + "tqxx12": "晴", + "tqxx24": "晴" + + }, + { + "name": "大同市", + "wg":17, + "wd":2, + "lng":113.295258, + "lat":40.090309, + "tqxx12": "多云", + "tqxx24": "多云" + }, + { + "name": "阳泉市", + "wg":17, + "wd":7, + "lng":113.583282, + "lat":37.861187, + "tqxx12": "阴", + "tqxx24": "阴" + }, + { + "name": "晋中市", + "wg":16, + "wd":7, + "lng":112.736465, + "lat":37.696495, + "tqxx12": "雨", + "tqxx24": "雨" + }, + { + "name": "长治市", + "wg":15, + "wd":6, + "lng":113.113556, + "lat":36.191113, + "tqxx12": "小雨", + "tqxx24": "小雨" + }, + { + "name": "晋城市", + "wg":15, + "wd":8, + "lng":112.851273, + "lat":35.497555, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "临汾", + "wg":19, + "wd":10, + "lng":111.517975, + "lat":36.084148, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "运城", + "wg":18, + "wd":10, + "lng":111.00396, + "lat":35.022778, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "朔州市", + "wg":14, + "wd":5, + "lng":112.433388, + "lat":39.331261, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "忻州市", + "wg":14, + "wd":5, + "lng":112.733536, + "lat":38.41769, + "tqxx12": "晴", + "tqxx24": "晴" + }, + { + "name": "吕梁市", + "wg":14, + "wd":8, + "lng":111.134338, + "lat":37.524364, + "tqxx12": "晴", + "tqxx24": "晴" + } + ] +} diff --git a/static/config/weatherDisaster.json b/static/config/weatherDisaster.json new file mode 100644 index 0000000..5a83fe2 --- /dev/null +++ b/static/config/weatherDisaster.json @@ -0,0 +1,94 @@ +{ + "code": 200, + "data": [ + { + "name": "太原市", + "value":"预警内容", + "lng":112.549248, + "lat":37.857014, + "zhlx": "大雾", + "zhdj": "蓝色" + + }, + { + "name": "大同市", + "value":"预警内容", + "lng":113.295258, + "lat":40.090309, + "zhlx": "寒潮", + "zhdj": "蓝色" + }, + { + "name": "阳泉市", + "value":"预警内容", + "lng":113.583282, + "lat":37.861187, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋中市", + "value":"预警内容", + "lng":112.736465, + "lat":37.696495, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "长治市", + "value":"预警内容", + "lng":113.113556, + "lat":36.191113, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "晋城市", + "value":"预警内容", + "lng":112.851273, + "lat":35.497555, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "临汾", + "value":"预警内容", + "lng":111.517975, + "lat":36.084148, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "运城", + "value":"预警内容", + "lng":111.00396, + "lat":35.022778, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "朔州市", + "value":"预警内容", + "lng":112.433388, + "lat":39.331261, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "忻州市", + "value":"预警内容", + "lng":112.733536, + "lat":38.41769, + "zhlx": "霜冻", + "zhdj": "蓝色" + }, + { + "name": "吕梁市", + "value":"预警内容", + "lng":111.134338, + "lat":37.524364, + "zhlx": "霜冻", + "zhdj": "蓝色" + } + ] +} diff --git a/static/images/map/weather-duoyun.png b/static/images/map/weather-duoyun.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather-qing.png b/static/images/map/weather-qing.png new file mode 100644 index 0000000..b5e1a91 --- /dev/null +++ b/static/images/map/weather-qing.png Binary files differ diff --git a/static/images/map/weather-xiaoyu.png b/static/images/map/weather-xiaoyu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather-yin.png b/static/images/map/weather-yin.png new file mode 100644 index 0000000..703bbcf --- /dev/null +++ b/static/images/map/weather-yin.png Binary files differ diff --git a/static/images/map/weather-yu.png b/static/images/map/weather-yu.png new file mode 100644 index 0000000..0a54b10 --- /dev/null +++ b/static/images/map/weather-yu.png Binary files differ diff --git a/static/images/map/weather/weather-daxue.png b/static/images/map/weather/weather-daxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-daxue.png Binary files differ diff --git a/static/images/map/weather/weather-dayu.png b/static/images/map/weather/weather-dayu.png new file mode 100644 index 0000000..182631b --- /dev/null +++ b/static/images/map/weather/weather-dayu.png Binary files differ diff --git a/static/images/map/weather/weather-duoyun.png b/static/images/map/weather/weather-duoyun.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-duoyun.png Binary files differ diff --git a/static/images/map/weather/weather-qing.png b/static/images/map/weather/weather-qing.png new file mode 100644 index 0000000..d8ee803 --- /dev/null +++ b/static/images/map/weather/weather-qing.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoxue.png b/static/images/map/weather/weather-xiaoxue.png new file mode 100644 index 0000000..03dfd4c --- /dev/null +++ b/static/images/map/weather/weather-xiaoxue.png Binary files differ diff --git a/static/images/map/weather/weather-xiaoyu.png b/static/images/map/weather/weather-xiaoyu.png new file mode 100644 index 0000000..ebb1abe --- /dev/null +++ b/static/images/map/weather/weather-xiaoyu.png Binary files differ diff --git a/static/images/map/weather/weather-yin.png b/static/images/map/weather/weather-yin.png new file mode 100644 index 0000000..1b3e670 --- /dev/null +++ b/static/images/map/weather/weather-yin.png Binary files differ diff --git a/static/images/map/weather/weather-yujiaxue.png b/static/images/map/weather/weather-yujiaxue.png new file mode 100644 index 0000000..b2d8d9b --- /dev/null +++ b/static/images/map/weather/weather-yujiaxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongxue.png b/static/images/map/weather/weather-zhongxue.png new file mode 100644 index 0000000..84bbc09 --- /dev/null +++ b/static/images/map/weather/weather-zhongxue.png Binary files differ diff --git a/static/images/map/weather/weather-zhongyu.png b/static/images/map/weather/weather-zhongyu.png new file mode 100644 index 0000000..ef0ed4a --- /dev/null +++ b/static/images/map/weather/weather-zhongyu.png Binary files differ diff --git a/static/images/weather_disaster/0101.png b/static/images/weather_disaster/0101.png new file mode 100644 index 0000000..4476112 --- /dev/null +++ b/static/images/weather_disaster/0101.png Binary files differ diff --git a/static/images/weather_disaster/0102.png b/static/images/weather_disaster/0102.png new file mode 100644 index 0000000..e71b448 --- /dev/null +++ b/static/images/weather_disaster/0102.png Binary files differ diff --git a/static/images/weather_disaster/0103.png b/static/images/weather_disaster/0103.png new file mode 100644 index 0000000..9296d2a --- /dev/null +++ b/static/images/weather_disaster/0103.png Binary files differ diff --git a/static/images/weather_disaster/0104.png b/static/images/weather_disaster/0104.png new file mode 100644 index 0000000..2c617f6 --- /dev/null +++ b/static/images/weather_disaster/0104.png Binary files differ diff --git a/static/images/weather_disaster/0201.png b/static/images/weather_disaster/0201.png new file mode 100644 index 0000000..966662a --- /dev/null +++ b/static/images/weather_disaster/0201.png Binary files differ diff --git a/static/images/weather_disaster/0202.png b/static/images/weather_disaster/0202.png new file mode 100644 index 0000000..c50782a --- /dev/null +++ b/static/images/weather_disaster/0202.png Binary files differ diff --git a/static/images/weather_disaster/0203.png b/static/images/weather_disaster/0203.png new file mode 100644 index 0000000..529f41d --- /dev/null +++ b/static/images/weather_disaster/0203.png Binary files differ diff --git a/static/images/weather_disaster/0204.png b/static/images/weather_disaster/0204.png new file mode 100644 index 0000000..e12d819 --- /dev/null +++ b/static/images/weather_disaster/0204.png Binary files differ diff --git a/static/images/weather_disaster/0301.png b/static/images/weather_disaster/0301.png new file mode 100644 index 0000000..50e762b --- /dev/null +++ b/static/images/weather_disaster/0301.png Binary files differ diff --git a/static/images/weather_disaster/0302.png b/static/images/weather_disaster/0302.png new file mode 100644 index 0000000..a1dd2e5 --- /dev/null +++ b/static/images/weather_disaster/0302.png Binary files differ diff --git a/static/images/weather_disaster/0303.png b/static/images/weather_disaster/0303.png new file mode 100644 index 0000000..51f9313 --- /dev/null +++ b/static/images/weather_disaster/0303.png Binary files differ diff --git a/static/images/weather_disaster/0304.png b/static/images/weather_disaster/0304.png new file mode 100644 index 0000000..704c66e --- /dev/null +++ b/static/images/weather_disaster/0304.png Binary files differ diff --git a/static/images/weather_disaster/0401.png b/static/images/weather_disaster/0401.png new file mode 100644 index 0000000..048b63c --- /dev/null +++ b/static/images/weather_disaster/0401.png Binary files differ diff --git a/static/images/weather_disaster/0402.png b/static/images/weather_disaster/0402.png new file mode 100644 index 0000000..008607b --- /dev/null +++ b/static/images/weather_disaster/0402.png Binary files differ diff --git a/static/images/weather_disaster/0403.png b/static/images/weather_disaster/0403.png new file mode 100644 index 0000000..818f211 --- /dev/null +++ b/static/images/weather_disaster/0403.png Binary files differ diff --git a/static/images/weather_disaster/0404.png b/static/images/weather_disaster/0404.png new file mode 100644 index 0000000..4c080cf --- /dev/null +++ b/static/images/weather_disaster/0404.png Binary files differ diff --git a/static/images/weather_disaster/0501.png b/static/images/weather_disaster/0501.png new file mode 100644 index 0000000..17b1976 --- /dev/null +++ b/static/images/weather_disaster/0501.png Binary files differ diff --git a/static/images/weather_disaster/0502.png b/static/images/weather_disaster/0502.png new file mode 100644 index 0000000..9b46ae3 --- /dev/null +++ b/static/images/weather_disaster/0502.png Binary files differ diff --git a/static/images/weather_disaster/0503.png b/static/images/weather_disaster/0503.png new file mode 100644 index 0000000..5020ac0 --- /dev/null +++ b/static/images/weather_disaster/0503.png Binary files differ diff --git a/static/images/weather_disaster/0504.png b/static/images/weather_disaster/0504.png new file mode 100644 index 0000000..7058921 --- /dev/null +++ b/static/images/weather_disaster/0504.png Binary files differ diff --git a/static/images/weather_disaster/0601.png b/static/images/weather_disaster/0601.png new file mode 100644 index 0000000..ec7e6bc --- /dev/null +++ b/static/images/weather_disaster/0601.png Binary files differ diff --git a/static/images/weather_disaster/0602.png b/static/images/weather_disaster/0602.png new file mode 100644 index 0000000..e61c4df --- /dev/null +++ b/static/images/weather_disaster/0602.png Binary files differ diff --git a/static/images/weather_disaster/0603.png b/static/images/weather_disaster/0603.png new file mode 100644 index 0000000..8998eb2 --- /dev/null +++ b/static/images/weather_disaster/0603.png Binary files differ diff --git a/static/images/weather_disaster/0604.png b/static/images/weather_disaster/0604.png new file mode 100644 index 0000000..19ad440 --- /dev/null +++ b/static/images/weather_disaster/0604.png Binary files differ diff --git a/static/images/weather_disaster/0701.png b/static/images/weather_disaster/0701.png new file mode 100644 index 0000000..0cc64ad --- /dev/null +++ b/static/images/weather_disaster/0701.png Binary files differ diff --git a/static/images/weather_disaster/0702.png b/static/images/weather_disaster/0702.png new file mode 100644 index 0000000..472fd19 --- /dev/null +++ b/static/images/weather_disaster/0702.png Binary files differ diff --git a/static/images/weather_disaster/0703.png b/static/images/weather_disaster/0703.png new file mode 100644 index 0000000..fd83e6e --- /dev/null +++ b/static/images/weather_disaster/0703.png Binary files differ diff --git a/static/images/weather_disaster/0704.png b/static/images/weather_disaster/0704.png new file mode 100644 index 0000000..31edb5d --- /dev/null +++ b/static/images/weather_disaster/0704.png Binary files differ diff --git a/static/images/weather_disaster/0801.png b/static/images/weather_disaster/0801.png new file mode 100644 index 0000000..486cc71 --- /dev/null +++ b/static/images/weather_disaster/0801.png Binary files differ diff --git a/static/images/weather_disaster/0802.png b/static/images/weather_disaster/0802.png new file mode 100644 index 0000000..749facd --- /dev/null +++ b/static/images/weather_disaster/0802.png Binary files differ diff --git a/static/images/weather_disaster/0803.png b/static/images/weather_disaster/0803.png new file mode 100644 index 0000000..c36a8ee --- /dev/null +++ b/static/images/weather_disaster/0803.png Binary files differ diff --git a/static/images/weather_disaster/0804.png b/static/images/weather_disaster/0804.png new file mode 100644 index 0000000..a25a921 --- /dev/null +++ b/static/images/weather_disaster/0804.png Binary files differ diff --git a/static/images/weather_disaster/0901.png b/static/images/weather_disaster/0901.png new file mode 100644 index 0000000..dc8dbe8 --- /dev/null +++ b/static/images/weather_disaster/0901.png Binary files differ diff --git a/static/images/weather_disaster/0902.png b/static/images/weather_disaster/0902.png new file mode 100644 index 0000000..582cf83 --- /dev/null +++ b/static/images/weather_disaster/0902.png Binary files differ diff --git a/static/images/weather_disaster/0903.png b/static/images/weather_disaster/0903.png new file mode 100644 index 0000000..a8a10db --- /dev/null +++ b/static/images/weather_disaster/0903.png Binary files differ diff --git a/static/images/weather_disaster/0904.png b/static/images/weather_disaster/0904.png new file mode 100644 index 0000000..68745a8 --- /dev/null +++ b/static/images/weather_disaster/0904.png Binary files differ diff --git a/static/images/weather_disaster/1001.png b/static/images/weather_disaster/1001.png new file mode 100644 index 0000000..ae47ae6 --- /dev/null +++ b/static/images/weather_disaster/1001.png Binary files differ diff --git a/static/images/weather_disaster/1002.png b/static/images/weather_disaster/1002.png new file mode 100644 index 0000000..cb2b4bb --- /dev/null +++ b/static/images/weather_disaster/1002.png Binary files differ diff --git a/static/images/weather_disaster/1003.png b/static/images/weather_disaster/1003.png new file mode 100644 index 0000000..62cb881 --- /dev/null +++ b/static/images/weather_disaster/1003.png Binary files differ diff --git a/static/images/weather_disaster/1004.png b/static/images/weather_disaster/1004.png new file mode 100644 index 0000000..7a5aea5 --- /dev/null +++ b/static/images/weather_disaster/1004.png Binary files differ diff --git a/static/images/weather_disaster/1101.png b/static/images/weather_disaster/1101.png new file mode 100644 index 0000000..0502be0 --- /dev/null +++ b/static/images/weather_disaster/1101.png Binary files differ diff --git a/static/images/weather_disaster/1102.png b/static/images/weather_disaster/1102.png new file mode 100644 index 0000000..f76aff3 --- /dev/null +++ b/static/images/weather_disaster/1102.png Binary files differ diff --git a/static/images/weather_disaster/1103.png b/static/images/weather_disaster/1103.png new file mode 100644 index 0000000..7c06db9 --- /dev/null +++ b/static/images/weather_disaster/1103.png Binary files differ diff --git a/static/images/weather_disaster/1104.png b/static/images/weather_disaster/1104.png new file mode 100644 index 0000000..ba006c0 --- /dev/null +++ b/static/images/weather_disaster/1104.png Binary files differ diff --git a/static/images/weather_disaster/1201.png b/static/images/weather_disaster/1201.png new file mode 100644 index 0000000..8dab8ed --- /dev/null +++ b/static/images/weather_disaster/1201.png Binary files differ diff --git a/static/images/weather_disaster/1202.png b/static/images/weather_disaster/1202.png new file mode 100644 index 0000000..9b06503 --- /dev/null +++ b/static/images/weather_disaster/1202.png Binary files differ diff --git a/static/images/weather_disaster/1203.png b/static/images/weather_disaster/1203.png new file mode 100644 index 0000000..9c1449e --- /dev/null +++ b/static/images/weather_disaster/1203.png Binary files differ diff --git a/static/images/weather_disaster/1204.png b/static/images/weather_disaster/1204.png new file mode 100644 index 0000000..f6b2e8e --- /dev/null +++ b/static/images/weather_disaster/1204.png Binary files differ diff --git a/static/images/weather_disaster/1301.png b/static/images/weather_disaster/1301.png new file mode 100644 index 0000000..b0958cf --- /dev/null +++ b/static/images/weather_disaster/1301.png Binary files differ diff --git a/static/images/weather_disaster/1302.png b/static/images/weather_disaster/1302.png new file mode 100644 index 0000000..52f8dd7 --- /dev/null +++ b/static/images/weather_disaster/1302.png Binary files differ diff --git a/static/images/weather_disaster/1303.png b/static/images/weather_disaster/1303.png new file mode 100644 index 0000000..1888f89 --- /dev/null +++ b/static/images/weather_disaster/1303.png Binary files differ diff --git a/static/images/weather_disaster/1304.png b/static/images/weather_disaster/1304.png new file mode 100644 index 0000000..78cd75d --- /dev/null +++ b/static/images/weather_disaster/1304.png Binary files differ diff --git a/static/images/weather_disaster/1401.png b/static/images/weather_disaster/1401.png new file mode 100644 index 0000000..7a1d360 --- /dev/null +++ b/static/images/weather_disaster/1401.png Binary files differ diff --git a/static/images/weather_disaster/1402.png b/static/images/weather_disaster/1402.png new file mode 100644 index 0000000..5303515 --- /dev/null +++ b/static/images/weather_disaster/1402.png Binary files differ diff --git a/static/images/weather_disaster/1403.png b/static/images/weather_disaster/1403.png new file mode 100644 index 0000000..e4efb1a --- /dev/null +++ b/static/images/weather_disaster/1403.png Binary files differ diff --git a/static/images/weather_disaster/1404.png b/static/images/weather_disaster/1404.png new file mode 100644 index 0000000..20a7743 --- /dev/null +++ b/static/images/weather_disaster/1404.png Binary files differ diff --git a/static/project.config.json b/static/project.config.json index 442fd57..35505b7 100644 --- a/static/project.config.json +++ b/static/project.config.json @@ -1,5 +1,5 @@ { - "title": "智慧燃气", + "title": "管理者驾驶舱", "baseUrl": "http://111.198.10.15:20403/cockpit/", "sameWindow": false, "city":"太原市",