瀏覽代碼

fix: 手动控制加班功能隐藏

chenzhen2 2 年之前
父節點
當前提交
787f8fd8b9
共有 1 個文件被更改,包括 4 次插入4 次删除
  1. 4 4
      src/views/envmonitor/index.vue

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

@@ -136,7 +136,7 @@
       <div
         class="work-btn"
         v-if="
-          (roomType === '开放' && isWork) ||
+          (roomType === '开放' && isWork && controlMode !== 1) ||
           (roomType === '会议室' && scenarioArr && scenarioArr.length)
         "
       >
@@ -150,13 +150,13 @@
         ></work-config>
 
         <!--手动控制的加班 start-->
-        <manual-work
+        <!-- <manual-work
           v-if="roomType === '开放' && isWork && controlMode === 1"
           :scenarioArr="scenarioArr"
           :workkArr="workkArr"
           @triggerWork="triggerWork"
           @setForceOverTimeFlag="setForceOverTimeFlag"
-        ></manual-work>
+        ></manual-work> -->
 
         <scenario-config
           v-if="roomType === '会议室' && scenarioArr && scenarioArr.length"
@@ -1854,7 +1854,7 @@ export default defineComponent({
         proxyData.timeOutEvent = 0;
         proxyData.touchInterval = setInterval(() => {
           proxyData.touchNumber++;
-          if (proxyData.touchNumber === 4) {
+          if (proxyData.touchNumber === 6) {
             clearInterval(proxyData.touchInterval);
             proxyData.touchInterval = null;
             router.push({