Renxy 1 år sedan
förälder
incheckning
e39e026a26

+ 4 - 2
src/pages/Center/index.less

@@ -1,6 +1,8 @@
 .page {
 .page {
-  margin: auto;
-  width: 80%;
+  // margin: auto;
+  width: 100%;
+  padding: 0 200px;
+  background-color: #ffffff;
 }
 }
 .box {
 .box {
   background: rgba(255, 255, 255, 0.78);
   background: rgba(255, 255, 255, 0.78);

+ 1 - 1
src/pages/DeviceManager/storage.js

@@ -124,7 +124,7 @@ const StorageOverview = () => {
   return (
   return (
     <PageContent closeable={false}>
     <PageContent closeable={false}>
       <PageTitle children="备品统计" returnable />
       <PageTitle children="备品统计" returnable />
-      <div className={`card-box ${styles.main}`}>
+      <div className={`card-box content-title ${styles.main}`}>
         <Spin spinning={loading}>
         <Spin spinning={loading}>
           <ModuleTitle title="物料种类库存占比" />
           <ModuleTitle title="物料种类库存占比" />
           <div style={{ height: '330px' }}>
           <div style={{ height: '330px' }}>

+ 4 - 7
src/pages/SmartReport/index.js

@@ -172,6 +172,8 @@ const SmartReport = () => {
   };
   };
 
 
   const {
   const {
+    ele_65,
+    ele_66,
     electricity,
     electricity,
     in_water,
     in_water,
     maintain_record,
     maintain_record,
@@ -344,17 +346,12 @@ const SmartReport = () => {
             <div className={styles.smartText}>
             <div className={styles.smartText}>
               优化条数:{push_optimize_task}条
               优化条数:{push_optimize_task}条
             </div>
             </div>
+            <div className={styles.smartText}>超滤能耗:{ele_65}</div>
+            <div className={styles.smartText}>反渗透能耗:{ele_66}</div>
             <div
             <div
               ref={workScoreDomRef}
               ref={workScoreDomRef}
               style={{ height: '340px', margin: '10px 0 10px 0' }}
               style={{ height: '340px', margin: '10px 0 10px 0' }}
             ></div>
             ></div>
-            {/* <div className={styles.smartText}>工况分数统计(折线图)</div> */}
-            <div className={styles.smartText}>
-              超滤工况统计(膜寿命、能耗、药耗数据)
-            </div>
-            <div className={styles.smartText}>
-              反渗透工况统计(膜寿命、能耗、药耗数据)
-            </div>
           </div>
           </div>
           <div className={styles.box}>
           <div className={styles.box}>
             <ModuleTitle title="任务工单" />
             <ModuleTitle title="任务工单" />

+ 1 - 1
src/pages/TaskManage/index.less

@@ -1,7 +1,7 @@
 .taskList {
 .taskList {
   border: none;
   border: none;
   max-height: calc(100vh - 140px);
   max-height: calc(100vh - 140px);
-  overflow-y: scroll;
+  overflow-y: auto;
 
 
   .listItem {
   .listItem {
     margin: 20px 20px 20px 0;
     margin: 20px 20px 20px 0;