xujunjie 1 vuosi sitten
vanhempi
commit
d882ee4755

+ 2 - 2
.umirc.ts

@@ -28,8 +28,8 @@ export default defineConfig({
   proxy: {
     '/api': {
       // target: 'http://47.96.12.136:8888/',
-      target: 'http://47.96.12.136:8788/',
-      // target: 'http://120.55.44.4:8903/',
+      // target: 'http://47.96.12.136:8788/',
+      target: 'http://120.55.44.4:8900/',
       //target: 'https://metawant.greentech.com.cn/',
       changeOrigin: true,
     },

+ 2 - 1
src/components/ManagementPage/chartModule.js

@@ -209,7 +209,8 @@ const defaultOption = {
   tooltip: {
     trigger: 'axis',
     textStyle: {
-      fontSize: '0.24rem',
+      fontSize: 24,
+      // color: 
     },
   },
   grid: {

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

@@ -87,8 +87,8 @@ export const EnergyDetail = () => {
       queryChartList({
         project_id: Number(projectId),
         metric_code: 'plant_electricity',
-        start_time: dayjs().startOf('day').format('YYYY-MM-DD 00:00:00'),
-        end_time: dayjs().format('YYYY-MM-DD 23:59:59'),
+        start_time: dayjs().subtract(2,"day").startOf('day').format('YYYY-MM-DD 00:00:00'),
+        end_time: dayjs().subtract(1,"day").format('YYYY-MM-DD 23:59:59'),
       }),
     {
       pollingInterval: TIMER,

+ 1 - 1
src/pages/TaskManage/Detail/WorkOrderList/WorkOrderList.less

@@ -11,7 +11,7 @@
     justify-content: space-around;
     width: 100%;
     .ant-tabs-tab-btn {
-      font-size: 0.24rem;
+      font-size: 0.28rem;
       font-weight: 600;
     }
   }

+ 7 - 2
src/services/safety.js

@@ -16,8 +16,13 @@ export async function queryMonitorList(projectId) {
   console.log(res, res2);
   res2.data.list?.forEach((item) => {
     let err = res.data.find((img) => img.device_name == item.Name);
-    item.EventPath = err?.path || '';
-    item.MandateId = Number('0');
+    if (err) {
+      item.EventPath = err.path;
+      item.MandateId = err.mandate_id;
+    } else {
+      item.EventPath = '';
+      item.MandateId = 0;
+    }
   });
   return res2;
 }