Renxy 1 vuosi sitten
vanhempi
commit
50c2d66676
60 muutettua tiedostoa jossa 98 lisäystä ja 46 poistoa
  1. BIN
      src/assets/TaskManage/viewOrder.png
  2. BIN
      src/assets/TaskManage/yiwancheng@2x.png
  3. BIN
      src/assets/air-conditioner.png
  4. BIN
      src/assets/center/circle.png
  5. BIN
      src/assets/center/my-task.png
  6. BIN
      src/assets/center/my-task@2x.png
  7. BIN
      src/assets/center/order.png
  8. BIN
      src/assets/center/order@2x.png
  9. BIN
      src/assets/center/profile.png
  10. BIN
      src/assets/circle-error.png
  11. BIN
      src/assets/circle-success.png
  12. BIN
      src/assets/defense.png
  13. BIN
      src/assets/deviceManager/deviceIcon.png
  14. BIN
      src/assets/deviceManager/doorIcon.png
  15. BIN
      src/assets/deviceManager/spareIcon.png
  16. BIN
      src/assets/greentech.png
  17. BIN
      src/assets/home-box-bg.png
  18. BIN
      src/assets/home-box-bg2.png
  19. BIN
      src/assets/home-box-line.png
  20. BIN
      src/assets/home-circle.png
  21. BIN
      src/assets/home-self-circle.png
  22. BIN
      src/assets/menu/ai.png
  23. BIN
      src/assets/menu/arrow.png
  24. BIN
      src/assets/menu/device.png
  25. BIN
      src/assets/menu/home-self-circle.png
  26. BIN
      src/assets/menu/home.png
  27. BIN
      src/assets/menu/menu_bg.png
  28. BIN
      src/assets/menu/number.png
  29. BIN
      src/assets/menu/right_bg.png
  30. BIN
      src/assets/menu/safty.png
  31. BIN
      src/assets/menu/setting.png
  32. BIN
      src/assets/menu/smart.png
  33. BIN
      src/assets/menu/walk.png
  34. BIN
      src/assets/menu/working.png
  35. BIN
      src/assets/page-bg.png
  36. BIN
      src/assets/projects/arrow-01.png
  37. BIN
      src/assets/projects/arrow-02.png
  38. BIN
      src/assets/projects/bg-01.png
  39. BIN
      src/assets/projects/bg.png
  40. BIN
      src/assets/projects/item-bg-down.png
  41. BIN
      src/assets/projects/item-bg.png
  42. BIN
      src/assets/self-empty.png
  43. BIN
      src/assets/smartOps/icon04.png
  44. BIN
      src/assets/smartOps/icon05.png
  45. BIN
      src/assets/tbodyBg1.png
  46. BIN
      src/assets/vs.png
  47. 16 0
      src/components/ManagementPage/BarChartModule.js
  48. 2 2
      src/components/ManagementPage/PieChartModule.js
  49. 1 1
      src/components/ManagementPage/RadarChartModule.js
  50. 9 9
      src/components/ManagementPage/chartModule.js
  51. 1 1
      src/global.less
  52. 8 8
      src/pages/EqSelfInspection/Statistics.js
  53. 1 0
      src/pages/EqSelfInspection/index.js
  54. 2 2
      src/pages/Smart/Params/components/BarChart.js
  55. 1 1
      src/pages/Smart/Params/components/RadarChartModule.js
  56. 8 8
      src/pages/Smart/components/SimulateDetail.js
  57. 7 4
      src/pages/Smart/components/SimulatePie.js
  58. 1 0
      src/pages/SmartOps/components/VideoAnalysis.less
  59. 33 10
      src/pages/SmartReport/index.js
  60. 8 0
      src/pages/SmartReport/index.less

BIN
src/assets/TaskManage/viewOrder.png


BIN
src/assets/TaskManage/yiwancheng@2x.png


BIN
src/assets/air-conditioner.png


BIN
src/assets/center/circle.png


BIN
src/assets/center/my-task.png


BIN
src/assets/center/my-task@2x.png


BIN
src/assets/center/order.png


