فهرست منبع

运行时间 的显示修改

zhaojijng 2 سال پیش
والد
کامیت
d8c86e1286
2فایلهای تغییر یافته به همراه8 افزوده شده و 5 حذف شده
  1. 6 3
      src/pages/Runtime/index.tsx
  2. 2 2
      src/services/sagacare_service/environment.ts

+ 6 - 3
src/pages/Runtime/index.tsx

@@ -148,10 +148,13 @@ const Runtime: React.FC = () => {
               timeList.push(timeStrArr);
             });
           }
-          if (ritem.hasOwnProperty('overTimeStartTime')) {
-            var timeStrArr = [ritem.overTimeStartTime, ritem.overTimeEndTime];
-            timeList.push(timeStrArr);
+          if (ritem.hasOwnProperty('overTime')) {
             ritem.runTimeStatus = 'overtimeWork'; //加班
+
+            ritem.overTime.forEach((overitem) => {
+              var timeStrArr = [overitem.overTimeStartTime, overitem.overTimeEndTime];
+              timeList.push(timeStrArr);
+            });
           }
           ritem.showTimeList = timeList;
           //console.log('timeList', timeList);

+ 2 - 2
src/services/sagacare_service/environment.ts

@@ -45,9 +45,9 @@ export async function getFloorList(body: any, options?: { [key: string]: any })
   );
 }
 export async function queryDeviceTimeManage(params: any, options?: { [key: string]: any }) {
-  //  '/api3/duoduo-service/setup-service/deviceManage/queryDeviceTimeManage'
+  //  '/api3/duoduo-service/setup-service/deviceManage/getDeviceTimeManageData'
   return request<API.DeviceTimeType>(
-    `/sgadmin/duoduo-service/setup-service/deviceManage/queryDeviceTimeManage?${commonParams()}`,
+    `/sgadmin/duoduo-service/setup-service/deviceManage/getDeviceTimeManageData?${commonParams()}`,
     {
       method: 'GET',
       params: {