页面优化

scripts/0.1/schema/0.2pump_information.sql

@@ -0,0 +1,42 @@
+create table t_pump_information
+(
+	id serial not null,
+	structure_id int not null,
+	area varchar(255),
+	scale varchar(255),
+	water_type varchar(255),
+	elc_type varchar(255),
+	by_type varchar(255),
+	func varchar(255),
+	num int,
+	start_time varchar(255),
+	reinforce_time varchar(255)
+);
+
+comment on column t_pump_information.structure_id is '结构物id';
+
+comment on column t_pump_information.area is '所属区域';
+
+comment on column t_pump_information.scale is '泵站规模';
+
+comment on column t_pump_information.water_type is '水泵型号';
+
+comment on column t_pump_information.elc_type is '电机型号';
+
+comment on column t_pump_information.by_type is '变压器型号';
+
+comment on column t_pump_information.func is '类型';
+
+comment on column t_pump_information.num is '机组数量';
+
+comment on column t_pump_information.start_time is '泵站建成时间';
+
+comment on column t_pump_information.reinforce_time is '泵站除险加固时间';
+
+create unique index t_pump_information_id_uindex
+	on t_pump_information (id);
+
+alter table t_pump_information
+	add constraint t_pump_information_pk
+		primary key (id);
+

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

