Przeglądaj źródła

fix:加班处理

chenzhen2 2 lat temu
rodzic
commit
c07169cfe0
3 zmienionych plików z 22 dodań i 5 usunięć
  1. 6 1
      src/apis/envmonitor.ts
  2. 1 0
      src/config/index.ts
  3. 15 4
      src/views/envmonitor/index.vue

+ 6 - 1
src/apis/envmonitor.ts

@@ -3,7 +3,7 @@ import { CompanyModel, OutherWeather, SpaceModel } from '@/model/userModel'
 import { https, post } from '@/utils/https'
 import { ContentType, Method, RequestParams } from 'axios-mapper'
 import { setQueryConfig } from '@/utils'
-import { duoduoenvService, objectService, setupService, testApi, weachatService } from '@/config'
+import { customService, duoduoenvService, objectService, setupService, testApi, weachatService } from '@/config'
 
 // const comInfo = getUserInfo()
 // const comParams: string = ""
@@ -287,4 +287,9 @@ export const saveMapPointInfo = (data: any) => {
 }
 
 
+// 获取空间下的可控制的设备
+export const getSpaceEquipList = (params: any) => {
+  return https().request<any>(`${customService}equipmentRun/queryEquipmentRunConfig?${params}`, Method.GET, undefined, ContentType.json)
+}
+
 

+ 1 - 0
src/config/index.ts

@@ -10,5 +10,6 @@ export const setupService = '/duoduo-service/setup-service/'
 export const objectService = '/duoduo-service/object-service/'
 export const duoduoenvService = '/duoduo-service/duoduoenv-service/'
 export const weachatService = '/duoduo-service/'
+export const customService = '/duoduo-service/custom-service/'
 export const ssoService = '/sso/'
 export const testApi = '/test/'

+ 15 - 4
src/views/envmonitor/index.vue

@@ -353,6 +353,7 @@ import {
   queryCustomAndScence,
   queryWorkSpace,
   getPadImg,
+  getSpaceEquipList,
 } from "@/apis/envmonitor";
 import Keys from "@/constant/key";
 import {
@@ -847,12 +848,10 @@ export default defineComponent({
       },
       // 关于手动控制是否展示加班弹窗的问题处理
       checkDeviceShowWork() {
-        if (!proxyData.seviceEquipmentListFlag) {
-          proxyData.seviceEquipmentList = proxyData.workkArr[0].equipmentList;
+        proxyData.seviceEquipmentList = proxyData.workkArr[0].equipmentList;
           proxyData.seviceEquipmentList.map((item: any) => {
             item.isExeSpaceTime = 1;
           });
-        }
       },
       /**
        * 关闭加班
@@ -1518,6 +1517,17 @@ export default defineComponent({
         clearTimeout(proxyData.secenTimer);
         proxyData.secenTimer = null;
       },
+      // 查询空间下面的设备
+      getSpaceEquipList() {
+        let params: any = {
+          spaceId: proxyData.spaceInfo.spaceId,
+        };
+        let str: any = setQueryConfig(params);
+        getSpaceEquipList(str).then((res: any) => {
+          let data: any = res.data || [];
+          // proxyData.checkDeviceShowWork(data); // 判断手动控制的设备是否要开启手动控制功能
+        });
+      },
       // 定时查空间的加班记录
       queryCustomAndScenceTimer(timer: any = 10000) {
         proxyData.clearSecenTimer();
@@ -1544,7 +1554,6 @@ export default defineComponent({
             // 手动控制的情况下走新的服务定制
             if (proxyData.controlMode === 1) {
               proxyData.formateManualWorkTime();
-              proxyData.checkDeviceShowWork(); // 判断手动控制的设备是否要开启手动控制功能
             }
             proxyData.queryCustomAndScenceTimer();
           })
@@ -1629,6 +1638,8 @@ export default defineComponent({
         // proxyData.roomType = "";
         // 获取场景配置
         proxyData.timerSpaceInfo(0);
+        // 获取空间下受控设备
+        proxyData.getSpaceEquipList();
         // 动态获取场景配置
         proxyData.querySpaceSceneConfigTimer(0);
         // 查询加班记录