xujunjie 1 年間 前
コミット
50184002c3

+ 3 - 0
src/components/ManagementPage/chartModule.js

@@ -194,6 +194,9 @@ const defaultOption = {
   color: colors,
   tooltip: {
     trigger: 'axis',
+    textStyle: {
+      fontSize: 24
+    },
   },
   grid: {
     bottom: 30,

+ 1 - 1
src/components/PageTitle/index.js

@@ -18,7 +18,7 @@ export default (props) => {
       {returnable || onReturn ? (
         <LeftOutlined
           onClick={handleOnClick}
-          style={{ fontSize: 36, cursor: 'pointer', marginRight: '40px' }}
+          style={{ fontSize: 36, cursor: 'pointer', marginRight: '20px' }}
         />
       ) : (
         <span className={styles.titleBar} />

+ 1 - 1
src/global.less

@@ -118,7 +118,7 @@ input[type='reset'] {
   width: 30px;
   height: 30px;
   background: url('@/assets/icon-eye1.png') no-repeat center;
-  background-size: 22px 15px;
+  background-size: 30px;
   &.open {
     background-image: url('@/assets/icon-eye2.png');
   }

+ 1 - 9
src/pages/Controller/Device.js

@@ -13,12 +13,6 @@ function Hardware() {
     defaultParams: [projectId],
   });
 
-  const getIconStatus = (status) => {
-    if (status == 1) return '';
-    if (status == 2) return styles.offline;
-    if (status == 3) return styles.error;
-  };
-
   return (
     <PageContent closeable={false}>
       <PageTitle onReturn={() => UnityAction.sendMsg('menuItem', '智能管控')}>
@@ -37,9 +31,7 @@ function Hardware() {
               {item.name}
             </div>
 
-            <div>
-              <div>定位</div>
-            </div>
+            <div>定位</div>
           </div>
         ))}
       </Spin>

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

@@ -73,7 +73,7 @@
       width: 147px;
       height: 59px;
       background: #e8e8e8;
-      border-radius: 35px;
+      border-radius: 10px;
       font-size: 30px;
       color: #4a4a4a;
       line-height: 59px;

+ 6 - 0
src/pages/EqSelfInspection/Statistics.js

@@ -204,6 +204,9 @@ const getLineOption = (time, chartData, name) => {
           color: '#333',
         },
       },
+      textStyle: {
+        fontSize: 24
+      },
     },
     // grid: {
     //   bottom: 30,
@@ -350,6 +353,9 @@ const getPieOption = (chartData, name) => {
     ],
     tooltip: {
       trigger: 'item',
+      textStyle: {
+        fontSize: 24
+      },
     },
     legend: {
       orient: 'horizontal',

+ 2 - 2
src/pages/Home/ChemCostComparison.js

@@ -111,8 +111,8 @@ const CostComparison = (props) => {
     });
     if (result && result.length) {
       const [planChemPerCost, actualChemPerCost, planChem, actualChem] = result;
-      const chemPerCost = { yName: '吨水药耗(kg/t)' };
-      const chemUsed = { yName: '药量(kg)' };
+      const chemPerCost = { yName: 'kg/t' };
+      const chemUsed = { yName: 'kg' };
       chemPerCost.xData = [
         ...new Set(
           [

+ 2 - 2
src/pages/Home/EnergyCostComparison.js

@@ -101,8 +101,8 @@ const CostComparison = () => {
     if (result && result.length) {
       const [planElecPerCost, actualElecPerCost, planElecUsed, actualElecUsed] =
         result;
-      const elecPerCost = { yName: '吨水电耗(kWh/t)' };
-      const elecUsed = { yName: '电量(kWh)' };
+      const elecPerCost = { yName: 'kWh/t' };
+      const elecUsed = { yName: 'kWh' };
       elecPerCost.xData = [
         ...new Set(
           [

+ 11 - 21
src/pages/Smart/ConditionDetection.js

@@ -149,6 +149,9 @@ const ChartContent = ({ projectId }) => {
       ],
       tooltip: {
         trigger: 'axis',
+        textStyle: {
+          fontSize: 24
+        },
       },
       legend: {
         textStyle: {
@@ -165,37 +168,24 @@ const ChartContent = ({ projectId }) => {
       xAxis: {
         type: 'category',
         boundaryGap: false,
-        data: data[0].list?.map((item) => item.name),
-        axisLine: {
-          lineStyle: {
-            // color: '#fff',
-          },
-        },
-        splitLine: {
-          lineStyle: {
-            // color: '#fff',
-          },
+        data: data[0].list?.map((item) => item.name.split(" ")[1]),
+        nameTextStyle: {
+          fontSize: 24,
         },
         axisLabel: {
-          // color: '#fff',
+          fontSize: 24,
         },
+       
       },
       yAxis: {
         type: 'value',
         boundaryGap: true,
         splitNumber: 5,
-        axisLine: {
-          lineStyle: {
-            // color: '#fff',
-          },
-        },
-        splitLine: {
-          lineStyle: {
-            // color: '#fff',
-          },
+        nameTextStyle: {
+          fontSize: 24,
         },
         axisLabel: {
-          // color: '#fff',
+          fontSize: 24,
         },
       },
       series: data.map((item) => ({

+ 6 - 0
src/pages/Smart/components/SimulateDetail.js

@@ -540,6 +540,9 @@ function getOption(data = [], active) {
       axisPointer: {
         type: 'shadow',
       },
+      textStyle: {
+        fontSize: 24
+      },
       formatter,
     },
     legend: {
@@ -629,6 +632,9 @@ function getMembraneOption(data = []) {
       axisPointer: {
         type: 'shadow',
       },
+      textStyle: {
+        fontSize: 24
+      },
     },
     legend: {
       textStyle: {

+ 3 - 0
src/pages/Smart/components/SimulatePie.js

@@ -95,6 +95,9 @@ function getOption(data) {
     ],
     tooltip: {
       trigger: 'item',
+      textStyle: {
+        fontSize: 24
+      },
     },
     series: [
       {