diff --git a/api/.vscode/launch.json b/api/.vscode/launch.json index 1adc141..18c82f6 100644 --- a/api/.vscode/launch.json +++ b/api/.vscode/launch.json @@ -15,8 +15,8 @@ "args": [ "-p 4900", // 研发 - // "-g postgres://postgres:123456@10.8.30.39:5432/PumpStation", - "-g postgres://FashionAdmin:123456@10.8.30.156:5432/PumpStation", + "-g postgres://postgres:123456@10.8.30.166:5432/PumpStation", + // "-g postgres://FashionAdmin:123456@10.8.30.166:5432/PumpStation", // 测试 // "--apiEmisUrl http://10.8.30.161:1111", // "--qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5", diff --git a/api/app/lib/controllers/auth/index.js b/api/app/lib/controllers/auth/index.js index 7a163b4..4ddaa8a 100644 --- a/api/app/lib/controllers/auth/index.js +++ b/api/app/lib/controllers/auth/index.js @@ -36,7 +36,7 @@ async function login (ctx, next) { expired: expired }); ctx.status = 200; - ctx.body = userInfo; + ctx.body = userInfo } else { ctx.status = 400; ctx.body = { diff --git a/web/client/assets/images/monitor/oblique.png b/web/client/assets/images/monitor/oblique.png new file mode 100644 index 0000000..cdbd72b Binary files /dev/null and b/web/client/assets/images/monitor/oblique.png differ diff --git a/web/client/assets/images/realTime/buttom-d.png b/web/client/assets/images/realTime/buttom-d.png new file mode 100644 index 0000000..2638b7f Binary files /dev/null and b/web/client/assets/images/realTime/buttom-d.png differ diff --git a/web/client/assets/images/realTime/center.png b/web/client/assets/images/realTime/center.png new file mode 100644 index 0000000..82b555c Binary files /dev/null and b/web/client/assets/images/realTime/center.png differ diff --git a/web/client/assets/images/realTime/left-p.png b/web/client/assets/images/realTime/left-p.png new file mode 100644 index 0000000..184c646 Binary files /dev/null and b/web/client/assets/images/realTime/left-p.png differ diff --git a/web/client/assets/images/realTime/level.png b/web/client/assets/images/realTime/level.png new file mode 100644 index 0000000..56f6f4b Binary files /dev/null and b/web/client/assets/images/realTime/level.png differ diff --git a/web/client/assets/images/realTime/right-p.png b/web/client/assets/images/realTime/right-p.png new file mode 100644 index 0000000..71c5834 Binary files /dev/null and b/web/client/assets/images/realTime/right-p.png differ diff --git a/web/client/assets/images/realTime/soft-one.png b/web/client/assets/images/realTime/soft-one.png new file mode 100644 index 0000000..0bca904 Binary files /dev/null and b/web/client/assets/images/realTime/soft-one.png differ diff --git a/web/client/assets/images/realTime/soft-two.png b/web/client/assets/images/realTime/soft-two.png new file mode 100644 index 0000000..2460f13 Binary files /dev/null and b/web/client/assets/images/realTime/soft-two.png differ diff --git a/web/client/assets/images/realTime/this-day.png b/web/client/assets/images/realTime/this-day.png new file mode 100644 index 0000000..8305db5 Binary files /dev/null and b/web/client/assets/images/realTime/this-day.png differ diff --git a/web/client/assets/images/realTime/this-week.png b/web/client/assets/images/realTime/this-week.png new file mode 100644 index 0000000..7246ae9 Binary files /dev/null and b/web/client/assets/images/realTime/this-week.png differ diff --git a/web/client/assets/images/realTime/this-year.png b/web/client/assets/images/realTime/this-year.png new file mode 100644 index 0000000..ae28f1d Binary files /dev/null and b/web/client/assets/images/realTime/this-year.png differ diff --git a/web/client/index.html b/web/client/index.html index fdf026a..6050223 100644 --- a/web/client/index.html +++ b/web/client/index.html @@ -8,11 +8,11 @@ + src="https://webapi.amap.com/maps?v=2.0&key=e20863d113b69b83f553ea14dfec668f&plugin=AMap.AutoComplete,AMap.PlaceSearch,aMap.DistrictSearch"> diff --git a/web/client/src/sections/auth/actions/auth.js b/web/client/src/sections/auth/actions/auth.js index 3fdc65d..b76dd2f 100644 --- a/web/client/src/sections/auth/actions/auth.js +++ b/web/client/src/sections/auth/actions/auth.js @@ -47,7 +47,7 @@ export const LOGOUT = 'LOGOUT'; export function logout (user) { const token = user.token; const url = ApiTable.logout; - sessionStorage.removeItem('user'); + // sessionStorage.removeItem('user'); localStorage.removeItem('zhongding_selected_sider') localStorage.removeItem('zhongding_open_sider') Request.put(url, { diff --git a/web/client/src/sections/bigScreen/components/amap.js b/web/client/src/sections/bigScreen/components/amap.js index 240485d..52e9244 100644 --- a/web/client/src/sections/bigScreen/components/amap.js +++ b/web/client/src/sections/bigScreen/components/amap.js @@ -19,7 +19,7 @@ const Amap = ({ showData }) => { if (AMap) loadMap(); } catch (e) { var script = document.createElement("script"); - script.src = "https://webapi.amap.com/maps?v=2.0&key=00f9a29dedcdbd8befec3dfe0cef5003&plugin=AMap.AutoComplete,AMap.PlaceSearch,AMap.Marker"; + script.src = "https://webapi.amap.com/maps?v=2.0&key=e20863d113b69b83f553ea14dfec668f&plugin=AMap.AutoComplete,AMap.PlaceSearch,AMap.Marker"; document.body.appendChild(script); loadMap(); } @@ -43,7 +43,7 @@ const Amap = ({ showData }) => { zooms: [5, 20], pitch: 0, // 地图俯仰角度,有效范围 0 度- 83 度 viewMode: '3D', // 地图模式 - mapStyle: 'amap://styles/fb26776387242721c2fc32e2cb1daccc', // 主题样式 + mapStyle: 'amap://styles/1f6a7625ef9b3dc9cdd9ff016a7cc66e', // 主题样式 // rotation: 60 // showLabel: false layers: [ diff --git a/web/client/src/sections/bigScreen/components/basis.js b/web/client/src/sections/bigScreen/components/basis.js index 508fff1..394e279 100644 --- a/web/client/src/sections/bigScreen/components/basis.js +++ b/web/client/src/sections/bigScreen/components/basis.js @@ -11,7 +11,7 @@ import Right_2 from './basis/right_2'; import { POWER_STATIONS } from './shuizhan_detail'; import './basis.less' -const Basis = ({ actions, dispatch, user, setshowData }) => { +const Basis = ({ actions, dispatch, setshowData }) => { const { bigScreen } = actions const [siteList, setSiteList] = useState([]) //站点列表 @@ -93,8 +93,8 @@ const Basis = ({ actions, dispatch, user, setshowData }) => { type: 'get', url: `stations/theme/data`, params: { query: { stations: dataId.join(), - startTime: moment().startOf('day').format('YYYY:MM:DD HH:mm:ss'), - endTime: moment().endOf('day').format('YYYY:MM:DD HH:mm:ss'), + startTime: moment().startOf('day').format('YYYY-MM-DD HH:mm:ss'), + endTime: moment().endOf('day').format('YYYY-MM-DD HH:mm:ss'), limit: 1 } } @@ -117,7 +117,7 @@ const Basis = ({ actions, dispatch, user, setshowData }) => { useEffect(async () => { if (strucId) { - + await dispatch(bigScreen.axyData({ type: 'get', url: `structures/${strucId}/factors` })).then(async r => { //泵站信息 let informationId = r.payload.data?.find(v => v.name == '泵站信息')?.id @@ -131,7 +131,7 @@ const Basis = ({ actions, dispatch, user, setshowData }) => { type: 'get', url: `stations/theme/data`, params: { query: { stations: p.payload.data[0]?.groups[0]?.stations[0]?.id, - startTime: moment().add(-24, 'hours').format('YYYY-MM-DD HH:mm:ss'), + startTime: moment().add(-12, 'hours').format('YYYY-MM-DD HH:mm:ss'), endTime: moment().format('YYYY-MM-DD HH:mm:ss'), limit: 1440 } @@ -180,7 +180,7 @@ const Basis = ({ actions, dispatch, user, setshowData }) => { }}>