Renxy 2 gadi atpakaļ
vecāks
revīzija
4e87fcba71

+ 2 - 2
src/components/FloodControl/PersonManagement.jsx

@@ -9,7 +9,7 @@ const PersonManagement = () => {
       name: "管理中心",
       children: [
         {
-          name: "网中心",
+          name: "网中心",
           children: [
             {
               name: "李某某",
@@ -39,7 +39,7 @@ const PersonManagement = () => {
           ],
         },
         {
-          name: "网中心2",
+          name: "网中心2",
           children: [
             {
               name: "李某某",

+ 8 - 8
src/components/FloodControl/WarnMessage.js

@@ -30,15 +30,15 @@ class WarnMessage extends PureComponent {
   render() {
     const { height } = this.props;
     const data = {
-      header: ["报警内容", "泵站名称", "报警时间", "处理人员"],
+      header: ["报警内容", "报警区域", "报警时间", "报警来源"],
       data: [
-        ["水质COD超标", "***泵站", "2023-02-18 10:00", "张先生"],
-        ["水质COD超标", "***泵站", "2023-02-18 10:00", "张先生"],
-        ["水质COD超标", "***泵站", "2023-02-18 10:00", "张先生"],
-        ["水质COD超标", "***泵站", "2023-02-18 10:00", "张先生"],
-        ["水质COD超标", "***泵站", "2023-02-18 10:00", "张先生"],
-        ["水质COD超标", "***泵站", "2023-02-18 10:00", "张先生"],
-        ["水质COD超标", "***泵站", "2023-02-18 10:00", "张先生"],
+        ["液位超高", "***区域", "2023-02-18 10:00", "系统平台"],
+        ["液位超高", "***区域", "2023-02-18 10:00", "系统平台"],
+        ["液位超高", "***区域", "2023-02-18 10:00", "系统平台"],
+        ["液位超高", "***区域", "2023-02-18 10:00", "系统平台"],
+        ["液位超高", "***区域", "2023-02-18 10:00", "系统平台"],
+        ["液位超高", "***区域", "2023-02-18 10:00", "系统平台"],
+        ["液位超高", "***区域", "2023-02-18 10:00", "系统平台"],
       ],
     };
     const config = {

+ 2 - 2
src/components/FloodControl/indexRight.js

@@ -27,8 +27,8 @@ class index extends PureComponent {
             <TopItem color="#f1f00c42">
               <img src={this.state.src1} />
               <TopItemText>
-                <div>在线车辆</div>
-                <div>38 </div>
+                <div>在线人员</div>
+                <div>38 </div>
               </TopItemText>
             </TopItem>
           </TopCon>

+ 1 - 0
src/components/Overview/FloodStat.js

@@ -51,6 +51,7 @@ class FloodStat extends PureComponent {
       ],
       yAxis: [
         {
+          name: "(个)",
           type: "value",
           axisLabel: {
             textStyle: {

+ 4 - 21
src/components/Overview/PipelineMonitoring.js

@@ -8,7 +8,7 @@ class PipelineMonitoring extends PureComponent {
   }
   getOptions() {
     return {
-      color: ["#38b3ff", "#00CA95"],
+      color: ["#00CA95"],
       tooltip: {},
       legend: {
         textStyle: {
@@ -58,39 +58,22 @@ class PipelineMonitoring extends PureComponent {
           type: "value",
           name: "流量(m3/h)",
           axisLine: {
-            lineStyle: "#fff",
-          },
-          axisLabel: {
-            color: "#fff",
+            lineStyle: {
+              color: "#fff",
+            },
           },
-        },
-        {
-          name: "压力(m3/h)",
-          type: "value",
-          splitLine: { show: false },
           axisLabel: {
             color: "#fff",
           },
-          axisLine: {
-            lineStyle: "#fff",
-          },
         },
       ],
       series: [
-        {
-          name: "压力",
-          type: "line",
-          smooth: true,
-          symbol: "none",
-          data: [20, 25, 18, 25, 20, 18, 26, 12, 20, 18, 16, 22, 16],
-        },
         {
           name: "流量",
           type: "line",
           smooth: true,
           symbol: "none",
           areaStyle: {},
-          yAxisIndex: 1,
           data: [25, 30, 28, 36, 42, 20, 28, 36, 42, 30, 35, 18, 16],
         },
       ],

+ 17 - 17
src/components/Overview/WaterPlantMonitoring.js

@@ -29,24 +29,24 @@ class WaterPlantMonitoring extends PureComponent {
   render() {
     const { height } = this.props;
     const userSitua = {
-      header: ["水厂名称", "处理量", "COD", "氨氯", "pH"],
+      header: ["水厂名称", "浊度", "余氯", "pH"],
       data: [
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L", "7.8"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L", "7.8"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L", "7.8"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L", "7.8"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L", "7.8"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L", "7.8"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L", "7.8"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L", "7.8"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L", "7.8"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L", "7.8"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L", "7.8"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L", "7.8"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L", "7.8"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L", "7.8"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L", "7.8"],
-        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L", "7.8"],
+        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
+        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
+        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
+        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
+        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
+        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
+        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
+        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
+        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
+        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
+        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
+        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
+        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
+        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
+        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
+        ["第一水厂", "1530m³/L", "33mg/L", "41mg/L"],
       ],
     };
     const config = {

+ 1 - 3
src/components/Overview/WaterUsage.js

@@ -30,7 +30,7 @@ class WaterUsage extends PureComponent {
             show: false,
             position: "center",
           },
-          center: ["35%","48%"],
+          center: ["35%", "48%"],
           emphasis: {
             label: {
               show: true,
@@ -43,9 +43,7 @@ class WaterUsage extends PureComponent {
           },
           data: [
             { value: 120, name: "饮用水" },
-            { value: 220, name: "生活用水" },
             { value: 150, name: "工业用水" },
-            { value: 50, name: "农业用水" },
             { value: 100, name: "绿化灌溉" },
             { value: 80, name: "水源存储" },
           ],

+ 4 - 4
src/components/PineNet/indexCenter.js

@@ -11,10 +11,10 @@ class index extends PureComponent {
     this.state = {
       data: [
         { name: "产销差率", value: "28%" },
-        { name: "产销差率", value: "28%" },
-        { name: "产销差率", value: "28%" },
-        { name: "产销差率", value: "28%" },
-        { name: "产销差率", value: "28%" },
+        { name: "综合漏损率", value: "28%" },
+        { name: "管网维修及时率", value: "28%" },
+        { name: "管网总长度", value: "28%" },
+        { name: "阀门个数", value: "28%" },
       ],
     };
   }

+ 1 - 1
src/components/PineNet/indexRight.js

@@ -22,7 +22,7 @@ class index extends PureComponent {
             <PipelineMonitoring />
           </ChartBox>
           <ChartBox
-            title="排水网种类统计"
+            title="排水网种类统计"
             style={{ flex: 1, marginTop: 30, marginBottom: 30 }}
           >
             <PineKindChart />

+ 1 - 1
src/components/PineNet/style.js

@@ -107,7 +107,7 @@ export const CenterTop = styled.div`
     height: 140px;
     padding: 20px 0;
     color: #c3c6c9;
-    font-size: 16px;
+    font-size: 14px;
     text-align: center;
     line-height: 30px;
     background: transparent;

+ 3 - 3
src/components/PumpStation/PineKindChart.js

@@ -21,9 +21,9 @@ class PineKindChart extends PureComponent {
             borderRadius: 8,
           },
           data: [
-            { value: 40, name: "雨水管网" },
-            { value: 38, name: "雨污管网" },
-            { value: 32, name: "污水管网" },
+            { value: 40, name: "设备故障" },
+            { value: 38, name: "水质报警" },
+            { value: 32, name: "设备失联" },
           ],
         },
       ],

+ 5 - 5
src/components/PumpStation/indexCenter.js

@@ -10,11 +10,11 @@ class index extends PureComponent {
     super(props);
     this.state = {
       data: [
-        { name: "产销差率", value: "28%" },
-        { name: "产销差率", value: "28%" },
-        { name: "产销差率", value: "28%" },
-        { name: "产销差率", value: "28%" },
-        { name: "产销差率", value: "28%" },
+        { name: "泵站总能耗", value: "28kWh" },
+        { name: "泵站总个数", value: "28%" },
+        { name: "雨水泵站个数", value: "28%" },
+        { name: "污水泵站个数", value: "28%" },
+        { name: "加压泵站个数", value: "28%" },
       ],
     };
   }

+ 2 - 2
src/components/PumpStation/indexLeft.js

@@ -21,12 +21,12 @@ class index extends PureComponent {
           color: "#0b8d14",
         },
         {
-          name: "工单数量",
+          name: "已完成",
           value: 78,
           color: "#9545cf",
         },
         {
-          name: "工单数量",
+          name: "待执行",
           value: 78,
           color: "#d7b728",
         },

+ 19 - 19
src/components/Sewage/WaterQuality.js

@@ -30,26 +30,26 @@ class UserWaterUsage extends PureComponent {
   render() {
     const { height } = this.props;
     const data = {
-      header: ["水厂名称", "进水水量", "进厂COD", "进厂氨氮", "进厂pH"],
+      header: ["水厂名称", "进厂COD", "进厂氨氮", "进厂pH"],
       data: [
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
-        ["第一水厂", "进水水量", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
+        ["第一水厂", "150mg/L", "21mg/L", "7.8"],
       ],
     };
     const config = {

+ 2 - 1
src/components/WaterSupply/WaterVolume.js

@@ -38,6 +38,7 @@ class WaterVolume extends PureComponent {
       },
       yAxis: {
         type: "category",
+        name: "(万m3)",
         data: ["第一水厂", "第二水厂", "第三水厂", "第四水厂", "第五水厂"],
         inverse: true,
         axisLabel: {
@@ -66,7 +67,7 @@ class WaterVolume extends PureComponent {
         },
         {
           realtimeSort: true,
-          name: "水量",
+          name: "水量",
           type: "bar",
           data: [100, 120, 30, 40, 50],
           label: {

+ 1 - 4
src/components/leftPage/index.jsx

@@ -24,10 +24,7 @@ class index extends PureComponent {
         >
           <EnergyRanking />
         </ChartBox>
-        <ChartBox
-          title="当年自来水主要使用用途"
-          style={{ flex: 1, marginTop: 30 }}
-        >
+        <ChartBox title="水资源主要使用用途" style={{ flex: 1, marginTop: 30 }}>
           <WaterUsage />
         </ChartBox>
         <ChartBox title="当年防汛统计" style={{ flex: 1, marginTop: 30 }}>

+ 1 - 1
src/components/rightPage/index.jsx

@@ -18,7 +18,7 @@ class index extends PureComponent {
           <WaterVolumeStat />
         </ChartBox>
         <ChartBox
-          title="当月管网监测"
+          title="当月供水管网监测"
           style={{ flex: 1, marginTop: 30, marginBottom: 30 }}
         >
           <PipelineMonitoring />

+ 8 - 8
src/services/index.js

@@ -45,7 +45,7 @@ export const getCenterPageData = async () => {
   return {
     detailsList: [
       {
-        title: "城市供水总量",
+        title: "水厂产水总量",
         number: 99733.68,
         unit: "m³",
       },
@@ -55,24 +55,24 @@ export const getCenterPageData = async () => {
         unit: "m³",
       },
       {
-        title: "水费收入",
+        title: "城市污水处理总量",
         number: 2300,
         unit: "万元",
       },
       {
-        title: "供水管网",
+        title: "管网长度",
         number: 125,
-        unit: "KM",
+        unit: "km",
       },
       {
-        title: "用户总数",
+        title: "泵站数量",
         number: 117294,
-        unit: "",
+        unit: "",
       },
       {
-        title: "城市污水处理总数",
+        title: "防汛事件",
         number: 87853.73,
-        unit: "",
+        unit: "",
       },
     ],
     mapData: {

+ 21 - 14
yarn.lock

@@ -1214,9 +1214,9 @@
     "@jridgewell/sourcemap-codec" "1.4.14"
 
 "@rc-component/portal@^1.0.0-6", "@rc-component/portal@^1.0.0-8", "@rc-component/portal@^1.0.2":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/portal/-/portal-1.1.0.tgz#6b94450d2c2b00d50b141bd7a0be23bd96503dbe"
-  integrity sha512-tbXM9SB1r5FOuZjRCljERFByFiEUcMmCWMXLog/NmgCzlAzreXyf23Vei3ZpSMxSMavzPnhCovfZjZdmxS3d1w==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/portal/-/portal-1.1.1.tgz#1a30ffe51c240b54360cba8e8bfc5d1f559325c4"
+  integrity sha512-m8w3dFXX0H6UkJ4wtfrSwhe2/6M08uz24HHrF8pWfAXPwA9hwCuTE5per/C86KwNLouRpwFGcr7LfpHaa1F38g==
   dependencies:
     "@babel/runtime" "^7.18.0"
     classnames "^2.3.2"
@@ -2708,7 +2708,7 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-antd@4:
+antd@4.24.8:
   version "4.24.8"
   resolved "https://registry.yarnpkg.com/antd/-/antd-4.24.8.tgz#22f34de6857556868780dfa5fe7b374b0b71b517"
   integrity sha512-wrNy2Hi27uM3948okG3n2GwzQKBFUn1Qn5mn2I/ALcR28rC6cTjHYOuA248Zl9ECzz3jo4TY2R0SIa+5GZ/zGA==
@@ -3263,6 +3263,13 @@ babel-plugin-dynamic-import-node-sync@^2.0.1:
   dependencies:
     "@babel/plugin-syntax-dynamic-import" "^7.0.0-beta.39"
 
+babel-plugin-import@^1.13.6:
+  version "1.13.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-import/-/babel-plugin-import-1.13.6.tgz#4ff2aa3b9759e6a4458ce59890da3684fe3dda9d"
+  integrity sha512-N7FYnGh0DFsvDRkAPsvFq/metVfVD7P2h1rokOPpEH4cZbdRHCW+2jbXt0nnuqowkm/xhh2ww1anIdEpfYa7ZA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+
 babel-plugin-istanbul@^4.1.4, babel-plugin-istanbul@^4.1.5:
   version "4.1.6"
   resolved "https://registry.npmmirror.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
@@ -3303,7 +3310,7 @@ babel-plugin-react-require@3.0.0:
   resolved "https://registry.npmmirror.com/babel-plugin-react-require/-/babel-plugin-react-require-3.0.0.tgz#2e4e7b4496b93a654a1c80042276de4e4eeb20e3"
   integrity sha512-mZV3ycvtB4mfVhmScbU4CjMfBgoQAlsGu/vQw292juPSgvezTmBAke+V85ODAVNCM68r2Qa6dwu72Zcl4cTIbw==
 
-"babel-plugin-styled-components@>= 1.12.0":
+"babel-plugin-styled-components@>= 1.12.0", babel-plugin-styled-components@^2.0.7:
   version "2.0.7"
   resolved "https://registry.npmmirror.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.7.tgz#c81ef34b713f9da2b7d3f5550df0d1e19e798086"
   integrity sha512-i7YhvPgVqRKfoQ66toiZ06jPNA3p6ierpfUuEWxNF+fV27Uv5gxBkf8KZLHUCc1nFA9j6+80pYoIpqCeyW3/bA==
@@ -10720,9 +10727,9 @@ rc-align@^4.0.0:
     resize-observer-polyfill "^1.5.1"
 
 rc-cascader@~3.7.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.7.1.tgz#a0cea44ce0debd6a8b929b4a9f08394538438a46"
-  integrity sha512-LDFq2NjGNLjg83YF3iwkPBcw7SS3fZPUasBgEOp/Yg5gyM1dLGwPsnUBq4bQBXo3TMWZvGrhZXs+gPlVMF+QDw==
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.7.2.tgz#447f2725add7953dee205d1cf59f58a8317bf5f7"
+  integrity sha512-5nPEM76eMyikd0NFiy1gjwiB9m+bOzjY6Lnd5bVC6Ar3XLlOpOnlCcV3oBFWLN3f7B18tAGpaAVlT2uyEDCv9w==
   dependencies:
     "@babel/runtime" "^7.12.5"
     array-tree-filter "^2.1.0"
@@ -10762,9 +10769,9 @@ rc-dialog@~9.0.0, rc-dialog@~9.0.2:
     rc-util "^5.21.0"
 
 rc-drawer@~6.1.0:
-  version "6.1.4"
-  resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-6.1.4.tgz#6c1e7df38f92390c8ace0c92a6866574329c1ce3"
-  integrity sha512-tuRk2Hzecczt4zSH09ZQkAPzvi28HxvTgsTJtqUHgPPezhE+UBypyNls1hLVehD8fpFbsA12flophT2rKT/W8Q==
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-6.1.5.tgz#c4137b944c16b7c179d0dba6f06ebe54f9311ec8"
+  integrity sha512-MDRomQXFi+tvDuwsRAddJ2Oy2ayLCZ29weMzp3rJFO9UNEVLEVV7nuyx5lEgNJIdM//tE6wWQV95cTUiMVqD6w==
   dependencies:
     "@babel/runtime" "^7.10.1"
     "@rc-component/portal" "^1.0.0-6"
@@ -10834,9 +10841,9 @@ rc-mentions@~1.13.1:
     rc-util "^5.22.5"
 
 rc-menu@~9.8.0:
-  version "9.8.2"
-  resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-9.8.2.tgz#179df4ea0fc46fffb7a21e18d3cddb901ce35986"
-  integrity sha512-EahOJVjLuEnJsThoPN+mGnVm431RzVzDLZWHRS/YnXTQULa7OsgdJa/Y7qXxc3Z5sz8mgT6xYtgpmBXLxrZFaQ==
+  version "9.8.3"
+  resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-9.8.3.tgz#8ba1d0825612e641c9f2fe7cbdc83a63236bfb76"
+  integrity sha512-KCwiF+Z1hpf4c9Ww9P6J/tDnmk83x9zYKHkVmXrXiZlQP7RnMTJskQSUJa27CaQYDEwwfDqpek8+rBU8P79AxA==
   dependencies:
     "@babel/runtime" "^7.10.1"
     classnames "2.x"