Ritchie 1 рік тому
батько
коміт
f0dc91882e

BIN
src/assets/device/operIcon/materialMonitorOff.png


+ 4 - 0
src/assets/language/en.json

@@ -335,7 +335,9 @@
     "IllThinkAboutItAgain": "Cancel",
     "restartSucceeded": "Restart succeeded",
     "deleteDeviceSucceed": "Delete device successfully",
+    "deleteDeviceFailed": "Delete device failed",
     "enableMaterialSucceed": "Enable material successfully",
+    "enableMaterialFailed": "Enable material failed",
     "sleepSuccessfully": "Sleep successfully",
     "open": "open",
     "close": "close",
@@ -502,6 +504,8 @@
     "sentSuccessfully": "Request sent successfully",
     "turnOffSleep": "Sleeping zzZ",
     "turnOnSleep": "Not sleeping",
+    "materialMonitorOn": "Enabled",
+    "materialMonitorOff": "Closed",
     "communiChannel": "Communication channel",
     "tweets": "Tweets",
     "mq": "MQ",

+ 4 - 0
src/assets/language/zh.json

@@ -332,7 +332,9 @@
     "IllThinkAboutItAgain": "我再想想",
     "restartSucceeded": "重启成功",
     "deleteDeviceSucceed": "删除设备成功",
+    "deleteDeviceFailed": "删除设备失败",
     "enableMaterialSucceed": "启用物料监控成功",
+    "enableMaterialFailed": "启用物料监控失败",
     "sleepSuccessfully": "睡眠成功",
     "open": "开启",
     "close": "关闭",
@@ -518,6 +520,8 @@
     "sentSuccessfully": "发送请求成功",
     "turnOffSleep": "睡眠中zzZ",
     "turnOnSleep": "未睡眠",
+    "materialMonitorOn": "物料监控已开启",
+    "materialMonitorOff": "物料监控已关闭",
     "communiChannel": "通信通道",
     "tweets": "个推",
     "mq": "MQ",

+ 16 - 4
src/views/device/deviceOper.vue

@@ -112,9 +112,12 @@
       <!-- 物料监控 -->
       <div class="operItem" @click="materialMonitorClk()">
         <div class="operIcon">
+          <!-- <img v-if="materialIcon === '0'" class="operImg" src="../../assets/device/operIcon/materialMonitor.png" />
+          <img v-else class="operImg" src="../../assets/device/operIcon/materialMonitorOff.png" /> -->
           <img class="operImg" src="../../assets/device/operIcon/materialMonitor.png" />
         </div>
         <div class="operText">{{ $t("device.materialMonitor") }}</div>
+        <!-- <div class="operText">{{ materialTitle }}</div> -->
       </div>
       <!-- 屏蔽/展示商品 -->
       <div class="operItem" @click="showGoodsClk()">
@@ -240,6 +243,8 @@ export default {
     const sleepTitle = ref(t("device.turnOnSleep"));
     // 睡眠图标
     const sleepIcon = ref('0');
+    // 启用物料监控图标
+    // const materialIcon = ref('0');
 
     // 初始化页面获取列表
     onMounted(async () => {
@@ -258,6 +263,14 @@ export default {
         sleepTitle.value = t("device.turnOnSleep");
         sleepIcon.value = '0';
       }
+      // 物料监控
+      // if (device.value.materialMonitor) {
+      //   materialTitle.value = t("device.materialMonitorOn");
+      //   materialIcon.value = '1';
+      // } else {
+      //   materialTitle.value = t("device.materialMonitorOff");
+      //   materialIcon.value = '0';
+      // }
     };
     const closeOper = () => {
       show.value = false;
@@ -437,20 +450,19 @@ export default {
           showSuccessToast(t("device.deleteDeviceSucceed"));
           operCheckShow.value = false;
         } else {
-          showFailToast(data.message);
+          showFailToast(t("device.deleteDeviceFailed"));
         }
       }
       // 启用物料监控
       if (operType.value === 7) {
         const { data } = await enableMaterial({
           equipmentId: device.value.id,
-          // adminId: user.id,
         });
-        if (data.code) {
+        if (data.code === '00000') {
           showSuccessToast(t("device.enableMaterialSucceed"));
           operCheckShow.value = false;
         } else {
-          showFailToast(data.message);
+          showFailToast(t("device.enableMaterialFailed"));
         }
       }
       // 关闭弹窗