feat：“同步2024.06.25“

src/common/js/utils.js

@@ -4463,7 +4463,7 @@ export function navigatorLanguage() {
   const navigatorLanguage = (navigator.language || navigator.browserLanguage).toLowerCase()
   const lan = navigatorLanguage.substring(0, 2);
   console.log("当前语言", lan);
-  if (lan != 'en') {
+  if (lan == 'zh' || lan == 'ja') {
     // 如果不为英文
     return lan;
   }

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);

src/styles/user/index.less

@@ -85,6 +85,7 @@
             justify-content: flex-start;
             margin-top: 20px;
             position: relative;
+            font-size: 12px;
 
             .filedInpPad {
                 .van-cell {

src/views/device/deviceOper.vue

@@ -217,6 +217,7 @@ import {
   delOneDevice,
   enableMaterial,
   restartScreen,
+  machineReset,
 } from "../../service/device";
 import { showFailToast, showSuccessToast } from "vant";
 import { useRouter } from "vue-router";
@@ -392,15 +393,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);
+          }
         }
       }
       // 睡眠

src/views/home/index.vue

@@ -98,7 +98,8 @@
         </div>
       </div>
       <div class="outer11 flex-row">
-        <div class="main25 flex-col" v-for="(item, index) in pushToolList" :key="index" @click="pushToolPage(item.value)">
+        <div class="main25 flex-col" v-for="(item, index) in pushToolList" :key="index"
+          @click="pushToolPage(item.value)">
           <img class="mod7 flex-col" :src="showLogo(item.value)" />
           <div class="TextGroup14 flex-col">
             <!-- <span class="info15" v-html="item.label"></span> -->
@@ -117,7 +118,8 @@
     <van-dialog v-model:show="showAlarm" :title="$t('home.alarmTitle')" @confirm="confirmAlarm">
       <div style="max-height: 30vh; overflow-y: auto;">
         <div v-for="(item, index) in alarmList" :key="index" style="padding: 2px 5px;">
-          <van-cell :title="$t('home.alarmDevice') + (item.name ? item.name : item.clientId.slice(-6)) + $t('home.alarmContent') + item.alarmContent" />
+          <van-cell
+            :title="$t('home.alarmDevice') + (item.name ? item.name : item.clientId.slice(-6)) + $t('home.alarmContent') + item.alarmContent" />
         </div>
       </div>
     </van-dialog>
@@ -132,7 +134,7 @@ import { onMounted, ref, nextTick } from "vue";
 import sHeader from "../../components/SimpleHeader";
 import dateSelectList from "../../components/dateSelectList";
 import typeSelectList from "../../components/typeSelectList";
-import { getLoginUser, $M_Menus, Format_time, styleUrl } from "../../common/js/utils";
+import { getLoginUser, $M_Menus, Format_time, styleUrl, getLocal, setLocal, navigatorLanguage } from "../../common/js/utils";
 import { useRouter } from "vue-router";
 import {
   getStatistics,
@@ -375,9 +377,14 @@ export default {
     const showAlarm = ref(false);
     const alarmList = ref([]);
     // 页面初始化
-    onMounted(async() => {
+    onMounted(async () => {
       // 加载样式
       styleUrl('home');
+      // 检测语言是否有缓存
+      if (!getLocal("curLang")) {
+        //  根据浏览器语言重新缓存到localstorage
+        setLocal("curLang", navigatorLanguage());
+      }
       if (localStorage.getItem("loginSys")) {
         const loginSysString = localStorage.getItem("loginSys");
         sys.value = JSON.parse(loginSysString);
@@ -422,7 +429,7 @@ export default {
         }
       }
     });
-    
+
     const confirmAlarm = () => {
       localStorage.setItem('firstLogin', false);
     }

src/views/login.vue

@@ -48,11 +48,11 @@
         <br>
         <br>
         <!-- 微信登录 -->
-        <!-- <div v-if="isInWeChat" class="loginWithWechatClass">
+        <div v-if="isInWeChat" class="loginWithWechatClass">
           <van-button class="wechat-btn" type="primary" size="large" @click="wxLoginHandler">
             <van-icon name="wechat" color="#1bd66c" size="40" class="wechat-icon"/>
           </van-button>
-        </div> -->
+        </div>
 
         <div class="buttonBox">
           <van-button

src/views/user.vue

@@ -621,7 +621,35 @@ export default {
       router.push({ path: "uniPay" });
     };
     const onperExitSys = () => {
-      kDialogRef.value.openDialog();
+      // kDialogRef.value.openDialog();
+      showConfirmDialog({
+        title: t('user.tips'),
+        message: t('user.logOutContent'),
+      }).then(() => {
+        // 获取缓存的语言
+        const savedCredentials = localStorage.getItem('savedCredentials');
+        const curLang = localStorage.getItem("curLang");
+        // 清空缓存
+        localStorage.clear();
+        localStorage.setItem("curLang", curLang);
+        if (savedCredentials) {
+          localStorage.setItem('savedCredentials', savedCredentials);
+        }
+        if (sys.value) {
+          setTimeout(() => {
+            router.push({
+              path: "login",
+              query: { relation_admin_id: sys.value.relationAdminId },
+            });
+          }, 200);
+        } else {
+          setTimeout(() => {
+            router.push({ path: "login" });
+          }, 200);
+        }
+      }).catch((error) => {
+        console.error(error);
+      })
     };
     const pushPageList = (url) => {
       router.push({ path: url });