diff --git a/.env.development b/.env.development new file mode 100644 index 0000000..ca1caa1 --- /dev/null +++ b/.env.development @@ -0,0 +1 @@ +PUBLIC_URL=/mcfxkh \ No newline at end of file diff --git a/.env.production b/.env.production index 4f79a0f..cb1a996 100644 --- a/.env.production +++ b/.env.production @@ -1 +1,2 @@ +PUBLIC_URL=/mcfxkh GENERATE_SOURCEMAP=false \ No newline at end of file diff --git a/src/models/apiurl.js b/src/models/apiurl.js index c9cfb39..4e71667 100644 --- a/src/models/apiurl.js +++ b/src/models/apiurl.js @@ -6,35 +6,36 @@ const pubapi = 'http://owrsvr.cloudowr.cn/pubapi'; const DEBUG_YJ = config.isShYjDebug ? '?debug=1' : '?debug=0'; const yj_folder_test = './yj_folder'; +const Url = 'http://mcfxkh3.cloudowr.cn' const apiurl = { yj_folder_test, - yj_folder: '/service/yj_folder', + yj_folder: Url+'/service/yj_folder', upgramurl: { login: { - auth: '/service/sys/users/login', + auth: Url+'/service/sys/users/login', }, sysuser: { - get: '/service/sys/users/get', - find: '/service/sys/users/find', - save: '/service/sys/users/save', - edit: '/service/sys/users/edit', - del: '/service/sys/users/del', - modpw: '/service/sys/users/modpw', + get: Url+'/service/sys/users/get', + find: Url+'/service/sys/users/find', + save: Url+'/service/sys/users/save', + edit: Url+'/service/sys/users/edit', + del: Url+'/service/sys/users/del', + modpw: Url+'/service/sys/users/modpw', }, loginlog: { - find: '/service/sys/loginlog/find', + find: Url+'/service/sys/loginlog/find', }, smtplog: { - find: '/service/sys/smtplog/find', + find: Url+'/service/sys/smtplog/find', }, }, - sendSmtp: '/service/sys/sendsmtp', + sendSmtp: Url+'/service/sys/sendsmtp', geoserver: { wfs: 'http://geo.cloudowr.cn/geoserver/yichang/ows', @@ -45,245 +46,245 @@ const apiurl = { pubapi, adcd: { - list: '/service/adcd/list', - info: '/service/adcd/info', + list: Url+'/service/adcd/list', + info: Url+'/service/adcd/info', }, ws: { - list: '/service/ws/list', - wataGet: '/service/ws/wata/get', - stat: '/service/ws/stat', - statIndex: '/service/ws/stat/index', + list: Url+'/service/ws/list', + wataGet: Url+'/service/ws/wata/get', + stat: Url+'/service/ws/stat', + statIndex: Url+'/service/ws/stat/index', }, // moved to dcpj fzdx: { - list: '/service/fzdx/list', - get: '/service/fzdx/get', + list: Url+'/service/fzdx/list', + get: Url+'/service/fzdx/get', }, picst: { - list: '/service/st/pic/list', + list: Url+'/service/st/pic/list', }, dcpj: { fzdx: { - list: '/service/fzdx/list', - get: '/service/fzdx/get', + list: Url+'/service/fzdx/list', + get: Url+'/service/fzdx/get', }, bridge: { - list: '/service/dcpj/bridge/list', - get: '/service/dcpj/bridge/get', - find: '/service/dcpj/bridge/find', - save: '/service/dcpj/bridge/save', - edit: '/service/dcpj/bridge/edit', - del: '/service/dcpj/bridge/del', + list: Url+'/service/dcpj/bridge/list', + get: Url+'/service/dcpj/bridge/get', + find: Url+'/service/dcpj/bridge/find', + save: Url+'/service/dcpj/bridge/save', + edit: Url+'/service/dcpj/bridge/edit', + del: Url+'/service/dcpj/bridge/del', }, culvert: { - list: '/service/dcpj/culvert/list', - get: '/service/dcpj/culvert/get', - find: '/service/dcpj/culvert/find', - save: '/service/dcpj/culvert/save', - edit: '/service/dcpj/culvert/edit', - del: '/service/dcpj/culvert/del', + list: Url+'/service/dcpj/culvert/list', + get: Url+'/service/dcpj/culvert/get', + find: Url+'/service/dcpj/culvert/find', + save: Url+'/service/dcpj/culvert/save', + edit: Url+'/service/dcpj/culvert/edit', + del: Url+'/service/dcpj/culvert/del', }, sluice: { - list: '/service/dcpj/sluice/list', - get: '/service/dcpj/sluice/get', - find: '/service/dcpj/sluice/find', - save: '/service/dcpj/sluice/save', - edit: '/service/dcpj/sluice/edit', - del: '/service/dcpj/sluice/del', + list: Url+'/service/dcpj/sluice/list', + get: Url+'/service/dcpj/sluice/get', + find: Url+'/service/dcpj/sluice/find', + save: Url+'/service/dcpj/sluice/save', + edit: Url+'/service/dcpj/sluice/edit', + del: Url+'/service/dcpj/sluice/del', }, reservoir: { - list: '/service/st/sk/list', + list: Url+'/service/st/sk/list', }, daminfo: { - list: '/service/dcpj/daminfo/list', - get: '/service/dcpj/daminfo/get', - find: '/service/dcpj/daminfo/find', - save: '/service/dcpj/daminfo/save', - edit: '/service/dcpj/daminfo/edit', - del: '/service/dcpj/daminfo/del', + list: Url+'/service/dcpj/daminfo/list', + get: Url+'/service/dcpj/daminfo/get', + find: Url+'/service/dcpj/daminfo/find', + save: Url+'/service/dcpj/daminfo/save', + edit: Url+'/service/dcpj/daminfo/edit', + del: Url+'/service/dcpj/daminfo/del', }, dike: { - list: '/service/dcpj/dike/list', - get: '/service/dcpj/dike/get', - find: '/service/dcpj/dike/find', - save: '/service/dcpj/dike/save', - edit: '/service/dcpj/dike/edit', - del: '/service/dcpj/dike/del', + list: Url+'/service/dcpj/dike/list', + get: Url+'/service/dcpj/dike/get', + find: Url+'/service/dcpj/dike/find', + save: Url+'/service/dcpj/dike/save', + edit: Url+'/service/dcpj/dike/edit', + del: Url+'/service/dcpj/dike/del', }, srstinfo: { - list: '/service/dcpj/srstinfo/list', - get: '/service/dcpj/srstinfo/get', - find: '/service/dcpj/srstinfo/find', - save: '/service/dcpj/srstinfo/save', - edit: '/service/dcpj/srstinfo/edit', - del: '/service/dcpj/srstinfo/del', + list: Url+'/service/dcpj/srstinfo/list', + get: Url+'/service/dcpj/srstinfo/get', + find: Url+'/service/dcpj/srstinfo/find', + save: Url+'/service/dcpj/srstinfo/save', + edit: Url+'/service/dcpj/srstinfo/edit', + del: Url+'/service/dcpj/srstinfo/del', }, stinfo: { - list: '/service/dcpj/stinfo/list', - get: '/service/dcpj/stinfo/get', - find: '/service/dcpj/stinfo/find', - save: '/service/dcpj/stinfo/save', - edit: '/service/dcpj/stinfo/edit', - del: '/service/dcpj/stinfo/del', + list: Url+'/service/dcpj/stinfo/list', + get: Url+'/service/dcpj/stinfo/get', + find: Url+'/service/dcpj/stinfo/find', + save: Url+'/service/dcpj/stinfo/save', + edit: Url+'/service/dcpj/stinfo/edit', + del: Url+'/service/dcpj/stinfo/del', }, swstinfo: { - list: '/service/dcpj/swstinfo/list', - get: '/service/dcpj/swstinfo/get', - find: '/service/dcpj/swstinfo/find', - save: '/service/dcpj/swstinfo/save', - edit: '/service/dcpj/swstinfo/edit', - del: '/service/dcpj/swstinfo/del', + list: Url+'/service/dcpj/swstinfo/list', + get: Url+'/service/dcpj/swstinfo/get', + find: Url+'/service/dcpj/swstinfo/find', + save: Url+'/service/dcpj/swstinfo/save', + edit: Url+'/service/dcpj/swstinfo/edit', + del: Url+'/service/dcpj/swstinfo/del', }, wbrinfo: { - list: '/service/dcpj/wbrinfo/list', - get: '/service/dcpj/wbrinfo/get', - find: '/service/dcpj/wbrinfo/find', - save: '/service/dcpj/wbrinfo/save', - edit: '/service/dcpj/wbrinfo/edit', - del: '/service/dcpj/wbrinfo/del', + list: Url+'/service/dcpj/wbrinfo/list', + get: Url+'/service/dcpj/wbrinfo/get', + find: Url+'/service/dcpj/wbrinfo/find', + save: Url+'/service/dcpj/wbrinfo/save', + edit: Url+'/service/dcpj/wbrinfo/edit', + del: Url+'/service/dcpj/wbrinfo/del', }, bsnssinfo: { - list: '/service/dcpj/bsnssinfo/list', - get: '/service/dcpj/bsnssinfo/get', - find: '/service/dcpj/bsnssinfo/find', - save: '/service/dcpj/bsnssinfo/save', - edit: '/service/dcpj/bsnssinfo/edit', - del: '/service/dcpj/bsnssinfo/del', + list: Url+'/service/dcpj/bsnssinfo/list', + get: Url+'/service/dcpj/bsnssinfo/get', + find: Url+'/service/dcpj/bsnssinfo/find', + save: Url+'/service/dcpj/bsnssinfo/save', + edit: Url+'/service/dcpj/bsnssinfo/edit', + del: Url+'/service/dcpj/bsnssinfo/del', }, dtresident: { - list: '/service/dcpj/dtresident/list', - get: '/service/dcpj/dtresident/get', - find: '/service/dcpj/dtresident/find', - save: '/service/dcpj/dtresident/save', - edit: '/service/dcpj/dtresident/edit', - del: '/service/dcpj/dtresident/del', + list: Url+'/service/dcpj/dtresident/list', + get: Url+'/service/dcpj/dtresident/get', + find: Url+'/service/dcpj/dtresident/find', + save: Url+'/service/dcpj/dtresident/save', + edit: Url+'/service/dcpj/dtresident/edit', + del: Url+'/service/dcpj/dtresident/del', }, flrvvlg: { - list: '/service/dcpj/flrvvlg/list', - get: '/service/dcpj/flrvvlg/get', - find: '/service/dcpj/flrvvlg/find', - save: '/service/dcpj/flrvvlg/save', - edit: '/service/dcpj/flrvvlg/edit', - del: '/service/dcpj/flrvvlg/del', + list: Url+'/service/dcpj/flrvvlg/list', + get: Url+'/service/dcpj/flrvvlg/get', + find: Url+'/service/dcpj/flrvvlg/find', + save: Url+'/service/dcpj/flrvvlg/save', + edit: Url+'/service/dcpj/flrvvlg/edit', + del: Url+'/service/dcpj/flrvvlg/del', }, danad: { - list: '/service/dcpj/danad/list', - get: '/service/dcpj/danad/get', - find: '/service/dcpj/danad/find', - save: '/service/dcpj/danad/save', - edit: '/service/dcpj/danad/edit', - del: '/service/dcpj/danad/del', + list: Url+'/service/dcpj/danad/list', + get: Url+'/service/dcpj/danad/get', + find: Url+'/service/dcpj/danad/find', + save: Url+'/service/dcpj/danad/save', + edit: Url+'/service/dcpj/danad/edit', + del: Url+'/service/dcpj/danad/del', }, placement: { - list: '/service/dcpj/placement/list', - get: '/service/dcpj/placement/get', - find: '/service/dcpj/placement/find', - save: '/service/dcpj/placement/save', - edit: '/service/dcpj/placement/edit', - del: '/service/dcpj/placement/del', + list: Url+'/service/dcpj/placement/list', + get: Url+'/service/dcpj/placement/get', + find: Url+'/service/dcpj/placement/find', + save: Url+'/service/dcpj/placement/save', + edit: Url+'/service/dcpj/placement/edit', + del: Url+'/service/dcpj/placement/del', }, transfer: { - list: '/service/dcpj/transfer/list', - get: '/service/dcpj/transfer/get', - find: '/service/dcpj/transfer/find', - save: '/service/dcpj/transfer/save', - edit: '/service/dcpj/transfer/edit', - del: '/service/dcpj/transfer/del', + list: Url+'/service/dcpj/transfer/list', + get: Url+'/service/dcpj/transfer/get', + find: Url+'/service/dcpj/transfer/find', + save: Url+'/service/dcpj/transfer/save', + edit: Url+'/service/dcpj/transfer/edit', + del: Url+'/service/dcpj/transfer/del', }, hdm: { - list: '/service/dcpj/hdm/list', - get: '/service/dcpj/hdm/get', - namelist: '/service/dcpj/hdm/namelist', + list: Url+'/service/dcpj/hdm/list', + get: Url+'/service/dcpj/hdm/get', + namelist: Url+'/service/dcpj/hdm/namelist', }, hfdfts: { - list: '/service/dcpj/hfdfts/list', - get: '/service/dcpj/hfdfts/get', - find: '/service/dcpj/hfdfts/find', - save: '/service/dcpj/hfdfts/save', - edit: '/service/dcpj/hfdfts/edit', - del: '/service/dcpj/hfdfts/del', + list: Url+'/service/dcpj/hfdfts/list', + get: Url+'/service/dcpj/hfdfts/get', + find: Url+'/service/dcpj/hfdfts/find', + save: Url+'/service/dcpj/hfdfts/save', + edit: Url+'/service/dcpj/hfdfts/edit', + del: Url+'/service/dcpj/hfdfts/del', }, }, personel: { - listByType: '/service/personel/list', - get: '/service/personel/get', - find: '/service/personel/find', - save: '/service/personel/save', - edit: '/service/personel/edit', - del: '/service/personel/del', + listByType: Url+'/service/personel/list', + get: Url+'/service/personel/get', + find: Url+'/service/personel/find', + save: Url+'/service/personel/save', + edit: Url+'/service/personel/edit', + del: Url+'/service/personel/del', }, skPersonel: { - listByStcd: '/service/st/sk/personel/list', - get: '/service/st/sk/personel/get', - save: '/service/st/sk/personel/save', - edit: '/service/st/sk/personel/edit', - del: '/service/st/sk/personel/del', + listByStcd: Url+'/service/st/sk/personel/list', + get: Url+'/service/st/sk/personel/get', + save: Url+'/service/st/sk/personel/save', + edit: Url+'/service/st/sk/personel/edit', + del: Url+'/service/st/sk/personel/del', }, sk: { - info: '/service/st/sk/info', - savePlan: '/service/st/sk/plan/save', + info: Url+'/service/st/sk/info', + savePlan: Url+'/service/st/sk/plan/save', }, plan: { - get: '/service/plan/get', - find: '/service/plan/find', - save: '/service/plan/save', - edit: '/service/plan/edit', - del: '/service/plan/del', + get: Url+'/service/plan/get', + find: Url+'/service/plan/find', + save: Url+'/service/plan/save', + edit: Url+'/service/plan/edit', + del: Url+'/service/plan/del', }, zbap: { - get: '/service/zbap/get', - find: '/service/zbap/find', - save: '/service/zbap/save', - edit: '/service/zbap/edit', - del: '/service/zbap/del', - list: '/service/zbap/list', - upload: '/service/zbap/upload', - today: '/service/zbap/today', + get: Url+'/service/zbap/get', + find: Url+'/service/zbap/find', + save: Url+'/service/zbap/save', + edit: Url+'/service/zbap/edit', + del: Url+'/service/zbap/del', + list: Url+'/service/zbap/list', + upload: Url+'/service/zbap/upload', + today: Url+'/service/zbap/today', }, real: { - shdrp: '/service/real/drp/sh', - swdrp: '/service/real/drp/sw', - skdrp: '/service/real/drp/sk', - qxdrp: '/service/real/drp/qx', - shrz: '/service/real/rz/sh', - swrz: '/service/real/rz/sw', - sk: '/service/real/sk', - skPicGet: '/service/real/sk/pic/get', - drp: '/service/real/drp', - drpget: '/service/real/drpget', - skget: '/service/real/skget', - rz: '/service/real/rz', + shdrp: Url+'/service/real/drp/sh', + swdrp: Url+'/service/real/drp/sw', + skdrp: Url+'/service/real/drp/sk', + qxdrp: Url+'/service/real/drp/qx', + shrz: Url+'/service/real/rz/sh', + swrz: Url+'/service/real/rz/sw', + sk: Url+'/service/real/sk', + skPicGet: Url+'/service/real/sk/pic/get', + drp: Url+'/service/real/drp', + drpget: Url+'/service/real/drpget', + skget: Url+'/service/real/skget', + rz: Url+'/service/real/rz', }, st: { - sh: '/service/st/sh/list', - sw: '/service/st/sw/list', - sk: '/service/st/sk/list', - qx: '/service/st/qx/list', - list: '/service/st/list', - edit: '/service/st/edit' + sh: Url+'/service/st/sh/list', + sw: Url+'/service/st/sw/list', + sk: Url+'/service/st/sk/list', + qx: Url+'/service/st/qx/list', + list: Url+'/service/st/list', + edit: Url+'/service/st/edit' }, ex: { - watadrp: '/service/ex/watadrp', - bx: '/service/ex/bx', - globalSearch: '/service/ex/globalSearch', - dmcrz: '/service/ex/dmcrz', - dmrz: '/service/ex/dmrz', + watadrp: Url+'/service/ex/watadrp', + bx: Url+'/service/ex/bx', + globalSearch: Url+'/service/ex/globalSearch', + dmcrz: Url+'/service/ex/dmcrz', + dmrz: Url+'/service/ex/dmrz', }, skalert: { - find: '/service/skalert/find', - close: '/service/skalert/close', + find: Url+'/service/skalert/find', + close: Url+'/service/skalert/close', }, skalertLatest: { - find: '/service/skalert/latest', + find: Url+'/service/skalert/latest', }, shyj: { @@ -301,52 +302,52 @@ const apiurl = { yjhis: { - get: '/service/shqx/grb/get', - find: '/service/shqx/grb/find', - latest: '/service/shqx/grb/latest', - stat: '/service/shqx/grb/stat', - weather: '/service/shqx/res/grblayerset', - report: '/service/shqx/grb/report', - rainimglist: '/service/shqx/grb/rainimglist', - imglist: '/service/shqx/grb/imglist', + get: Url+'/service/shqx/grb/get', + find: Url+'/service/shqx/grb/find', + latest: Url+'/service/shqx/grb/latest', + stat: Url+'/service/shqx/grb/stat', + weather: Url+'/service/shqx/res/grblayerset', + report: Url+'/service/shqx/grb/report', + rainimglist: Url+'/service/shqx/grb/rainimglist', + imglist: Url+'/service/shqx/grb/imglist', }, radarhis: { - get: '/service/shqx/radar/get', - find: '/service/shqx/radar/find', - latest: '/service/shqx/radar/latest', - stat: '/service/shqx/radar/stat', - weather: '/service/shqx/res/radarlayer', - rainimg: '/service/shqx/radar/rainimg', - imglist: '/service/shqx/radar/imglist', + get: Url+'/service/shqx/radar/get', + find: Url+'/service/shqx/radar/find', + latest: Url+'/service/shqx/radar/latest', + stat: Url+'/service/shqx/radar/stat', + weather: Url+'/service/shqx/res/radarlayer', + rainimg: Url+'/service/shqx/radar/rainimg', + imglist: Url+'/service/shqx/radar/imglist', }, warnresprecord: { - latest: '/service/warnresprecord/last', - save: '/service/warnresprecord/save', - dispose: '/service/warnresprecord/dispose', - get: '/service/warnresprecord/get', - close: '/service/warnresprecord/close', - delete: '/service/warnresprecord/delDispose', + latest: Url+'/service/warnresprecord/last', + save: Url+'/service/warnresprecord/save', + dispose: Url+'/service/warnresprecord/dispose', + get: Url+'/service/warnresprecord/get', + close: Url+'/service/warnresprecord/close', + delete: Url+'/service/warnresprecord/delDispose', }, warnresp: { - list: '/service/warnresp/list', + list: Url+'/service/warnresp/list', }, stwarnrecord: { - unclose: '/service/stwarnrecord/unclose', - find: '/service/stwarnrecord/find', + unclose: Url+'/service/stwarnrecord/unclose', + find: Url+'/service/stwarnrecord/find', }, ctrl: { - cmd: '/service/ctrl/cmd', - audio: '/service/ctrl/audio', + cmd: Url+'/service/ctrl/cmd', + audio: Url+'/service/ctrl/audio', }, //汛情监视 xqjs: { - sktp: '/service/real/sk', + sktp: Url+'/service/real/sk', } }; diff --git a/src/setupProxy.js b/src/setupProxy.js index fa95f9f..595b47a 100644 --- a/src/setupProxy.js +++ b/src/setupProxy.js @@ -1,18 +1,18 @@ const { createProxyMiddleware } = require('http-proxy-middleware'); module.exports = function (app) { - app.use( - '/service', - createProxyMiddleware({ - target: 'http://mcfxkh3.cloudowr.cn/', - changeOrigin: true, - /* - pathRewrite: { - '^/service': '', - }, - */ - }) - ); + // app.use( + // '/service', + // createProxyMiddleware({ + // target: 'http://mcfxkh3.cloudowr.cn/', + // changeOrigin: true, + // /* + // pathRewrite: { + // '^/service': '', + // }, + // */ + // }) + // ); app.use( '/socket.io', diff --git a/src/views/Home/InfoDlg/BjDlg/index.js b/src/views/Home/InfoDlg/BjDlg/index.js index d0a32fb..a010df1 100644 --- a/src/views/Home/InfoDlg/BjDlg/index.js +++ b/src/views/Home/InfoDlg/BjDlg/index.js @@ -29,7 +29,7 @@ function HDStDlg({ record, onClose }) { - +
diff --git a/src/views/Home/InfoDlg/DdcgDlg/index.js b/src/views/Home/InfoDlg/DdcgDlg/index.js index bd2c7ec..515b63e 100644 --- a/src/views/Home/InfoDlg/DdcgDlg/index.js +++ b/src/views/Home/InfoDlg/DdcgDlg/index.js @@ -28,7 +28,7 @@ function HDStDlg({ record, onClose }) { - +
diff --git a/src/views/Home/InfoDlg/FadbDlg/index.js b/src/views/Home/InfoDlg/FadbDlg/index.js index f0b4e3c..8c171e3 100644 --- a/src/views/Home/InfoDlg/FadbDlg/index.js +++ b/src/views/Home/InfoDlg/FadbDlg/index.js @@ -28,7 +28,7 @@ function HDStDlg({ record, onClose }) { - +
diff --git a/src/views/Home/InfoDlg/YbcgDlg/index.js b/src/views/Home/InfoDlg/YbcgDlg/index.js index d1c569f..9bd060d 100644 --- a/src/views/Home/InfoDlg/YbcgDlg/index.js +++ b/src/views/Home/InfoDlg/YbcgDlg/index.js @@ -51,7 +51,7 @@ function HDStDlg({ record, onClose }) {
- {/* */} + {/* */} diff --git a/src/views/Home/InfoPops/_/layericons.js b/src/views/Home/InfoPops/_/layericons.js index 9ecb6d4..adbac0a 100644 --- a/src/views/Home/InfoPops/_/layericons.js +++ b/src/views/Home/InfoPops/_/layericons.js @@ -102,6 +102,6 @@ export const iconstyles = { } export const iconbase = { - backgroundImage: 'url(/mapbox/sprite@2x.png)', + backgroundImage: 'url('+process.env.PUBLIC_URL+'/mapbox/sprite@2x.png)', backgroundSize: '1600% 1450%', }; \ No newline at end of file diff --git a/src/views/Home/MapCtrl/mapstyle/layermgr.js b/src/views/Home/MapCtrl/mapstyle/layermgr.js index af31870..cc1e5d6 100644 --- a/src/views/Home/MapCtrl/mapstyle/layermgr.js +++ b/src/views/Home/MapCtrl/mapstyle/layermgr.js @@ -135,8 +135,8 @@ class LayerMgr { version: 8, name: "fxkh", metadata: {}, - sprite: `${window.location.origin}/mapbox/sprite`, - glyphs: `${window.location.origin}/mapbox/{fontstack}/{range}.pbf`, + sprite: `${window.location.origin+process.env.PUBLIC_URL}/mapbox/sprite`, + glyphs: `${window.location.origin+process.env.PUBLIC_URL}/mapbox/{fontstack}/{range}.pbf`, sources, terrain: this.layerMap.TerrainLayer.getTerrain(), layers: [ diff --git a/src/views/Home/MapCtrl/mapstyle/sources.js b/src/views/Home/MapCtrl/mapstyle/sources.js index 13e6159..2167731 100644 --- a/src/views/Home/MapCtrl/mapstyle/sources.js +++ b/src/views/Home/MapCtrl/mapstyle/sources.js @@ -31,7 +31,7 @@ import RainDrpLayer from "./rainDrpLayer" import XunchaLayer from "./xunchalayer" import shyjLayer from "./shyjLayer" -const hash = window.location.origin; +const hash = window.location.origin+process.env.PUBLIC_URL; const sources = { "mapbox-dem": { @@ -44,17 +44,18 @@ const sources = { 'type': 'raster-dem', 'url': `${hash}/data/dem.json`, }, - "mapbox-dom": { + "mapbox-dom": { 'type': 'raster', 'tiles': [ - `http://res3dstatic0.cloudowr.cn/${config.address}/dom2/{z}/{x}/{y}.png`, - `http://res3dstatic1.cloudowr.cn/${config.address}/dom2/{z}/{x}/{y}.png`, - `http://res3dstatic2.cloudowr.cn/${config.address}/dom2/{z}/{x}/{y}.png`, - `http://res3dstatic3.cloudowr.cn/${config.address}/dom2/{z}/{x}/{y}.png`, - `http://res3dstatic4.cloudowr.cn/${config.address}/dom2/{z}/{x}/{y}.png`, - `http://res3dstatic5.cloudowr.cn/${config.address}/dom2/{z}/{x}/{y}.png`, - `http://res3dstatic6.cloudowr.cn/${config.address}/dom2/{z}/{x}/{y}.png`, - `http://res3dstatic7.cloudowr.cn/${config.address}/dom2/{z}/{x}/{y}.png`, + // `http://res3dstatic0.cloudowr.cn/${config.address}/dom2/{z}/{x}/{y}.png`, + // `http://res3dstatic1.cloudowr.cn/${config.address}/dom2/{z}/{x}/{y}.png`, + // `http://res3dstatic2.cloudowr.cn/${config.address}/dom2/{z}/{x}/{y}.png`, + // `http://res3dstatic3.cloudowr.cn/${config.address}/dom2/{z}/{x}/{y}.png`, + // `http://res3dstatic4.cloudowr.cn/${config.address}/dom2/{z}/{x}/{y}.png`, + // `http://res3dstatic5.cloudowr.cn/${config.address}/dom2/{z}/{x}/{y}.png`, + // `http://res3dstatic6.cloudowr.cn/${config.address}/dom2/{z}/{x}/{y}.png`, + // `http://res3dstatic7.cloudowr.cn/${config.address}/dom2/{z}/{x}/{y}.png`, + `https://t0.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=efc861f25f96dc6e5f884f0403ebfefd`, ], 'tileSize': 256, 'minzoom': 1, diff --git a/src/views/Home/components/ActionDock/index.js b/src/views/Home/components/ActionDock/index.js index 91801ba..8a98d2f 100644 --- a/src/views/Home/components/ActionDock/index.js +++ b/src/views/Home/components/ActionDock/index.js @@ -7,48 +7,48 @@ import { makeStyles, Tooltip, Typography } from '@material-ui/core'; const VIEWS = [ { - id: 100, title: '防汛', img: '/assets/menu/防洪形势.png', children: [ - // { id: 0, title: '防洪形势', img: '/assets/menu/防洪形势.png' }, - { id: 8, title: '防洪形势', img: '/assets/menu/防洪形势.png' }, - // { id: 9, title: '防洪形势', img: '/assets/menu/防洪形势.png' }, - { id: 1, title: '监测数据', img: '/assets/menu/实时数据.png' }, - // { id: 2, title: '水利设施', img: '/assets/menu/水利设施.png' }, - { id: 5, title: '预报', img: '/assets/menu/降雨中心.png' }, - { id: 6, title: '预警', img: '/assets/menu/病险水库.png' }, - { id: 4, title: '预演', img: '/assets/menu/预警分析.png' }, - { id: 3, title: '预案', img: '/assets/menu/辅助决策.png' }, - { id: 7, title: '调度', img: '/assets/menu/辅助决策.png' }, + id: 100, title: '防汛', img: process.env.PUBLIC_URL+'/assets/menu/防洪形势.png', children: [ + // { id: 0, title: '防洪形势', img: process.env.PUBLIC_URL+'/assets/menu/防洪形势.png' }, + { id: 8, title: '防洪形势', img: process.env.PUBLIC_URL+'/assets/menu/防洪形势.png' }, + // { id: 9, title: '防洪形势', img: process.env.PUBLIC_URL+'/assets/menu/防洪形势.png' }, + { id: 1, title: '监测数据', img: process.env.PUBLIC_URL+'/assets/menu/实时数据.png' }, + // { id: 2, title: '水利设施', img: process.env.PUBLIC_URL+'/assets/menu/水利设施.png' }, + { id: 5, title: '预报', img: process.env.PUBLIC_URL+'/assets/menu/降雨中心.png' }, + { id: 6, title: '预警', img: process.env.PUBLIC_URL+'/assets/menu/病险水库.png' }, + { id: 4, title: '预演', img: process.env.PUBLIC_URL+'/assets/menu/预警分析.png' }, + { id: 3, title: '预案', img: process.env.PUBLIC_URL+'/assets/menu/辅助决策.png' }, + { id: 7, title: '调度', img: process.env.PUBLIC_URL+'/assets/menu/辅助决策.png' }, ] }, - // { id: 200, title: '水库', img: '/assets/menu/水库专题.png',children:[ - // { id: 207, title: '水库总览', img: '/assets/menu/水库管理.png' }, - // // { id: 201, title: '雨情监测', img: '/assets/menu/雨情监测.png' }, - // // { id: 202, title: '水情监测', img: '/assets/menu/水情监测.png' }, - // { id: 203, title: '水库监测', img: '/assets/menu/安全监测.png' }, - // // { id: 204, title: '视频监视', img: '/assets/menu/视频监视.png' }, - // { id: 205, title: '防汛调度', img: '/assets/menu/防汛调度.png' }, - // { id: 206, title: '巡查维养', img: '/assets/menu/水库管理.png' }, + // { id: 200, title: '水库', img: process.env.PUBLIC_URL+'/assets/menu/水库专题.png',children:[ + // { id: 207, title: '水库总览', img: process.env.PUBLIC_URL+'/assets/menu/水库管理.png' }, + // // { id: 201, title: '雨情监测', img: process.env.PUBLIC_URL+'/assets/menu/雨情监测.png' }, + // // { id: 202, title: '水情监测', img: process.env.PUBLIC_URL+'/assets/menu/水情监测.png' }, + // { id: 203, title: '水库监测', img: process.env.PUBLIC_URL+'/assets/menu/安全监测.png' }, + // // { id: 204, title: '视频监视', img: process.env.PUBLIC_URL+'/assets/menu/视频监视.png' }, + // { id: 205, title: '防汛调度', img: process.env.PUBLIC_URL+'/assets/menu/防汛调度.png' }, + // { id: 206, title: '巡查维养', img: process.env.PUBLIC_URL+'/assets/menu/水库管理.png' }, // ] }, - { id: 200, title: '水库', img: '/assets/menu/水库专题.png'}, + { id: 200, title: '水库', img: process.env.PUBLIC_URL+'/assets/menu/水库专题.png'}, { - id: 300, title: '水厂', img: '/assets/menu/水利设施.png', children: [ - { id: 301, title: '供水态势', img: '/assets/menu/降雨中心.png' }, - { id: 302, title: '水质安全', img: '/assets/menu/水情监测.png' }, - { id: 303, title: '水厂运行', img: '/assets/menu/水库管理.png' }, - { id: 306, title: '管网健康诊断', img: '/assets/menu/水利设施.png' }, - { id: 307, title: '应急指挥调度', img: '/assets/menu/病险水库.png' }, - // { id: 305, title: '决策支持与报表', img: '/assets/menu/辅助决策.png' }, + id: 300, title: '水厂', img: process.env.PUBLIC_URL+'/assets/menu/水利设施.png', children: [ + { id: 301, title: '供水态势', img: process.env.PUBLIC_URL+'/assets/menu/降雨中心.png' }, + { id: 302, title: '水质安全', img: process.env.PUBLIC_URL+'/assets/menu/水情监测.png' }, + { id: 303, title: '水厂运行', img: process.env.PUBLIC_URL+'/assets/menu/水库管理.png' }, + { id: 306, title: '管网健康诊断', img: process.env.PUBLIC_URL+'/assets/menu/水利设施.png' }, + { id: 307, title: '应急指挥调度', img: process.env.PUBLIC_URL+'/assets/menu/病险水库.png' }, + // { id: 305, title: '决策支持与报表', img: process.env.PUBLIC_URL+'/assets/menu/辅助决策.png' }, ] }, { - id: 400, title: '灌区', img: '/assets/menu/预警分析.png', children: [ - { id: 501, title: '灌区监测', img: '/assets/menu/防洪形势.png' }, - { id: 504, title: '水旱灾害防御', img: '/assets/menu/水利设施.png' }, - // { id: 502, title: '预警信息管理', img: '/assets/menu/实时数据.png' }, - { id: 503, title: '水资源调度', img: '/assets/menu/病险水库.png' }, - { id: 505, title: '量测水管理', img: '/assets/menu/辅助决策.png' }, - { id: 506, title: '水政管理', img: '/assets/menu/预警分析.png' }, - { id: 507, title: '工程管理', img: '/assets/menu/降雨中心.png' }, + id: 400, title: '灌区', img: process.env.PUBLIC_URL+'/assets/menu/预警分析.png', children: [ + { id: 501, title: '灌区监测', img: process.env.PUBLIC_URL+'/assets/menu/防洪形势.png' }, + { id: 504, title: '水旱灾害防御', img: process.env.PUBLIC_URL+'/assets/menu/水利设施.png' }, + // { id: 502, title: '预警信息管理', img: process.env.PUBLIC_URL+'/assets/menu/实时数据.png' }, + { id: 503, title: '水资源调度', img: process.env.PUBLIC_URL+'/assets/menu/病险水库.png' }, + { id: 505, title: '量测水管理', img: process.env.PUBLIC_URL+'/assets/menu/辅助决策.png' }, + { id: 506, title: '水政管理', img: process.env.PUBLIC_URL+'/assets/menu/预警分析.png' }, + { id: 507, title: '工程管理', img: process.env.PUBLIC_URL+'/assets/menu/降雨中心.png' }, // 图层控制 // 灌区监测 // 预警信息管理 @@ -107,7 +107,7 @@ export default function ActionDock({ }) { removePoint() }}>
- +
diff --git a/src/views/Home/components/Title/index.js b/src/views/Home/components/Title/index.js index 0edd0b4..9b97a99 100644 --- a/src/views/Home/components/Title/index.js +++ b/src/views/Home/components/Title/index.js @@ -119,35 +119,35 @@ export default function Title() { view===301?
- +
15 个
乡镇数量
- +
16 个
水源地数量
- +
221 座
水厂数量
- +
33 万
服务人口
- +
1026 万m³
年供水规模
diff --git a/src/views/Home/panels/Afjk/index.js b/src/views/Home/panels/Afjk/index.js index a8ba579..2bc8666 100644 --- a/src/views/Home/panels/Afjk/index.js +++ b/src/views/Home/panels/Afjk/index.js @@ -10,11 +10,11 @@ function DrpReal({ style }) { color="green" extra={ <> - + } > - + ) } diff --git a/src/views/Home/panels/Bjfx/index.js b/src/views/Home/panels/Bjfx/index.js index 834cef9..8cc13a5 100644 --- a/src/views/Home/panels/Bjfx/index.js +++ b/src/views/Home/panels/Bjfx/index.js @@ -29,7 +29,7 @@ const [type, setType] = useState('sc') type == 'sc' ?: } - {/* */} + {/* */} ) } diff --git a/src/views/Home/panels/Csjc/index.js b/src/views/Home/panels/Csjc/index.js index 7c9edb3..5b5d62b 100644 --- a/src/views/Home/panels/Csjc/index.js +++ b/src/views/Home/panels/Csjc/index.js @@ -10,8 +10,8 @@ function DrpReal({ style }) { color="green" extra={ <> - - + + } > diff --git a/src/views/Home/panels/Dbfx/index.js b/src/views/Home/panels/Dbfx/index.js index fad6e68..0109ca2 100644 --- a/src/views/Home/panels/Dbfx/index.js +++ b/src/views/Home/panels/Dbfx/index.js @@ -9,7 +9,7 @@ function DrpReal({ style }) { title="方案对比" color="green" > - + ) } diff --git a/src/views/Home/panels/Ddcg/index.js b/src/views/Home/panels/Ddcg/index.js index 5c87cfd..c524d52 100644 --- a/src/views/Home/panels/Ddcg/index.js +++ b/src/views/Home/panels/Ddcg/index.js @@ -16,7 +16,7 @@ function DrpReal({ style }) { color="green" extra={ <> - {/* */} + {/* */}
{ dispatch?.runtime.setInfoDlg({ layerId: 'DdcgLayer', properties: {} }) }}> diff --git a/src/views/Home/panels/Dhfx/index.js b/src/views/Home/panels/Dhfx/index.js index 7821779..dfc5074 100644 --- a/src/views/Home/panels/Dhfx/index.js +++ b/src/views/Home/panels/Dhfx/index.js @@ -10,12 +10,12 @@ function DrpReal({ style }) { color="green" extra={ <> - - + + } > - + ) } diff --git a/src/views/Home/panels/Fadb/index.js b/src/views/Home/panels/Fadb/index.js index 9199d18..08b0e39 100644 --- a/src/views/Home/panels/Fadb/index.js +++ b/src/views/Home/panels/Fadb/index.js @@ -18,7 +18,7 @@ function DrpReal({ style }) {
} > - + ) } diff --git a/src/views/Home/panels/FhxsSq/index.js b/src/views/Home/panels/FhxsSq/index.js index b40eba6..e39914b 100644 --- a/src/views/Home/panels/FhxsSq/index.js +++ b/src/views/Home/panels/FhxsSq/index.js @@ -148,7 +148,7 @@ function DrpReal({ style }) { color="green" extra={ <> - {/* */} + {/* */}
diff --git a/src/views/Home/panels/Xczl/index.js b/src/views/Home/panels/Xczl/index.js index a176a3e..358e2dc 100644 --- a/src/views/Home/panels/Xczl/index.js +++ b/src/views/Home/panels/Xczl/index.js @@ -97,7 +97,7 @@ function DrpReal({ style }) { 'type': 'line', 'source': { 'type': 'geojson', - 'data': `${window.location.origin}/data3/line2.geojson` + 'data': `${window.location.origin+process.env.PUBLIC_URL}/data3/line2.geojson` }, 'layout': { 'line-join': 'round' diff --git a/src/views/Home/panels/YaRes2/index.js b/src/views/Home/panels/YaRes2/index.js index 936fca2..ce8d940 100644 --- a/src/views/Home/panels/YaRes2/index.js +++ b/src/views/Home/panels/YaRes2/index.js @@ -228,7 +228,7 @@ function HDReal({ style }) { { show?
- +
:null } diff --git a/src/views/Home/panels/Ybdd/index.js b/src/views/Home/panels/Ybdd/index.js index ab61547..270043b 100644 --- a/src/views/Home/panels/Ybdd/index.js +++ b/src/views/Home/panels/Ybdd/index.js @@ -15,7 +15,7 @@ function DrpReal({ style }) { // // } > - + ) } diff --git a/src/views/Home/panels/Yhfx/index.js b/src/views/Home/panels/Yhfx/index.js index b7fe156..6b983df 100644 --- a/src/views/Home/panels/Yhfx/index.js +++ b/src/views/Home/panels/Yhfx/index.js @@ -10,12 +10,12 @@ function DrpReal({ style }) { color="green" extra={ <> - - + + } > - + ) } diff --git a/src/views/Home/panels/Yjcg/index.js b/src/views/Home/panels/Yjcg/index.js index 4c3ec03..4cea56a 100644 --- a/src/views/Home/panels/Yjcg/index.js +++ b/src/views/Home/panels/Yjcg/index.js @@ -15,7 +15,7 @@ function DrpReal({ style }) { // // } > - + ) } diff --git a/src/views/Home/panels/Zdtj/index.js b/src/views/Home/panels/Zdtj/index.js index d4596de..42a5425 100644 --- a/src/views/Home/panels/Zdtj/index.js +++ b/src/views/Home/panels/Zdtj/index.js @@ -16,7 +16,7 @@ function DrpReal({ style }) { 'type': 'line', 'source': { 'type': 'geojson', - 'data': `${window.location.origin}/data3/line1.geojson` + 'data': `${window.location.origin+process.env.PUBLIC_URL}/data3/line1.geojson` }, 'layout': { 'line-join': 'round' @@ -83,7 +83,7 @@ function DrpReal({ style }) { title="站点统计" color="green" > - { + { // setSkLayer1() }}/> diff --git a/src/views/Login/index.js b/src/views/Login/index.js index fdb908b..dd74009 100644 --- a/src/views/Login/index.js +++ b/src/views/Login/index.js @@ -76,7 +76,7 @@ function Login() {