@@ -176,7 +176,7 @@ const Basis = ({ actions, dispatch, setshowData, siteList, siteData }) => {
                >
                   {left2Data.current.map(v => <div style={{
                      display: 'flex', alignItems: 'center', marginTop: 6, width: '100%', height: 36,
-                     backgroundImage: 'linear-gradient(180deg, #000e28e6 1%, #021f48cc 100%)'
+                     backgroundImage: 'url(/assets/images/monitor/san-b.png)', backgroundSize: '100% 100%', backgroundPosition: '0 0', backgroundRepeat: 'no-repeat',
                   }}>
                      <div title={v.name} style={{ width: 76, margin: '0 12px', overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', fontFamily: "SourceHanSansCN-Normal", fontStyle: 'italic' }}>{v.name}</div>
                      <div >

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

@@ -321,7 +321,7 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                            type: 'get', url: `stations/theme/data`, params: {
                               query: {
                                  stations: p.payload.data[0]?.groups[0]?.stations[0]?.id,
-                                 startTime: moment().add(-12, 'hours').format('YYYY-MM-DD HH:mm:ss'),
+                                 startTime: moment().add(-6, 'hours').format('YYYY-MM-DD HH:mm:ss'),
                                  endTime: moment().format('YYYY-MM-DD HH:mm:ss'),
                                  limit: 1440
                               }
@@ -360,7 +360,7 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
             type: 'get', url: `stations/theme/data`, params: {
                query: {
                   stations: pumpId?.join(),
-                  startTime: moment().add(-12, 'hours').format('YYYY-MM-DD HH:mm:ss'),
+                  startTime: moment().add(-6, 'hours').format('YYYY-MM-DD HH:mm:ss'),
                   endTime: moment().format('YYYY-MM-DD HH:mm:ss'),
                   limit: 1440
                }
@@ -387,9 +387,9 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
             type: 'get', url: `stations/theme/data`, params: {
                query: {
                   stations: usePumpId?.join(),
-                  startTime: moment().add(-12, 'hours').format('YYYY-MM-DD HH:mm:ss'),
+                  startTime: moment().add(-6, 'hours').format('YYYY-MM-DD HH:mm:ss'),
                   endTime: moment().format('YYYY-MM-DD HH:mm:ss'),
-                  limit: 3
+                  limit: 1440
                }
             }
          })).then(d => {
@@ -427,7 +427,7 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                                  backgroundSize: '100% 100%',
                                  backgroundPosition: 'center', display: 'flex', justifyContent: 'space-between', alignItems: 'center'
                               }}>
-                                 <div style={{ fontSize: 18, fontWeight: 400, marginLeft: 46, color: '#FFFFFF' }}>{v.name}</div>
+                                 <div style={{ fontSize: 18, fontWeight: 400, marginLeft: 46, color: '#FFFFFF', fontFamily: "YouSheBiaoTiHei" }}>{v.name}</div>
                                  <div style={{
                                     width: 50, height: 26, background: [2, 4, 6].includes(v.data[0]?.sMotor_State) ? '#00434180' : '#a7110033', border: `1px solid ${[2, 4, 6].includes(v.data[0]?.sMotor_State) ? '#00434180' : '#A71100'}`, cursor: "pointer",
                                     borderRadius: 4, color: [2, 4, 6].includes(v.data[0]?.sMotor_State) ? '#00FFF8' : '#E83E2B', textAlign: 'center', lineHeight: '22px', marginRight: 10
@@ -502,7 +502,7 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                                  <div style={{ width: "100%", height: 90, padding: '10px 25px', display: 'flex', flexDirection: 'column', justifyContent: 'space-around', color: 'white' }}>
                                     <div style={{ display: 'flex' }}>
                                        <div style={{ width: 90, textAlign: 'end' }}>总用电量:</div>
-                                       <div style={{ width: 90, textAlign: 'end', color: '#FFCB00' }}>{v.data[0]?.eMotor_EQ?.toFixed(2)} kwh</div>
+                                       <div style={{ width: 90, textAlign: 'end', color: '#FFCB00', fontFamily: "D-DIN-Italic" }}>{v.data[0]?.eMotor_EQ?.toFixed(2)} kwh</div>
                                     </div>
                                     <div style={{ display: 'flex' }}>
                                        <div style={{ width: 90, textAlign: 'end' }}>单次运行时间:</div>
@@ -548,8 +548,8 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                   湿度：</div>{centreData?.sHumidity}  %
             </div>
             <div style={{ color: '#00FFF8', fontSize: 20, position: 'absolute', top: '15%', left: "calc(50% - 90px)", display: 'inline-block' }}>
-               <span style={{ fontSize: 20, color: '#E2F8FF', fontWeight: 600 }}>
+               <span style={{ fontSize: 20, color: '#E2F8FF', fontWeight: 600, }}>
-                  总用量：</span>{centreData?.daySun?.toFixed(2)}  kWh
+                  总用量：</span><span title={centreData?.daySun?.toFixed(2)} style={{ width: 50, lineHeight: "16px", display: "inline-block", overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', }}>{centreData?.daySun?.toFixed(2)}</span>  kWh
             </div>
             <div style={{
                backgroundImage: 'url(/assets/images/monitor/pedestal.png)',
@@ -568,7 +568,8 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                position: 'absolute', top: '35%', left: -60,
             }}>
                <div style={{ fontSize: 18, color: '#E2F8FF', fontWeight: 600 }}>
-                  今年用电：</div>{centreData?.day365?.toFixed(2) || '--'} kWh
+                  今年用电：</div>
+               <span title={centreData?.day365?.toFixed(2)} style={{ width: 90, textAlign:"center",display: "inline-block", overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', }}>{centreData?.day365?.toFixed(2) || '--'}</span> kWh
             </div>
             <div style={{
                backgroundImage: 'url(/assets/images/monitor/oblique.png)',
@@ -577,7 +578,8 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                position: 'absolute', top: '54%', left: 0,
             }}>
                <div style={{ fontSize: 18, color: '#E2F8FF', fontWeight: 600 }}>
-                  当月用电：</div>{centreData?.day30?.toFixed(2) || '--'} kWh
+                  当月用电：</div>
+               <span title={centreData?.day30?.toFixed(2)} style={{ width: 90, textAlign:"center", display: "inline-block", overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', }}>{centreData?.day30?.toFixed(2) || '--'}</span> kWh
             </div>
             <div style={{
                backgroundImage: 'url(/assets/images/monitor/oblique.png)',
@@ -586,7 +588,8 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                position: 'absolute', top: '67%', left: 'calc(50% - 80px)',
             }}>
                <div style={{ fontSize: 18, color: '#E2F8FF', fontWeight: 600 }}>
-                  当日用电：</div>{centreData?.day1?.toFixed(2) || '--'}  kWh
+                  当日用电：</div>
+               <span title={centreData?.day1?.toFixed(2)} style={{ width: 90, textAlign:"center", display: "inline-block", overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', }}>{centreData?.day1?.toFixed(2) || '--'}</span>  kWh
             </div>
 
             <div style={{
@@ -716,7 +719,7 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                                  backgroundSize: '100% 100%',
                                  backgroundPosition: 'center', display: 'flex', justifyContent: 'space-between', alignItems: 'center'
                               }}>
-                                 <div style={{ fontSize: 18, fontWeight: 400, marginLeft: 46, color: '#FFFFFF' }}>{v.name}</div>
+                                 <div style={{ fontSize: 18, fontWeight: 400, marginLeft: 46, color: '#FFFFFF', fontFamily: "YouSheBiaoTiHei" }}>{v.name}</div>
                                  <div style={{
                                     width: 50, height: 26, background: v.sQF_CLOSING ? "#00434180" : '#a7110033', border: `1px solid ${v.sQF_CLOSING ? "#00FFF8" : '#A71100'}`, cursor: "pointer",
                                     borderRadius: 4, color: v.sQF_CLOSING ? '#00FFF8' : '#E83E2B', textAlign: 'center', lineHeight: '22px', marginRight: 10
@@ -860,7 +863,17 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                   options={pumpList?.map(v => ({ value: v.id, label: v.name })) || []}
                />
             </div>
-            <ReactECharts
+            {
+               (() => {
+                  let timeSet = new Set()
+                  electricityTrend?.map(p => {
+                     p.data?.map(s => {
+                        timeSet.add(moment(s.time).format('YYYY-MM-DD HH:mm:ss'))
+                     })
+                  })
+                  let time = [...timeSet].sort((a, b) => moment(a).isBefore(b) ? -1 : 1)
+
+                  return <ReactECharts
                      option={{
                         title: {
                            // text: v.name, 
@@ -892,7 +905,8 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                            type: 'category',
                            // name: "时间",
                            boundaryGap: false,
-                     data: electricityTrend[0]?.data?.map(v => moment(v.time).format('MM-DD HH:mm'))
+                           data: time?.map(v => moment(v).format('MM-DD HH:mm'))
+
                         },
                         yAxis: {
                            type: 'value',
@@ -908,7 +922,9 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                            areaStyle: {
                               color: '#0e9cff26',
                            },
-                     data: v.data?.map(s => s.eMotor_A_A?.toFixed(2) || 0) || []
+                           data: time?.map(d => {
+                              return v.data?.find(f => moment(f.time).format('YYYY-MM-DD HH:mm:ss') == d)?.eMotor_A_A || null
+                           }) || []
                         })) || []
                      }}
                      notMerge={true}
@@ -916,6 +932,9 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                      style={{ width: "100%", height: "100%" }}
                      theme={'ReactEChart'}
                   />
+               })()
+            }
+
          </div>
          <div style={{
             backgroundImage: 'url(/assets/images/monitor/headerTitle.png)',
@@ -942,7 +961,16 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                   options={pumpList?.map(v => ({ value: v.id, label: v.name })) || []}
                />
             </div>
-            <ReactECharts
+            {(() => {
+               let timeSet = new Set()
+               useTrend?.map(p => {
+                  p.data?.map(s => {
+                     timeSet.add(moment(s.time).format('YYYY-MM-DD HH:mm:ss'))
+                  })
+               })
+               let time = [...timeSet].sort((a, b) => moment(a).isBefore(b) ? -1 : 1)
+
+               return <ReactECharts
                   option={{
                      title: {
                         // text: v.name, 
@@ -974,7 +1002,7 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                         type: 'category',
                         // name: "时间",
                         boundaryGap: false,
-                     data: useTrend[0]?.data?.map(v => moment(v.time).format('MM-DD HH:mm'))
+                        data: time?.map(v => moment(v.time).format('MM-DD HH:mm'))
                      },
                      yAxis: {
                         type: 'value',
@@ -984,7 +1012,6 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                         },
                      },
                      series: useTrend?.map(v => {
-                     let front = [{}, {}]
                         return {
                            type: 'line',
                            name: v.name,
@@ -992,10 +1019,8 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                            areaStyle: {
                               color: '#0e9cff26',
                            },
-                        data: v.data?.map(s => {
+                           data: time?.map(d => {
-                           front[0] = front[1]
+                              return v.data?.find(f => moment(f.time).format('YYYY-MM-DD HH:mm:ss') == d)?.eMotor_EQ || null
-                           front[1] = s
-                           return front[0]?.eMotor_EQ && (s?.eMotor_EQ - front[0]?.eMotor_EQ)?.toFixed(2) || 0
                            }) || []
                         }
                      }) || []
@@ -1005,6 +1030,8 @@ const Capacity = ({ actions, dispatch, siteList, }) => {
                   style={{ width: "100%", height: "100%" }}
                   theme={'ReactEChart'}
                />
+            })()}
+
          </div>
       </div>
    </div >

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

@@ -238,8 +238,8 @@ const Electrical = ({ dispatch, actions, siteList}) => {
             </div>
          </div>
          <img style={{ width: "44%", height: "46%", position: "absolute", left: "28%", top: "34%" }} src={`/assets/images/electrical/centre.png`} />
-         <div style={{ background: '#102d4c94', border: '1px solid #4CA1FF', position: "absolute", left: "33%", top: "58%" }}>集水池水位<span style={{ color: '#FFCB00', fontFamily: 'DIN-Medium' }}>{depthWater[0]?.sLiquid_level?.toFixed(2) || 0}</span>米</div>
+         <div style={{ background: '#102d4c94', border: '1px solid #4CA1FF', position: "absolute", left: "33%", top: "58%" }}>集水池水位<span style={{ color: '#FFCB00', fontFamily: 'DIN-Medium' }}>{depthWater[depthWater?.length - 1]?.sLiquid_level?.toFixed(2) || 0}</span>米</div>
-         <div style={{ background: '#102d4c94', border: '1px solid #4CA1FF', position: "absolute", left: "36%", top: "70%" }}>池前上游水位<span style={{ color: '#FFCB00', fontFamily: 'DIN-Medium' }}>{depthWater[0]?.sGrille_level?.toFixed(2) || 0}</span>米</div>
+         <div style={{ background: '#102d4c94', border: '1px solid #4CA1FF', position: "absolute", left: "36%", top: "70%" }}>池前上游水位<span style={{ color: '#FFCB00', fontFamily: 'DIN-Medium' }}>{depthWater[depthWater?.length - 1]?.sGrille_level?.toFixed(2) || 0}</span>米</div>
          <div className='site' style={{
             display: 'flex', justifyContent: 'center', alignItems: 'center',
             width: '40%', bottom: 10, position: 'absolute', left: "28%"

web/client/src/sections/bigScreen/components/electrity/realTimeStatus.js

@@ -153,7 +153,7 @@ const RealTimeStatus = (props) => {
                   <div style={{ marginRight: 6 }}>
                      {pumpOne?.data[0]?.sMotor_RunMode == 1 ? '就地手动'
                         : pumpOne?.data[0]?.sMotor_RunMode == 2 ? "平台手动"
-                           : pumpOne?.data[0]?.sMotor_RunMode == 2 ? "平台液控" : "--"}
+                           : pumpOne?.data[0]?.sMotor_RunMode == 3 ? "平台液控" : "--"}
                   </div>
                </div>
             </div>
@@ -179,11 +179,11 @@ const RealTimeStatus = (props) => {
          }}>
             <div style={{ display: 'flex', width: "48%" }}>
                <div style={{ width: 80, textIndent: 10, fontFamily: "SourceHanSansCN-Medium", color: "#63B0FF", }}>运行电流：</div>
-               <div style={{ flex: 1, textAlign: "end", fontSize: 16, fontFamily: "YouSheBiaoTiHei" }}>{pumpOne?.data[0]?.eMotor_A_A} min</div>
+               <div style={{ flex: 1, textAlign: "end", fontSize: 16, fontFamily: "YouSheBiaoTiHei" }}>{pumpOne?.data[0]?.eMotor_A_A} A</div>
             </div>
             <div style={{ display: 'flex', width: "48%" }}>
                <div style={{ width: 80, textIndent: 10, fontFamily: "SourceHanSansCN-Medium", color: "#63B0FF", }}>运行电压：</div>
-               <div style={{ flex: 1, textAlign: "end", fontSize: 16, fontFamily: "YouSheBiaoTiHei" }}>{pumpOne?.data[0]?.eMotor_A_V} h</div>
+               <div style={{ flex: 1, textAlign: "end", fontSize: 16, fontFamily: "YouSheBiaoTiHei" }}>{pumpOne?.data[0]?.eMotor_A_V} V</div>
             </div>
          </div>
       </div>

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

@@ -38,7 +38,7 @@ const AccumulateTime = ({ user, softStartData }) => {
                         width: 148, height: 130, display: 'flex', flexDirection: "column", alignItems: 'center'
                      }}>
                         <div style={{ fontFamily: 'YouSheBiaoTiHei', fontSize: 20, }}>{v.name}</div>
-                        <div>{v.data[0]?.dPump_T_T}</div>
+                        <div style={{ fontFamily: 'D-DIN-Italic' }}>{v.data[0]?.dPump_T_T}</div>
                      </div>
                   })
                }

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

@@ -199,24 +199,24 @@ const General = ({ dispatch, actions, stations }) => {
          display: "flex", justifyContent: 'center', alignItems: "center"
       }}>
          <div>
-            <div style={{ width: 150, height: 56, display: "flex" }}>
+            <div style={{ width: 150, height: 56, display: "flex", background: 'linear-gradient(90deg, #023E70 0%, #023e7000 100%)' }}>
                <img style={{ width: 40, height: 45 }} src="/assets/images/realTime/notebook.png" />
                <div style={{ marginLeft: 10 }}>
                   <div>{interval == '本日' ?
                      "当日用电" : interval == '本月' ?
                         "当月用电" : interval == '本年' ?
                            "当年用电" : ""}</div>
-                  <div>{electro?.now.toFixed(2)} kwh</div>
+                  <div style={{ fontFamily: 'D-DIN-Italic' }}>{electro?.now.toFixed(2)} kwh</div>
                </div>
             </div>
-            <div style={{ width: 150, height: 56, display: "flex" }}>
+            <div style={{ width: 150, height: 56, display: "flex", background: 'linear-gradient(90deg, #023E70 0%, #023e7000 100%)' }}>
                <img style={{ width: 40, height: 45 }} src="/assets/images/realTime/notebook.png" />
                <div style={{ marginLeft: 10 }}>
                   <div>{interval == '本日' ?
                      "昨日用电" : interval == '本月' ?
                         "上月用电" : interval == '本年' ?
                            "上年用电" : ""}</div>
-                  <div>{electro?.before?.toFixed(2)} kwh</div>
+                  <div style={{ fontFamily: 'D-DIN-Italic' }}>{electro?.before?.toFixed(2)} kwh</div>
                </div>
             </div>
          </div>
@@ -224,7 +224,7 @@ const General = ({ dispatch, actions, stations }) => {
             <img style={{ width: 10, height: 100 }} src="/assets/images/realTime/left.png" />
             <div style={{
                backgroundImage: 'url(/assets/images/realTime/specific.png)',
-               backgroundSize: '100% 100%', backgroundPosition: '0 0', backgroundRepeat: 'no-repeat',
+               backgroundSize: '100% 70%', backgroundPosition: '0 100%', backgroundRepeat: 'no-repeat',
                width: 170, height: 50, height: 100, display: "flex", flexDirection: "column", alignItems: "center"
             }}>
                <div style={{ color: "#D4EDFD", fontSize: 18, fontFamily: "PingFangSC-Regular" }}>用电同比</div>

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

@@ -38,7 +38,7 @@ const RunTime = ({ user, softStartData }) => {
                         width: 148, height: 130, display: 'flex', flexDirection: "column", alignItems: 'center'
                      }}>
                         <div style={{ fontFamily: 'YouSheBiaoTiHei', fontSize: 20, }}>{v.name}</div>
-                        <div>{v.data[0]?.dPump_T_S}</div>
+                        <div style={{ fontFamily: 'D-DIN-Italic' }}>{v.data[0]?.dPump_T_S}</div>
                      </div>
                   })
                }

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

@@ -38,7 +38,7 @@ const SoftStart = ({ user, softStartData }) => {
                         width: 148, height: 130, display: 'flex', flexDirection: "column", alignItems: 'center'
                      }}>
                         <div style={{ fontFamily: 'YouSheBiaoTiHei', fontSize: 20, }}>{v.name}</div>
-                        <div>{v.data[0]?.eMotor_EQ}</div>
+                        <div style={{ fontFamily: 'D-DIN-Italic' }}>{v.data[0]?.eMotor_EQ}</div>
                      </div>
                   })
                }