浏览代码

fix:"修复物料监控开关显示问题"

soobin 2 周之前
父节点
当前提交
9e5132ce9f
共有 3 个文件被更改,包括 29 次插入26 次删除
  1. 1 25
      src/views/device/deviceOper.vue
  2. 2 0
      src/views/device/openDoor.vue
  3. 26 1
      src/views/home/index.vue

+ 1 - 25
src/views/device/deviceOper.vue

@@ -105,7 +105,7 @@
 
       <!-- 关闭炉头/设备 -->
       <div
-        v-if="controlList.includes('C4')"
+        v-if="controlList.includes('C4') && device.equimentType != 'SBM10'"
         class="operation-item"
         @click="openOffFurnace(0)"
       >
@@ -370,30 +370,6 @@
           <span class="operation-text">{{ $t("remote.C28") }}</span>
         </div>
       </div>
-      <!-- 物料监控 -->
-      <!-- <div
-        v-if="controlList.includes('C12')"
-        class="operation-item"
-        @click="materialMonitorClk()"
-      >
-        <div class="icon-wrapper">
-          <img
-            class="operation-icon"
-            v-if="materialIcon === '0'"
-            src="../../assets/device/operIcon/materialMonitor.png"
-            alt="materialMonitor"
-          />
-          <img
-            class="operation-icon"
-            v-else
-            src="../../assets/device/operIcon/materialMonitorOff.png"
-            alt="materialMonitorOff"
-          />
-        </div>
-        <div class="text-wrapper">
-          <span class="operation-text">{{ materialTitle }}</span>
-        </div>
-      </div> -->
       <!-- 屏蔽/展示商品 -->
       <div
         v-if="controlList.includes('C13')"

+ 2 - 0
src/views/device/openDoor.vue

@@ -107,6 +107,8 @@
           :model-value="deviceDetal.isMaterialUse"
           @update:model-value="materialChg"
           size="24px"
+          active-value="1"
+          inactive-value="0"
           active-color="#4d6add"
           inactive-color="#dcdee0"
         />

+ 26 - 1
src/views/home/index.vue

@@ -205,6 +205,31 @@
         </div>
       </div>
     </van-dialog>
+
+    <!-- <template v-if="isShowRobot">
+    <van-floating-bubble
+      v-model:offset="offset"
+      axis="xy"
+      :icon="robotIcon"
+      magnetic="x"
+      @offset-change="onOffsetChange"
+      @click="onClickBot"
+    >
+    </van-floating-bubble>
+    <van-popup
+      v-model:show="popupVisible"
+      position="bottom"
+      :style="{ height: '90%' }"
+      round
+      @click="onClose"
+    >
+      <iframe
+        :src="aiUrl"
+        sandbox="allow-same-origin allow-scripts allow-popups allow-forms"
+        style="width: 100%; height: 100%"
+      ></iframe>
+    </van-popup>
+    </template> -->
   </div>
 </template>
 
@@ -759,7 +784,7 @@ export default {
     // const aiDialog = showDialog();
     const offset = ref({
       x: Math.floor(window.innerWidth * 0.8),
-      y: Math.floor(window.innerHeight * 0.75),
+      y: Math.floor(window.innerHeight * 0.85),
     });
 
     const popupVisible = ref(false);