BIN
src/assets/center/order@2x.png


BIN
src/assets/center/profile.png


BIN
src/assets/circle-error.png


BIN
src/assets/circle-success.png


BIN
src/assets/defense.png


BIN
src/assets/deviceManager/deviceIcon.png


BIN
src/assets/deviceManager/doorIcon.png


BIN
src/assets/deviceManager/spareIcon.png


BIN
src/assets/greentech.png


BIN
src/assets/home-box-bg.png


BIN
src/assets/home-box-bg2.png


BIN
src/assets/home-box-line.png


BIN
src/assets/home-circle.png


BIN
src/assets/home-self-circle.png


BIN
src/assets/menu/ai.png


BIN
src/assets/menu/arrow.png


BIN
src/assets/menu/device.png


BIN
src/assets/menu/home-self-circle.png


BIN
src/assets/menu/home.png


BIN
src/assets/menu/menu_bg.png


BIN
src/assets/menu/number.png


BIN
src/assets/menu/right_bg.png


BIN
src/assets/menu/safty.png


BIN
src/assets/menu/setting.png


BIN
src/assets/menu/smart.png


BIN
src/assets/menu/walk.png


BIN
src/assets/menu/working.png


BIN
src/assets/page-bg.png


BIN
src/assets/projects/arrow-01.png


BIN
src/assets/projects/arrow-02.png


BIN
src/assets/projects/bg-01.png


BIN
src/assets/projects/bg.png


BIN
src/assets/projects/item-bg-down.png


BIN
src/assets/projects/item-bg.png


BIN
src/assets/self-empty.png


BIN
src/assets/smartOps/icon04.png


BIN
src/assets/smartOps/icon05.png


BIN
src/assets/tbodyBg1.png


BIN
src/assets/vs.png


+ 16 - 0
src/components/ManagementPage/BarChartModule.js

@@ -86,6 +86,10 @@ const defaultOption = {
         color: '#c9d2d2',
       },
     },
