Merge branch 'master' of https://gitea.anxinyun.cn/wenlele/PumpStation

web/client/src/sections/auth/containers/login.js

@@ -26,11 +26,16 @@ const Login = props => {
    const [codCountDown, setCodeCountDown] = useState(60)
    const codCountDownRef = useRef(0)
    const [form] = Form.useForm();
-   useEffect(() => {
 
+   useEffect(() => {
+      // 水环境跳转自动登录
+      const structId = getUrlParams(window.location.search)?.structId;
+      if (structId) {
+         sessionStorage.setItem('structId', structId);
+         dispatch(login({ username: 'SuperAdmin', password: '123456' }));
+      }
    }, [])
 
-
    useEffect(() => {
       if (user && user.authorized) {
          dispatch(push('/systemManagement'));
@@ -102,7 +107,7 @@ const Login = props => {
                      form={form}
                      onFinish={r => {
                         form.validateFields().then(r => {
-                           dispatch(login({ username: r.username, password: r.password}));
+                           dispatch(login({ username: r.username, password: r.password }));
                         })
                            .catch(err => {
                               dispatch({
@@ -153,7 +158,7 @@ const Login = props => {
    );
 }
 
-function mapStateToProps (state) {
+function mapStateToProps(state) {
    const { auth, global } = state;
    return {
       user: auth.user,
@@ -163,3 +168,15 @@ function mapStateToProps (state) {
 }
 
 export default connect(mapStateToProps)(Login);
+
+function getUrlParams(url) {
+   if (!url) return;
+   let arr = url.split('?');
+   let params = arr[1].split('&');
+   let obj = {};
+   for (let i = 0; i < params.length; i++) {
+      let param = params[i].split('=');
+      obj[param[0]] = param[1];
+   }
+   return obj;
+}

web/client/src/sections/bigScreen/components/basis.js

@@ -46,8 +46,6 @@ const Basis = ({ actions, dispatch, setshowData, siteList, siteData }) => {
    useEffect(async () => {
 
       if (siteData) {
-         setStrucId(siteData[0]?.id)
-        
          //获取所有泵站的集水池液位
          siteData?.map(async v => {
             await dispatch(bigScreen.axyData({ type: 'get', url: `structures/${v.id}/factors` })).then(async r => {
@@ -125,12 +123,21 @@ const Basis = ({ actions, dispatch, setshowData, siteList, siteData }) => {
    }, [siteData])
 
    useEffect(() => {
-      setStrucId(siteList[0]?.value)
+      const autoStructId = sessionStorage.getItem('structId');
+      let nextStructId = siteList[0]?.value;
+      if (autoStructId) {
+         for (let i = 0; i < siteList.length; i++) {
+            if (autoStructId == siteList[i].value) {
+               nextStructId = siteList[i].value;
+               break;
+            }
+         }
+      }
+      setStrucId(nextStructId);
    }, [siteList])
 
    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
@@ -155,16 +162,12 @@ const Basis = ({ actions, dispatch, setshowData, siteList, siteData }) => {
                         }
                      })
                   }
-
                })
             }
          })
       }
-
-
    }, [strucId])
 
-
    return <div className='super-screen-body'>
       <div className='super-screen-card left'>
          <Left_1 data={left1Data.current} />
@@ -230,7 +233,7 @@ const Basis = ({ actions, dispatch, setshowData, siteList, siteData }) => {
    </div >
 }
 
-function mapStateToProps (state) {
+function mapStateToProps(state) {
    const { auth, global } = state;
    return {
       user: auth.user,

web/client/src/sections/bigScreen/components/capacity.js

@@ -21,12 +21,18 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
    const [electricityTrend, setElectricityTrend] = useState([])   //电流趋势
    const [useTrend, setUseTrend] = useState([])   //用电趋势
 
-
-
-
-
    useEffect(() => {
-      setStrucId(siteList[0]?.value)
+      const autoStructId = sessionStorage.getItem('structId');
+      let nextStructId = siteList[0]?.value;
+      if (autoStructId) {
+         for (let i = 0; i < siteList.length; i++) {
+            if (autoStructId == siteList[i].value) {
+               nextStructId = siteList[i].value;
+               break;
+            }
+         }
+      }
+      setStrucId(nextStructId);
    }, [siteList])
 
    useEffect(async () => {
@@ -810,7 +816,7 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                         areaStyle: {
                            color: '#0e9cff26',
                         },
-                        data: depthWater?.map(v => [moment(v.time).format('YYYY-MM-DD HH:mm:ss'), v.sLiquid_level?.toFixed(2) || null])||[]
+                        data: depthWater?.map(v => [moment(v.time).format('YYYY-MM-DD HH:mm:ss'), v.sLiquid_level?.toFixed(2) || null]) || []
                      }, {
                         type: 'line',
                         name: '池前（上游）液位',
@@ -818,7 +824,7 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                         areaStyle: {
                            color: '#0e9cff26',
                         },
-                        data: depthWater?.map(v => [moment(v.time).format('YYYY-MM-DD HH:mm:ss'), v.sGrille_level?.toFixed(2) || null])||[]
+                        data: depthWater?.map(v => [moment(v.time).format('YYYY-MM-DD HH:mm:ss'), v.sGrille_level?.toFixed(2) || null]) || []
                      },
                   ]
                }}
@@ -1005,7 +1011,7 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
    </div >
 }
 
-function mapStateToProps (state) {
+function mapStateToProps(state) {
    const { auth, global } = state;
    return {
       user: auth.user,

web/client/src/sections/bigScreen/components/electrical.js

@@ -31,9 +31,18 @@ const Electrical = ({ dispatch, actions, siteList }) => {
    const [electricityTrend, setElectricityTrend] = useState([])   //电流趋势
    const [useTrend, setUseTrend] = useState([])   //用电趋势
 
-
    useEffect(() => {
-      setStrucId(siteList[0]?.value)
+      const autoStructId = sessionStorage.getItem('structId');
+      let nextStructId = siteList[0]?.value;
+      if (autoStructId) {
+         for (let i = 0; i < siteList.length; i++) {
+            if (autoStructId == siteList[i].value) {
+               nextStructId = siteList[i].value;
+               break;
+            }
+         }
+      }
+      setStrucId(nextStructId);
    }, [siteList])
 
    useEffect(async () => {
@@ -202,7 +211,7 @@ const Electrical = ({ dispatch, actions, siteList }) => {
             }}>
                <div style={{ fontSize: 20, color: '#E2F8FF', fontWeight: 600 }}>
                   环境湿度：</div>
-                  <span style={{color: '#00FFF8',fontFamily:"D-DIN-Italic"}}>{depthWater[depthWater.length-1]?.sHumidity || "--"}  %</span>
+               <span style={{ color: '#00FFF8', fontFamily: "D-DIN-Italic" }}>{depthWater[depthWater.length - 1]?.sHumidity || "--"}  %</span>
             </div>
             <div style={{
                backgroundImage: 'url(/assets/images/monitor/pedestal.png)',
@@ -212,7 +221,7 @@ const Electrical = ({ dispatch, actions, siteList }) => {
                <div style={{ fontSize: 20, color: '#E2F8FF', fontWeight: 600 }}>
                   环境温度：
                </div>
-                  <span style={{color: '#00FFF8',fontFamily:"D-DIN-Italic"}}>{depthWater[depthWater.length-1]?.sTEMP || "--"}  ℃</span>
+               <span style={{ color: '#00FFF8', fontFamily: "D-DIN-Italic" }}>{depthWater[depthWater.length - 1]?.sTEMP || "--"}  ℃</span>
             </div>
             <div style={{
                backgroundImage: 'url(/assets/images/monitor/pedestal.png)',
@@ -221,7 +230,7 @@ const Electrical = ({ dispatch, actions, siteList }) => {
             }}>
                <div style={{ fontSize: 20, color: '#E2F8FF', fontWeight: 600 }}>
                   信号：</div>
-                  <span style={{color: '#00FFF8',fontFamily:"D-DIN-Italic"}}>{depthWater[depthWater.length-1]?.CSQ4G || "--"}</span>
+               <span style={{ color: '#00FFF8', fontFamily: "D-DIN-Italic" }}>{depthWater[depthWater.length - 1]?.CSQ4G || "--"}</span>
             </div>
          </div>
          <img style={{ width: "44%", height: "46%", position: "absolute", left: "28%", top: "34%" }} src={`/assets/images/electrical/centre.png`} />
@@ -254,7 +263,7 @@ const Electrical = ({ dispatch, actions, siteList }) => {
    </div >
 }
 
-function mapStateToProps (state) {
+function mapStateToProps(state) {
    const { auth, global } = state;
    return {
       user: auth.user,

web/client/src/sections/bigScreen/components/realTime.js

@@ -19,11 +19,18 @@ const RealTime = ({ dispatch, actions, user, siteList, }) => {
    const [electro, setElectro] = useState({ week: 0, year: 0, day: 0 })  //用电概况
    const [level, setLevel] = useState(0)  //实时液位
 
-
-
-
    useEffect(() => {
-      setStrucId(siteList[0]?.value)
+      const autoStructId = sessionStorage.getItem('structId');
+      let nextStructId = siteList[0]?.value;
+      if (autoStructId) {
+         for (let i = 0; i < siteList.length; i++) {
+            if (autoStructId == siteList[i].value) {
+               nextStructId = siteList[i].value;
+               break;
+            }
+         }
+      }
+      setStrucId(nextStructId);
    }, [siteList])
 
    useEffect(async () => {
@@ -333,7 +340,7 @@ const RealTime = ({ dispatch, actions, user, siteList, }) => {
    </div >
 }
 
-function mapStateToProps (state) {
+function mapStateToProps(state) {
    const { auth, global } = state;
    return {
       user: auth.user,