diff --git a/package.json b/package.json index 9d5c107..80d9d28 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cockpit_hxrq_front", - "version": "3.9.0", + "version": "1.0.0", "license": "MIT", "description": "A vue Base Front with Element UI & axios & iconfont & permission control & lint", "author": "Stephanie", @@ -21,12 +21,13 @@ "element-ui": "2.12.0", "event-source-polyfill": "^1.0.5", "js-cookie": "2.2.0", + "js-md5": "^0.7.3", "jsencrypt": "^3.0.0-rc.1", "lodash": "^4.17.15", - "mars3d": "^3.0.19", - "mars3d-echarts": "^3.0.2", - "mars3d-heatmap": "^3.0.2", - "mars3d-mapv": "^3.0.2", + "mars3d": "^3.0.20", + "mars3d-echarts": "^3.0.3", + "mars3d-heatmap": "^3.0.5", + "mars3d-mapv": "^3.0.3", "mockjs": "1.0.1-beta3", "moment": "^2.24.0", "normalize.css": "7.0.0", diff --git a/package.json b/package.json index 9d5c107..80d9d28 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cockpit_hxrq_front", - "version": "3.9.0", + "version": "1.0.0", "license": "MIT", "description": "A vue Base Front with Element UI & axios & iconfont & permission control & lint", "author": "Stephanie", @@ -21,12 +21,13 @@ "element-ui": "2.12.0", "event-source-polyfill": "^1.0.5", "js-cookie": "2.2.0", + "js-md5": "^0.7.3", "jsencrypt": "^3.0.0-rc.1", "lodash": "^4.17.15", - "mars3d": "^3.0.19", - "mars3d-echarts": "^3.0.2", - "mars3d-heatmap": "^3.0.2", - "mars3d-mapv": "^3.0.2", + "mars3d": "^3.0.20", + "mars3d-echarts": "^3.0.3", + "mars3d-heatmap": "^3.0.5", + "mars3d-mapv": "^3.0.3", "mockjs": "1.0.1-beta3", "moment": "^2.24.0", "normalize.css": "7.0.0", diff --git a/src/api/common.js b/src/api/common.js index e98696c..7398c18 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -24,7 +24,7 @@ data: param }) } - +// 获取当前位置的天气 export function getWeather(city) { return request({ url: 'http://wthrcdn.etouch.cn/weather_mini?city=' + city, diff --git a/package.json b/package.json index 9d5c107..80d9d28 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cockpit_hxrq_front", - "version": "3.9.0", + "version": "1.0.0", "license": "MIT", "description": "A vue Base Front with Element UI & axios & iconfont & permission control & lint", "author": "Stephanie", @@ -21,12 +21,13 @@ "element-ui": "2.12.0", "event-source-polyfill": "^1.0.5", "js-cookie": "2.2.0", + "js-md5": "^0.7.3", "jsencrypt": "^3.0.0-rc.1", "lodash": "^4.17.15", - "mars3d": "^3.0.19", - "mars3d-echarts": "^3.0.2", - "mars3d-heatmap": "^3.0.2", - "mars3d-mapv": "^3.0.2", + "mars3d": "^3.0.20", + "mars3d-echarts": "^3.0.3", + "mars3d-heatmap": "^3.0.5", + "mars3d-mapv": "^3.0.3", "mockjs": "1.0.1-beta3", "moment": "^2.24.0", "normalize.css": "7.0.0", diff --git a/src/api/common.js b/src/api/common.js index e98696c..7398c18 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -24,7 +24,7 @@ data: param }) } - +// 获取当前位置的天气 export function getWeather(city) { return request({ url: 'http://wthrcdn.etouch.cn/weather_mini?city=' + city, diff --git a/src/api/hca.js b/src/api/hca.js new file mode 100644 index 0000000..3ff004a --- /dev/null +++ b/src/api/hca.js @@ -0,0 +1,24 @@ +/** + * 供需接口 + */ +import request from '@/utils/request' +import { getSignTimeStamp } from '@/utils/mathUtils' + +// 高后果区 +export function getHighConsequence() { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01', + 'indexId': '12E543420D824445B74D25B4E8DE1A5F', + 'type': 0, + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} diff --git a/package.json b/package.json index 9d5c107..80d9d28 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cockpit_hxrq_front", - "version": "3.9.0", + "version": "1.0.0", "license": "MIT", "description": "A vue Base Front with Element UI & axios & iconfont & permission control & lint", "author": "Stephanie", @@ -21,12 +21,13 @@ "element-ui": "2.12.0", "event-source-polyfill": "^1.0.5", "js-cookie": "2.2.0", + "js-md5": "^0.7.3", "jsencrypt": "^3.0.0-rc.1", "lodash": "^4.17.15", - "mars3d": "^3.0.19", - "mars3d-echarts": "^3.0.2", - "mars3d-heatmap": "^3.0.2", - "mars3d-mapv": "^3.0.2", + "mars3d": "^3.0.20", + "mars3d-echarts": "^3.0.3", + "mars3d-heatmap": "^3.0.5", + "mars3d-mapv": "^3.0.3", "mockjs": "1.0.1-beta3", "moment": "^2.24.0", "normalize.css": "7.0.0", diff --git a/src/api/common.js b/src/api/common.js index e98696c..7398c18 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -24,7 +24,7 @@ data: param }) } - +// 获取当前位置的天气 export function getWeather(city) { return request({ url: 'http://wthrcdn.etouch.cn/weather_mini?city=' + city, diff --git a/src/api/hca.js b/src/api/hca.js new file mode 100644 index 0000000..3ff004a --- /dev/null +++ b/src/api/hca.js @@ -0,0 +1,24 @@ +/** + * 供需接口 + */ +import request from '@/utils/request' +import { getSignTimeStamp } from '@/utils/mathUtils' + +// 高后果区 +export function getHighConsequence() { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01', + 'indexId': '12E543420D824445B74D25B4E8DE1A5F', + 'type': 0, + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} diff --git a/src/api/needSupply.js b/src/api/needSupply.js index 751d397..112ac9a 100644 --- a/src/api/needSupply.js +++ b/src/api/needSupply.js @@ -2,6 +2,7 @@ * 供需接口 */ import request from '@/utils/request' +import { getSignTimeStamp } from '@/utils/mathUtils' // 各地区供需数据 export function getAreaNeedSupply(params) { return request({ @@ -10,6 +11,53 @@ params }) } +// 各地区供给 +export function getAreaSupply(date) { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD01_01,WD09_05,DL01,DL02,DL03', + 'indexId': '56680A347AF44DAEB1286A7C69D97A2F', + 'type': 0, + 'conditionList': [ + [ + { + 'leftSymbolList': [ + '21' + ], + 'rightSymbolList': [ + '22', + '23' + ], + 'condition': '1', + 'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY', + 'key': 'WD01_01', + 'value': ['20210419'] + }, + { + 'leftSymbolList': [ + '21' + ], + 'rightSymbolList': [ + '22' + ], + 'condition': '7', + 'dimId': 'AECABF09DDD143E6A5A9621EF4AE1B8F', + 'key': 'WD09_05' + + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} // 各用户供需数据 export function getUserNeedSupply(params) { return request({ @@ -18,3 +66,32 @@ params }) } + +// 各用户供需数据 +export function getUserSupply(params) { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03', + 'indexId': '56680A347AF44DAEB1286A7C69D97A2F', + 'type': 0, + 'conditionList': [ + [ + { + 'condition': '1', + 'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY', + 'key': 'WD01_03', + 'value': ['2021-04-19'] + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} diff --git a/package.json b/package.json index 9d5c107..80d9d28 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cockpit_hxrq_front", - "version": "3.9.0", + "version": "1.0.0", "license": "MIT", "description": "A vue Base Front with Element UI & axios & iconfont & permission control & lint", "author": "Stephanie", @@ -21,12 +21,13 @@ "element-ui": "2.12.0", "event-source-polyfill": "^1.0.5", "js-cookie": "2.2.0", + "js-md5": "^0.7.3", "jsencrypt": "^3.0.0-rc.1", "lodash": "^4.17.15", - "mars3d": "^3.0.19", - "mars3d-echarts": "^3.0.2", - "mars3d-heatmap": "^3.0.2", - "mars3d-mapv": "^3.0.2", + "mars3d": "^3.0.20", + "mars3d-echarts": "^3.0.3", + "mars3d-heatmap": "^3.0.5", + "mars3d-mapv": "^3.0.3", "mockjs": "1.0.1-beta3", "moment": "^2.24.0", "normalize.css": "7.0.0", diff --git a/src/api/common.js b/src/api/common.js index e98696c..7398c18 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -24,7 +24,7 @@ data: param }) } - +// 获取当前位置的天气 export function getWeather(city) { return request({ url: 'http://wthrcdn.etouch.cn/weather_mini?city=' + city, diff --git a/src/api/hca.js b/src/api/hca.js new file mode 100644 index 0000000..3ff004a --- /dev/null +++ b/src/api/hca.js @@ -0,0 +1,24 @@ +/** + * 供需接口 + */ +import request from '@/utils/request' +import { getSignTimeStamp } from '@/utils/mathUtils' + +// 高后果区 +export function getHighConsequence() { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01', + 'indexId': '12E543420D824445B74D25B4E8DE1A5F', + 'type': 0, + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} diff --git a/src/api/needSupply.js b/src/api/needSupply.js index 751d397..112ac9a 100644 --- a/src/api/needSupply.js +++ b/src/api/needSupply.js @@ -2,6 +2,7 @@ * 供需接口 */ import request from '@/utils/request' +import { getSignTimeStamp } from '@/utils/mathUtils' // 各地区供需数据 export function getAreaNeedSupply(params) { return request({ @@ -10,6 +11,53 @@ params }) } +// 各地区供给 +export function getAreaSupply(date) { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD01_01,WD09_05,DL01,DL02,DL03', + 'indexId': '56680A347AF44DAEB1286A7C69D97A2F', + 'type': 0, + 'conditionList': [ + [ + { + 'leftSymbolList': [ + '21' + ], + 'rightSymbolList': [ + '22', + '23' + ], + 'condition': '1', + 'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY', + 'key': 'WD01_01', + 'value': ['20210419'] + }, + { + 'leftSymbolList': [ + '21' + ], + 'rightSymbolList': [ + '22' + ], + 'condition': '7', + 'dimId': 'AECABF09DDD143E6A5A9621EF4AE1B8F', + 'key': 'WD09_05' + + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} // 各用户供需数据 export function getUserNeedSupply(params) { return request({ @@ -18,3 +66,32 @@ params }) } + +// 各用户供需数据 +export function getUserSupply(params) { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03', + 'indexId': '56680A347AF44DAEB1286A7C69D97A2F', + 'type': 0, + 'conditionList': [ + [ + { + 'condition': '1', + 'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY', + 'key': 'WD01_03', + 'value': ['2021-04-19'] + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} diff --git a/src/api/pipe.js b/src/api/pipe.js new file mode 100644 index 0000000..e546790 --- /dev/null +++ b/src/api/pipe.js @@ -0,0 +1,60 @@ +/** + * 管网专题 + */ +import request from '@/utils/request' +import { getSignTimeStamp } from '@/utils/mathUtils' +// 地震列表 +export function getEarthquakeList(date) { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD53_09,WD53_05,WD53_06,WD53_07,WD53_08,WD53_04', + 'dimId': '330ADFB6E38049F5A9E0C46E6CCC304D', + 'distinct': true, + 'type': 1, + 'conditionList': [ + [ + { + 'condition': '3', + 'key': 'WD53_04', + 'indexDimValues': date + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} +// 巡线轨迹列表 +export function getRoutesData(date) { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12', + 'dimId': '459DEBAD30C14366AA65C957BBA76B09', + 'type': 1, + 'conditionList': [ + [ + { + 'condition': '3', + 'key': 'WD60_04', + 'indexDimValues': date + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} diff --git a/package.json b/package.json index 9d5c107..80d9d28 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cockpit_hxrq_front", - "version": "3.9.0", + "version": "1.0.0", "license": "MIT", "description": "A vue Base Front with Element UI & axios & iconfont & permission control & lint", "author": "Stephanie", @@ -21,12 +21,13 @@ "element-ui": "2.12.0", "event-source-polyfill": "^1.0.5", "js-cookie": "2.2.0", + "js-md5": "^0.7.3", "jsencrypt": "^3.0.0-rc.1", "lodash": "^4.17.15", - "mars3d": "^3.0.19", - "mars3d-echarts": "^3.0.2", - "mars3d-heatmap": "^3.0.2", - "mars3d-mapv": "^3.0.2", + "mars3d": "^3.0.20", + "mars3d-echarts": "^3.0.3", + "mars3d-heatmap": "^3.0.5", + "mars3d-mapv": "^3.0.3", "mockjs": "1.0.1-beta3", "moment": "^2.24.0", "normalize.css": "7.0.0", diff --git a/src/api/common.js b/src/api/common.js index e98696c..7398c18 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -24,7 +24,7 @@ data: param }) } - +// 获取当前位置的天气 export function getWeather(city) { return request({ url: 'http://wthrcdn.etouch.cn/weather_mini?city=' + city, diff --git a/src/api/hca.js b/src/api/hca.js new file mode 100644 index 0000000..3ff004a --- /dev/null +++ b/src/api/hca.js @@ -0,0 +1,24 @@ +/** + * 供需接口 + */ +import request from '@/utils/request' +import { getSignTimeStamp } from '@/utils/mathUtils' + +// 高后果区 +export function getHighConsequence() { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01', + 'indexId': '12E543420D824445B74D25B4E8DE1A5F', + 'type': 0, + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} diff --git a/src/api/needSupply.js b/src/api/needSupply.js index 751d397..112ac9a 100644 --- a/src/api/needSupply.js +++ b/src/api/needSupply.js @@ -2,6 +2,7 @@ * 供需接口 */ import request from '@/utils/request' +import { getSignTimeStamp } from '@/utils/mathUtils' // 各地区供需数据 export function getAreaNeedSupply(params) { return request({ @@ -10,6 +11,53 @@ params }) } +// 各地区供给 +export function getAreaSupply(date) { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD01_01,WD09_05,DL01,DL02,DL03', + 'indexId': '56680A347AF44DAEB1286A7C69D97A2F', + 'type': 0, + 'conditionList': [ + [ + { + 'leftSymbolList': [ + '21' + ], + 'rightSymbolList': [ + '22', + '23' + ], + 'condition': '1', + 'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY', + 'key': 'WD01_01', + 'value': ['20210419'] + }, + { + 'leftSymbolList': [ + '21' + ], + 'rightSymbolList': [ + '22' + ], + 'condition': '7', + 'dimId': 'AECABF09DDD143E6A5A9621EF4AE1B8F', + 'key': 'WD09_05' + + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} // 各用户供需数据 export function getUserNeedSupply(params) { return request({ @@ -18,3 +66,32 @@ params }) } + +// 各用户供需数据 +export function getUserSupply(params) { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03', + 'indexId': '56680A347AF44DAEB1286A7C69D97A2F', + 'type': 0, + 'conditionList': [ + [ + { + 'condition': '1', + 'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY', + 'key': 'WD01_03', + 'value': ['2021-04-19'] + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} diff --git a/src/api/pipe.js b/src/api/pipe.js new file mode 100644 index 0000000..e546790 --- /dev/null +++ b/src/api/pipe.js @@ -0,0 +1,60 @@ +/** + * 管网专题 + */ +import request from '@/utils/request' +import { getSignTimeStamp } from '@/utils/mathUtils' +// 地震列表 +export function getEarthquakeList(date) { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD53_09,WD53_05,WD53_06,WD53_07,WD53_08,WD53_04', + 'dimId': '330ADFB6E38049F5A9E0C46E6CCC304D', + 'distinct': true, + 'type': 1, + 'conditionList': [ + [ + { + 'condition': '3', + 'key': 'WD53_04', + 'indexDimValues': date + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} +// 巡线轨迹列表 +export function getRoutesData(date) { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12', + 'dimId': '459DEBAD30C14366AA65C957BBA76B09', + 'type': 1, + 'conditionList': [ + [ + { + 'condition': '3', + 'key': 'WD60_04', + 'indexDimValues': date + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} diff --git a/src/api/weather.js b/src/api/weather.js index 4a9ba5e..a4e8b65 100644 --- a/src/api/weather.js +++ b/src/api/weather.js @@ -2,27 +2,66 @@ * 天气接口 */ import request from '@/utils/request' +import { getSignTimeStamp } from '@/utils/mathUtils' // 气象预报列表 -export function getWeatherList(params) { +export function getWeatherList(date) { + const { sign, username, timestamp } = getSignTimeStamp() return request({ - url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', - method: 'get', - params + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD51_20,WD51_21,WD51_22,WD51_08,WD51_10,WD51_12,WD51_14,WD51_15', + 'dimId': '4608441E9BD449159E06E46DBC2495E0', + 'distinct': true, + 'type': 1, + 'conditionList': [ + [ + { + 'condition': '1', + 'key': 'WD51_08', + 'value': [date] + } + ], + [ + { + 'condition': '7', + 'key': 'WD51_21' + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } }) } // 气象灾害列表 -export function getDisasterList(params) { +export function getDisasterList(date) { + const { sign, username, timestamp } = getSignTimeStamp() return request({ - url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', - method: 'get', - params - }) -} -// 地震列表 -export function getEarthquakeList(params) { - return request({ - url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/earthquake/list', - method: 'get', - params + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD52_03,WD52_05,WD52_06,WD52_07,WD52_08,WD52_09,WD52_10,WD52_12,WD52_13', + 'dimId': '87A3F59488AA48EE9D336318B7E6A1B8', + 'distinct': true, + 'type': 1, + 'conditionList': [ + [ + { + 'condition': '3', + 'key': 'WD52_07', + 'indexDimValues': date + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } }) } diff --git a/package.json b/package.json index 9d5c107..80d9d28 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cockpit_hxrq_front", - "version": "3.9.0", + "version": "1.0.0", "license": "MIT", "description": "A vue Base Front with Element UI & axios & iconfont & permission control & lint", "author": "Stephanie", @@ -21,12 +21,13 @@ "element-ui": "2.12.0", "event-source-polyfill": "^1.0.5", "js-cookie": "2.2.0", + "js-md5": "^0.7.3", "jsencrypt": "^3.0.0-rc.1", "lodash": "^4.17.15", - "mars3d": "^3.0.19", - "mars3d-echarts": "^3.0.2", - "mars3d-heatmap": "^3.0.2", - "mars3d-mapv": "^3.0.2", + "mars3d": "^3.0.20", + "mars3d-echarts": "^3.0.3", + "mars3d-heatmap": "^3.0.5", + "mars3d-mapv": "^3.0.3", "mockjs": "1.0.1-beta3", "moment": "^2.24.0", "normalize.css": "7.0.0", diff --git a/src/api/common.js b/src/api/common.js index e98696c..7398c18 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -24,7 +24,7 @@ data: param }) } - +// 获取当前位置的天气 export function getWeather(city) { return request({ url: 'http://wthrcdn.etouch.cn/weather_mini?city=' + city, diff --git a/src/api/hca.js b/src/api/hca.js new file mode 100644 index 0000000..3ff004a --- /dev/null +++ b/src/api/hca.js @@ -0,0 +1,24 @@ +/** + * 供需接口 + */ +import request from '@/utils/request' +import { getSignTimeStamp } from '@/utils/mathUtils' + +// 高后果区 +export function getHighConsequence() { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD01_03,WD02_04,WD58_03,DES01,DES02,DES03,DES04,DES04,DES05,DES06,DES07,DES08,DES09,DES10,DES11,DES12,DL01', + 'indexId': '12E543420D824445B74D25B4E8DE1A5F', + 'type': 0, + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} diff --git a/src/api/needSupply.js b/src/api/needSupply.js index 751d397..112ac9a 100644 --- a/src/api/needSupply.js +++ b/src/api/needSupply.js @@ -2,6 +2,7 @@ * 供需接口 */ import request from '@/utils/request' +import { getSignTimeStamp } from '@/utils/mathUtils' // 各地区供需数据 export function getAreaNeedSupply(params) { return request({ @@ -10,6 +11,53 @@ params }) } +// 各地区供给 +export function getAreaSupply(date) { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD01_01,WD09_05,DL01,DL02,DL03', + 'indexId': '56680A347AF44DAEB1286A7C69D97A2F', + 'type': 0, + 'conditionList': [ + [ + { + 'leftSymbolList': [ + '21' + ], + 'rightSymbolList': [ + '22', + '23' + ], + 'condition': '1', + 'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY', + 'key': 'WD01_01', + 'value': ['20210419'] + }, + { + 'leftSymbolList': [ + '21' + ], + 'rightSymbolList': [ + '22' + ], + 'condition': '7', + 'dimId': 'AECABF09DDD143E6A5A9621EF4AE1B8F', + 'key': 'WD09_05' + + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} // 各用户供需数据 export function getUserNeedSupply(params) { return request({ @@ -18,3 +66,32 @@ params }) } + +// 各用户供需数据 +export function getUserSupply(params) { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD01_01,WD_01_03,WD02_01,WD02_03,WD02_04,WD02_05,WD_06,DL02,DL03', + 'indexId': '56680A347AF44DAEB1286A7C69D97A2F', + 'type': 0, + 'conditionList': [ + [ + { + 'condition': '1', + 'dimId': 'YEAR8MONTH8DAY66PACKINGDATA99DAY', + 'key': 'WD01_03', + 'value': ['2021-04-19'] + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} diff --git a/src/api/pipe.js b/src/api/pipe.js new file mode 100644 index 0000000..e546790 --- /dev/null +++ b/src/api/pipe.js @@ -0,0 +1,60 @@ +/** + * 管网专题 + */ +import request from '@/utils/request' +import { getSignTimeStamp } from '@/utils/mathUtils' +// 地震列表 +export function getEarthquakeList(date) { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD53_09,WD53_05,WD53_06,WD53_07,WD53_08,WD53_04', + 'dimId': '330ADFB6E38049F5A9E0C46E6CCC304D', + 'distinct': true, + 'type': 1, + 'conditionList': [ + [ + { + 'condition': '3', + 'key': 'WD53_04', + 'indexDimValues': date + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} +// 巡线轨迹列表 +export function getRoutesData(date) { + const { sign, username, timestamp } = getSignTimeStamp() + return request({ + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD60_03,WD60_04,WD60_05,WD60_06,WD60_08,WD60_09,WD60_10,WD60_11,WD60_12', + 'dimId': '459DEBAD30C14366AA65C957BBA76B09', + 'type': 1, + 'conditionList': [ + [ + { + 'condition': '3', + 'key': 'WD60_04', + 'indexDimValues': date + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } + }) +} diff --git a/src/api/weather.js b/src/api/weather.js index 4a9ba5e..a4e8b65 100644 --- a/src/api/weather.js +++ b/src/api/weather.js @@ -2,27 +2,66 @@ * 天气接口 */ import request from '@/utils/request' +import { getSignTimeStamp } from '@/utils/mathUtils' // 气象预报列表 -export function getWeatherList(params) { +export function getWeatherList(date) { + const { sign, username, timestamp } = getSignTimeStamp() return request({ - url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', - method: 'get', - params + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD51_20,WD51_21,WD51_22,WD51_08,WD51_10,WD51_12,WD51_14,WD51_15', + 'dimId': '4608441E9BD449159E06E46DBC2495E0', + 'distinct': true, + 'type': 1, + 'conditionList': [ + [ + { + 'condition': '1', + 'key': 'WD51_08', + 'value': [date] + } + ], + [ + { + 'condition': '7', + 'key': 'WD51_21' + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } }) } // 气象灾害列表 -export function getDisasterList(params) { +export function getDisasterList(date) { + const { sign, username, timestamp } = getSignTimeStamp() return request({ - url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/weather/disaster', - method: 'get', - params - }) -} -// 地震列表 -export function getEarthquakeList(params) { - return request({ - url: 'http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/earthquake/list', - method: 'get', - params + url: 'http://172.26.2.128:9001/factdata/index/getData', + method: 'post', + data: { + 'showField': 'WD52_03,WD52_05,WD52_06,WD52_07,WD52_08,WD52_09,WD52_10,WD52_12,WD52_13', + 'dimId': '87A3F59488AA48EE9D336318B7E6A1B8', + 'distinct': true, + 'type': 1, + 'conditionList': [ + [ + { + 'condition': '3', + 'key': 'WD52_07', + 'indexDimValues': date + } + ] + ], + 'pageNo': null, + 'pageSize': null, + 'sign': sign, + 'name': username, + 'time': timestamp + } }) } diff --git a/src/components/Map/MarsMap.vue b/src/components/Map/MarsMap.vue index 85748f0..815e3c7 100644 --- a/src/components/Map/MarsMap.vue +++ b/src/components/Map/MarsMap.vue @@ -8,6 +8,7 @@