Bläddra i källkod

feat:“添加雪糕机机器复位功能”

soobin 1 år sedan
förälder
incheckning
f99d5f6f86
2 ändrade filer med 27 tillägg och 9 borttagningar
  1. 5 0
      src/service/device/index.js
  2. 22 9
      src/views/device/deviceOper.vue

+ 5 - 0
src/service/device/index.js

@@ -32,6 +32,11 @@ export function setFurnace(params) {
     return axios.post(`/SZWL-SERVER/tEquipment/onOff?${stringToUrl(params)}`, params);
 }
 
+// 雪糕机机器复位
+export function machineReset(params) {
+    return axios.post(`/SZWL-SERVER/tEquipment/machineReset?${stringToUrl(params)}`, params);
+}
+
 // 睡眠
 export function sleepEquipment(params) {
     return axios.post(`/SZWL-SERVER/tEquipment/sleep?${stringToUrl(params)}`, params);

+ 22 - 9
src/views/device/deviceOper.vue

@@ -180,7 +180,7 @@
         <div class="operText">{{ $t("device.lockDevice") }}</div>
       </div>
       <!-- 远程重启触摸屏 -->
-      <div class="operItem" @click="restartAndroid()">
+      <div v-if="device.machineType != '2'" class="operItem" @click="restartAndroid()">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/restartAndroid.png" />
         </div>
@@ -227,6 +227,7 @@ import {
   enableMaterial,
   updateLockStatus,
   restartScreen,
+  machineReset,
 } from "../../service/device";
 import { showFailToast, showSuccessToast } from "vant";
 import { useRouter } from "vue-router";
@@ -411,15 +412,27 @@ export default {
     const operCheck = async () => {
       // 重启
       if (operType.value === 1) {
-        const { data } = await setFurnace({
-          equipmentId: device.value.id,
-          eqeStatus: 1,
-        });
-        if (data.code) {
-          showSuccessToast(t("device.restartSucceeded"));
-          operCheckShow.value = false;
+        if (device.value.machineType === '2') {
+          const { data } = await machineReset({
+            equipmentId: device.value.id,
+          });
+          if (data.code) {
+            showSuccessToast(t("device.enableMaterialSucceed"));
+            operCheckShow.value = false;
+          } else {
+            showFailToast(data.message);
+          }
         } else {
-          showFailToast(data.message);
+          const { data } = await setFurnace({
+            equipmentId: device.value.id,
+            eqeStatus: 1,
+          });
+          if (data.code) {
+            showSuccessToast(t("device.restartSucceeded"));
+            operCheckShow.value = false;
+          } else {
+            showFailToast(data.message);
+          }
         }
       }
       // 睡眠