feat:"添加棉花糖参数；添加沙特时区；优化冰淇淋远程开门"

src/assets/language/en.json

@@ -1356,12 +1356,12 @@
   },
   "register": {
     "header": "User Registration",
-    "usernameLabel": "Account name",
-    "usernamePlaceholder": "Please enter the account name",
+    "usernameLabel": "UserName",
+    "usernamePlaceholder": "Please enter the userName",
     "usernameRequired": "Alphanumeric with letter as the first character",
-    "nameLabel": "User Name",
-    "namePlaceholder": "Please enter the user name",
-    "nameRequired": "Please enter the user name",
+    "nameLabel": "Name",
+    "namePlaceholder": "Please enter the name",
+    "nameRequired": "Please enter the name",
     "passwordLabel": "Login password",
     "passwordPlaceholder": "Please enter a password with more than 10 digits",
     "passwordRequired": "Please enter a password with more than 10 digits",
@@ -1571,7 +1571,9 @@
     "D487": "No.1004",
     "D489": "No.1005",
     "D396": "No.1006",
-    "D491": "No.1007"
+    "D491": "No.1007",
+    "M311": "Out stick putter",
+    "M307": "Mixer motor"
   },
   "popParams": {
     "D460": "NO.1095",
@@ -1584,10 +1586,10 @@
     "D346": "NO.1052",
     "D497": "NO.1096",
     "D344": "NO.1083",
-    "M559": "シールドシュガー欠乏アラーム",
-    "M566": "シールド絶縁熱線故障アラーム",
-    "M568": "シールド発生器のエアポンプアラーム",
-    "M569": "シールド混合エアポンプのアラーム"
+    "M559": "Block the sugar shortage alarm",
+    "M566": "Shield insulation heating wire fault alarm",
+    "M568": "Shield generator air pump alarm",
+    "M569": "Shield stirring air pump alarm"
   },
   "accountOperation": {
     "title": "Acount operation",

src/assets/language/ja.json

@@ -1587,7 +1587,9 @@
         "D487": "No.1004",
         "D489": "No.1005",
         "D396": "No.1006",
-        "D491": "No.1007"
+        "D491": "No.1007",
+        "M311": "パターを出します",
+        "M307": "攪拌モーターです"
     },
     "popParams": {
         "D460": "NO.1095",

src/assets/language/zh.json

@@ -1415,12 +1415,12 @@
   },
   "register": {
     "header": "用户注册",
-    "usernameLabel": "账号名称",
-    "usernamePlaceholder": "请输入账号名称",
-    "usernameRequired": "账号名称由字母或数字组成，且只能字母开头",
-    "nameLabel": "用户姓名",
-    "namePlaceholder": "请输入用户姓名",
-    "nameRequired": "请输入用户姓名",
+    "usernameLabel": "登录用户名",
+    "usernamePlaceholder": "请输入登录用户名",
+    "usernameRequired": "登录用户名由字母或数字组成，且只能字母开头",
+    "nameLabel": "用户名称",
+    "namePlaceholder": "请输入用户名称",
+    "nameRequired": "请输入用户名称",
     "passwordLabel": "登录密码",
     "passwordPlaceholder": "请输入10位以上密码",
     "passwordRequired": "请输入密码",
@@ -1634,7 +1634,9 @@
     "D487": "No.1004",
     "D489": "No.1005",
     "D396": "No.1006",
-    "D491": "No.1007"
+    "D491": "No.1007",
+    "M311": "出棍推杆",
+    "M307": "搅拌电机"
   },
   "popParams": {
     "D460": "NO.1095",

src/components/commom/kTimezone/index.vue

@@ -29,6 +29,7 @@ export default {
             { text: '上海(UTC+8)', value: 'Asia/Shanghai' },
             { text: '東京(UTC+9)', value: 'Asia/Tokyo' },
             { text: 'NewYork(UTC-5)', value: 'America/New_York' },
+            { text: 'Riyadh(UTC+3)', value: 'Asia/Riyadh' },
             { text: 'Paris(UTC+1)', value: 'Europe/Paris' },
             { text: 'London(UTC+0)', value: 'Europe/London' },
             { text: 'Madrid(UTC+1)', value: 'Europe/Madrid' },

src/components/typeDownMenu/index.vue

@@ -1,8 +1,8 @@
 <template>
   <van-dropdown-menu class="titleMenu" swipe-threshold="3">
     <!-- 用户 -->
-    <!-- <van-dropdown-item v-if="isShowAdmin()" :title="adminTypeTitle" v-model="adminType" :options="adminList"
-      @change="adminTypeChange" /> -->
+    <van-dropdown-item v-if="isShowAdmin()" :title="adminTypeTitle" v-model="adminType" :options="adminList"
+      @change="adminTypeChange" />
     <!-- 设备类型 -->
     <van-dropdown-item :title="machineTypeTitle" v-model="machineType" :options="machineList"
       @change="machineTypeChange" />
@@ -208,9 +208,11 @@ export default {
     }
     // 选择商户
     const adminTypeChange = (value) => {
+      console.log(value);
       adminTypeTitle.value = adminList.value.find(adminList => adminList.value === value).text;
       searchParams.adminType = (adminTypeTitle.value === t('typeSelectList.allSuboUsers')) ? 'all' : '';
       searchParams.userName = (adminTypeTitle.value === t('typeSelectList.allSuboUsers')) ? 'all' : (adminTypeTitle.value === t('typeSelectList.thisMerchant')) ? user.username : adminTypeTitle.value;
+      searchParams.adminId = (value ===  ('this' || 'all') ? null : value);
       outputDate();
     }
 

src/views/device/deviceOper.vue

@@ -221,7 +221,9 @@
         </div>
         <div class="operText">{{ $t("device.alramClean") }}</div>
       </div>
-      <div class="operItem" v-if="(device.machineType === '0' || device.machineType === null) && (user.ifForeign == 1 || user.type == 0)" @click="returnCoinClk()">
+      <div class="operItem"
+        v-if="(device.machineType === '0' || device.machineType === null) && (user.ifForeign == 1 || user.type == 0)"
+        @click="returnCoinClk()">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/coin.png" />
         </div>
@@ -255,7 +257,8 @@ import { onMounted, ref } from "vue";
 import {
   setFurnace,
   sleepEquipment,
-  openDoor,
+  // openDoor,
+  Api_openDoor,
   deviceTuoji,
   delOneDevice,
   enableMaterial,
@@ -382,13 +385,13 @@ export default {
           operCheckShow.value = true;
         }; */
     const openDoorFun = () => {
-      // if (device.value.machineType === '1' || device.value.equimentType === 'MG280') {
-      //   operType.value = 4;
-      //   operCheckShow.value = true;
-      // } else {
-      //   router.push({ path: "openDoor", query: { deviceId: device.value.id } });
-      // }
-      router.push({ path: "openDoor", query: { deviceId: device.value.id, machineType: device.value.machineType } });
+      if (device.value.machineType === '2') {
+        operType.value = 4;
+        operCheckShow.value = true;
+      } else {
+        // router.push({ path: "openDoor", query: { deviceId: device.value.id } });
+        router.push({ path: "openDoor", query: { deviceId: device.value.id, machineType: device.value.machineType } });
+      }
     };
     // 日志功能
     const viewLogs = () => {
@@ -535,7 +538,8 @@ export default {
       }
       // 远程开门
       if (operType.value === 4) {
-        const { data } = await openDoor({ equipmentId: device.value.id });
+        // const { data } = await openDoor({ equipmentId: device.value.id });
+        const { data } = await Api_openDoor({ equipmentId: device.value.id, type: 0, status: 1 });
         if (data.code) {
           showSuccessToast(t("device.remoteDoorOpeningSucceeded"));
           operCheckShow.value = false;

src/views/home/index.vue

@@ -306,8 +306,7 @@ export default {
     const getStatisticsFun = async () => {
       const params = {
         ...dateSelect.value,
-        // ...typeSelectData,
-        adminId: user.id,
+        adminId: typeSelectData.adminId === null ? user.id : typeSelectData.adminId,
         ifForeign: typeSelectData.ifForeign === '' ? user.ifForeign : typeSelectData.ifForeign,
         payType: typeSelectData.payType,
         clientId: typeSelectData.clientId,
@@ -489,6 +488,7 @@ export default {
       typeSelectData = {
         userName: user.username,
         clientId: null,
+        adminId: null,
       };
       getStatisticsFun();
       // 获取首页公告

src/views/role/add.vue

@@ -124,6 +124,10 @@ export default {
       }
 
       for (const key in $M_Menus) {
+        console.log(key);
+        if (key === "M21") {
+          continue;
+        }
         menuCodeList.value.push({
           label: $M_Menus[key],
           value: key