+    axisLabel: {
+      color: '#000000',
+      fontSize: '0.18rem',
+    },
     data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
   },
   yAxis: {
@@ -99,10 +103,16 @@ const defaultOption = {
     axisLine: {
       show: false,
     },
+    axisLabel: {
+      fontSize: '0.18rem',
+    },
   },
   legend: {
     icon: 'circle',
     right: '20%',
+    textStyle: {
+      fontSize: '0.24rem',
+    },
   },
   series: [
     {
@@ -112,6 +122,9 @@ const defaultOption = {
       label: {
         show: true,
         position: 'top',
+        textStyle: {
+          fontSize: '0.24rem',
+        },
       },
       barGap: '0',
       barMaxWidth: '10%',
@@ -123,6 +136,9 @@ const defaultOption = {
       label: {
         show: true,
         position: 'top',
+        textStyle: {
+          fontSize: '0.24rem',
+        },
       },
       barGap: '0',
       barMaxWidth: '10%',

+ 2 - 2
src/components/ManagementPage/PieChartModule.js

@@ -80,7 +80,7 @@ const defaultOption = {
         { value: 300, name: 'Video Ads' },
       ],
       label: {
-        fontSize: 12,
+        fontSize: '0.18rem',
       },
       emphasis: {
         itemStyle: {
@@ -89,7 +89,7 @@ const defaultOption = {
           shadowColor: 'rgba(0, 0, 0, 0.5)',
         },
         label: {
-          fontSize: 12,
+          fontSize: '0.24rem',
         },
       },
     },

+ 1 - 1
src/components/ManagementPage/RadarChartModule.js

@@ -80,7 +80,7 @@ const defaultOption = {
   radar: {
     name: {
       textStyle: {
-        fontSize: 12,
+        fontSize: '0.18rem',
       },
     },
     splitArea: {

+ 9 - 9
src/components/ManagementPage/chartModule.js

@@ -202,7 +202,7 @@ const defaultOption = {
   tooltip: {
     trigger: 'axis',
     textStyle: {
-      fontSize: 12,
+      fontSize: '0.24rem',
     },
   },
   grid: {
@@ -215,10 +215,10 @@ const defaultOption = {
     boundaryGap: false,
     axisTick: { show: false },
     nameTextStyle: {
-      fontSize: 12,
+      fontSize: '0.24rem',
     },
     axisLabel: {
-      fontSize: 12,
+      fontSize: '0.24rem',
     },
     data: [
       '00:00',
@@ -237,12 +237,12 @@ const defaultOption = {
       name: '000',
       top: 20,
       nameTextStyle: {
-        fontSize: 12,
+        fontSize: '0.24rem',
         // align: 'left',
         padding: [0, 0, 20, 0],
       },
       axisLabel: {
-        fontSize: 12,
+        fontSize: '0.24rem',
       },
       axisLine: {
         show: false,
@@ -262,7 +262,7 @@ const defaultOption = {
       top: 20,
       position: 'right',
       nameTextStyle: {
-        fontSize: 12,
+        fontSize: '0.24rem',
         // align: 'left',
         padding: [0, 0, 20, 0],
       },
@@ -285,7 +285,7 @@ const defaultOption = {
       position: 'right',
       offset: 80,
       nameTextStyle: {
-        fontSize: 12,
+        fontSize: '0.24rem',
         // align: 'left',
         padding: [0, 0, 20, 0],
       },
@@ -411,7 +411,7 @@ const defaultOption = {
       },
       title: {
         offsetCenter: [0, '25%'],
-        fontSize: 14,
+        fontSize: '0.24rem',
       },
       detail: {
         show: false,
@@ -427,7 +427,7 @@ const defaultOption = {
     data: ['进水水量', '预测出水量', '实际出水量'],
     lineStyle: {},
     textStyle: {
-      fontSize: 12,
+      fontSize: '0.24rem',
     },
   },
   // toolbox: {

+ 1 - 1
src/global.less

@@ -349,7 +349,7 @@ input[type='reset'] {
 }
 
 .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
-  // height: 0.4rem;
+  height: auto;
   padding: 0.04rem 0.11rem;
 }
 .ant-select-single .ant-select-selector {

+ 8 - 8
src/pages/EqSelfInspection/Statistics.js

@@ -208,7 +208,7 @@ const getLineOption = (time, chartData, name) => {
         },
       },
       textStyle: {
-        fontSize: 18,
+        fontSize: '0.24rem',
       },
     },
     // grid: {
@@ -227,7 +227,7 @@ const getLineOption = (time, chartData, name) => {
         },
       },
       axisLabel: {
-        fontSize: 12,
+        fontSize: '0.16rem',
       },
       data: time,
     },
@@ -247,7 +247,7 @@ const getLineOption = (time, chartData, name) => {
           color: '#555',
         },
         axisLabel: {
-          fontSize: 12,
+          fontSize: '0.16rem',
           color: '#555',
         },
         axisLine: {
@@ -272,7 +272,7 @@ const getLineOption = (time, chartData, name) => {
     legend: {
       textStyle: {
         color: '#555',
-        fontSize: 14,
+        fontSize: '0.18rem',
       },
       lineStyle: {},
     },
@@ -284,7 +284,7 @@ const getLineOption = (time, chartData, name) => {
       textStyle: {
         color: '#555',
         fontWeight: 'normal',
-        fontSize: 14,
+        fontSize: '0.18rem',
       },
     },
     // textStyle: {
@@ -340,7 +340,7 @@ const getPieOption = (chartData, name) => {
       textStyle: {
         color: '#555',
         fontWeight: 'normal',
-        fontSize: 14,
+        fontSize: '0.18rem',
       },
     },
     color: [
@@ -357,7 +357,7 @@ const getPieOption = (chartData, name) => {
     tooltip: {
       trigger: 'item',
       textStyle: {
-        fontSize: 18,
+        fontSize: '0.24rem',
       },
     },
     legend: {
@@ -365,7 +365,7 @@ const getPieOption = (chartData, name) => {
       // left: 'left',
       textStyle: {
         color: '#555',
-        fontSize: 14,
+        fontSize: '0.18rem',
       },
     },
     series: [

+ 1 - 0
src/pages/EqSelfInspection/index.js

@@ -118,6 +118,7 @@ const EqSelfInspection = (props) => {
     });
 
     UnityAction.on('notiZiJian', (id) => {
+      alert('0-00000' + id);
       handleJumpDetail(id);
     });
 

+ 2 - 2
src/pages/Smart/Params/components/BarChart.js

@@ -69,7 +69,7 @@ const getOption = chartData => {
         },
         label: {
           // color: '#fff',
-          fontSize: 16,
+          fontSize: '0.16rem',
         },
         data: chartData[0].value,
       },
@@ -83,7 +83,7 @@ const getOption = chartData => {
         },
         label: {
           // color: '#fff',
-          fontSize: 16,
+          fontSize: '0.16rem',
         },
         data: chartData[1].value,
       },

+ 1 - 1
src/pages/Smart/Params/components/RadarChartModule.js

@@ -85,7 +85,7 @@ const defaultOption = {
     name: {
       textStyle: {
         // color: '#fff',
-        fontSize: 18,
+        fontSize: '0.18rem',
       },
     },
     splitArea: {

+ 8 - 8
src/pages/Smart/components/SimulateDetail.js

@@ -607,14 +607,14 @@ function getOption(data = [], active) {
         type: 'shadow',
       },
       textStyle: {
-        fontSize: 24,
+        fontSize: '0.24rem',
       },
       formatter,
     },
     legend: {
       textStyle: {
         // color: '#fff',
-        fontSize: 24,
+        fontSize: '0.24rem',
       },
       type: 'scroll',
     },
@@ -629,10 +629,10 @@ function getOption(data = [], active) {
       type: 'category',
       data: xAxis,
       nameTextStyle: {
-        fontSize: 24,
+        fontSize: '0.24rem',
       },
       axisLabel: {
-        fontSize: 24,
+        fontSize: '0.24rem',
       },
     },
     yAxis: {
@@ -640,10 +640,10 @@ function getOption(data = [], active) {
       type: 'value',
       boundaryGap: [0, 0.01],
       nameTextStyle: {
-        fontSize: 24,
+        fontSize: '0.24rem',
       },
       axisLabel: {
-        fontSize: 24,
+        fontSize: '0.24rem',
       },
       splitNumber: 5,
     },
@@ -705,13 +705,13 @@ function getMembraneOption(data = []) {
         type: 'shadow',
       },
       textStyle: {
-        fontSize: 24,
+        fontSize: '0.24rem',
       },
     },
     legend: {
       textStyle: {
         // color: '#fff',
-        fontSize: 18,
+        fontSize: '0.18rem',
       },
     },
     grid: {

+ 7 - 4
src/pages/Smart/components/SimulatePie.js

@@ -46,8 +46,11 @@ const SimulatePie = (props) => {
   }, []);
 
   return (
-    <div className="card-box" style={{ padding: 26, marginTop: 30 }}>
-      <h2 style={{ textAlign: 'center', fontSize: 30, color: '#4A4A4A' }}>
+    <div
+      className="card-box"
+      style={{ padding: '0.26rem', marginTop: '0.3rem' }}
+    >
+      <h2 style={{ textAlign: 'center', fontSize: '0.3rem', color: '#4A4A4A' }}>
         通过模拟仿真预计未来一日可省 &nbsp;
         <span style={{ color: '#F5A623' }}>{getProfit()}元</span>
       </h2>
@@ -96,7 +99,7 @@ function getOption(data) {
     tooltip: {
       trigger: 'item',
       textStyle: {
-        fontSize: 24
+        fontSize: '0.24rem',
       },
     },
     series: [
@@ -104,7 +107,7 @@ function getOption(data) {
         type: 'pie',
         radius: ['50%', '70%'],
         label: {
-          fontSize: 22,
+          fontSize: '0.22rem',
         },
         emphasis: {
           itemStyle: {

+ 1 - 0
src/pages/SmartOps/components/VideoAnalysis.less

@@ -20,6 +20,7 @@
     }
     .contentFlex {
       width: 100%;
+      padding: 0.3rem 0 0.2rem;
       display: flex;
       justify-content: space-between;
       align-items: center;

+ 33 - 10
src/pages/SmartReport/index.js

@@ -237,7 +237,27 @@ const SmartReport = () => {
       <div className={styles.circleContent}>
         {data?.map((item) => (
           <div>
-            <div className={styles.circleValue}>{item.value}</div>
+            <div
+              className={`${styles.circleValue} ${
+                Number(item.value) > 999 ? styles.circleValueSmall : ''
+              }`}
+            >
+              {item.value}
+            </div>
+            <div style={{ textAlign: 'center' }} className={styles.unit}>
+              {item.label}
+            </div>
+          </div>
+        ))}
+      </div>
+    );
+  };
+  const ThreeContent = ({ data }) => {
+    return (
+      <div className={styles.circleContent}>
+        {data?.map((item) => (
+          <div>
+            <div className={styles.ValueSmall}>{item.value}</div>
             <div style={{ textAlign: 'center' }} className={styles.unit}>
               {item.label}
             </div>
@@ -263,7 +283,7 @@ const SmartReport = () => {
               <Select
                 className={styles.headRightSelect}
                 defaultValue="1"
-                style={{ width: 180 }}
+                style={{ width: '2rem' }}
                 onChange={handleChange}
                 popupClassName={styles.headRightSelect}
                 options={[
@@ -371,7 +391,7 @@ const SmartReport = () => {
             <div className={styles.box}>
               <div className={styles.main_in}>
                 <div className={styles.titleContent}>系统自检</div>
-                <CircleThreeContent
+                <ThreeContent
                   data={[
                     { label: '自检次数', value: self_inspection_task },
                     { label: '异常次数', value: self_inspection_abnormal_task },
@@ -404,8 +424,8 @@ const SmartReport = () => {
                       value: push_optimize_task,
                       unit: '条',
                     },
-                    { label: '超滤能耗', value: ele_65 },
-                    { label: '反渗透能耗', value: ele_66 },
+                    { label: '超滤能耗(kwh)', value: ele_65 },
+                    { label: '反渗透能耗(kwh)', value: ele_66 },
                   ]}
                 />
                 <div className={styles.paddingContent}>
@@ -526,6 +546,9 @@ const getPieOption = (chartData, isLeft = false) => {
     ],
     tooltip: {
       trigger: 'item',
+      textStyle: {
+        fontSize: '0.3rem',
+      },
     },
     legend: isLeft
       ? {
@@ -534,16 +557,16 @@ const getPieOption = (chartData, isLeft = false) => {
           top: 'center',
           textStyle: {
             color: '#000000',
-            fontSize: 12,
+            fontSize: '0.3rem',
           },
         }
       : {
           orient: 'horizontal',
-          itemWidth: 10,
-          itemHeight: 8,
+          // itemWidth: 10,
+          // itemHeight: 8,
           textStyle: {
             color: '#000000',
-            fontSize: 10,
+            fontSize: '0.3rem',
           },
         },
     series: [
@@ -552,7 +575,7 @@ const getPieOption = (chartData, isLeft = false) => {
         top: isLeft ? 0 : '20%',
         radius: isLeft ? '60%' : '40%',
         left: isLeft ? '20%' : 0,
-        label: isLeft ? {} : { fontSize: 10 },
+        label: { fontSize: '0.3rem' },
         data: chartData,
         emphasis: {
           itemStyle: {

+ 8 - 0
src/pages/SmartReport/index.less

@@ -211,6 +211,7 @@
   }
   .circleValue {
     .value;
+    margin: auto;
     text-align: center;
     width: 1.8rem;
     height: 1.8rem;
@@ -218,6 +219,13 @@
     line-height: 1.8rem;
     border: 0.04rem solid #1755ff;
   }
+  .ValueSmall {
+    .value;
+    text-align: center;
+    width: 2rem;
+    height: 1.2rem;
+    line-height: 1.2rem;
+  }
   .paddingContent {
     padding: 0 0.9rem;
   }