style：“优化部分提示英文”

src/assets/language/en.json

@@ -147,7 +147,7 @@
     "delTips": "Please select the data to be deleted first",
     "advertRule": {
       "sysTitle": "Advertising rules",
-      "total": "total",
+      "total": "Total ",
       "rules": "rules",
       "add": "add",
       "delete": "delete",
@@ -198,7 +198,7 @@
     "requestFailed": "Request failed, click to reload",
     "noMore": "No more",
     "common": "",
-    "recordsTotal": "records in total",
+    "recordsTotal": " Records",
     "search": "search",
     "affiliatedMerchants": "Affiliated merchants",
     "equipmentNo": "Equipment No",
@@ -276,6 +276,7 @@
     "humidityParameterConfiguration": "Humidity parameter configuration",
     "submitUpdates": "Submit Updates",
     "modificationSucceeded": "Modification succeeded",
+    "noParameterData": "No parameter data is available !",
     "addDistributor": "Add Distributor",
     "equipmentNoLabel": "Equipment No",
     "equipmentNoPlaceholder": "Please enter the equipment number",
@@ -360,14 +361,14 @@
     "pleaseSelectTheDeviceStatus": "Please select the device status",
     "emptyingConditions": "Clear condition",
     "clickSearch": "Click search",
-    "spunSugar": "棉花糖",
-    "popcorn": "popcorn",
+    "spunSugar": "Cotton candy",
+    "popcorn": "Pop corn",
     "sz": "Sunzee",
     "sc": "Sevencloud",
     "startUp": "Start up",
-    "shutdown": "shutdown",
-    "enable": "enable",
-    "deactivate": "deactivate",
+    "shutdown": "Shut down",
+    "enable": "Enable",
+    "deactivate": "Deactivate",
     "deviceInformation": "Device Information",
     "essentialInformation": "Basic Information",
     "equipmentCode": "Equipment Code",
@@ -398,6 +399,7 @@
     "todaysSugarList": "Make a sugar list today",
     "submitToMakeSugar": "Submit",
     "viewResults": "View Results",
+    "notUploadData": "The machine did not upload data !",
     "dataOverview": "Data Overview",
     "search": "search",
     "totalNumberOfRuns": "Total number of runs",
@@ -427,6 +429,7 @@
     "humidity": "%RH",
     "volume": "volume",
     "alarmContent": "Alarm content",
+    "alarmContentNoData": "Machine is normal, no alarm.",
     "alarmClock": "Device alarm!",
     "eliminateAlarm": "Eliminate",
     "editDevice": "Device details",
@@ -462,14 +465,14 @@
     "modifyPricePage": {
       "title": "Commodity price adjustment",
       "equipmentName": "Equipment name",
-      "total": "total",
-      "goods": "goods",
+      "total": "Total: ",
+      "goods": " goods",
       "batchModify": "Batch modification",
       "modify": "modify",
       "submit": "Submit",
       "batchPrice": "Batch price",
       "batchPricePlace": "Please enter the batch price",
-      "modifySubmit": "Modification submission"
+      "modifySubmit": "Submit"
     },
     "materialMonitor": "materialMonitor",
     "customLogo": {
@@ -496,6 +499,7 @@
     "stick": "stick",
     "water": "water",
     "wasteWater": "wasteWater",
+    "sentSuccessfully": "Request sent successfully",
     "turnOffSleep": "Sleeping zzZ",
     "turnOnSleep": "Not sleeping",
     "communiChannel": "Communication channel",
@@ -555,8 +559,8 @@
     "clickQuery": "Click Query",
     "selectFullTime": "Select date",
     "discountCode": "Discount code",
-    "total": "total",
-    "discountCodesInTotal": "Discount codes",
+    "total": "Total ",
+    "discountCodesInTotal": " Discount codes",
     "search": "search",
     "notUsed": "not used",
     "used": "Used",
@@ -575,6 +579,7 @@
     "pleaseEnterTheValidityPeriod": "Please enter the validity period",
     "Months": "Months",
     "noMoreThanMonths": "(no more than 3 months)",
+    "days": " days",
     "type": "type",
     "deductionRoll": "Deduction roll",
     "discount2": "Discount",
@@ -594,7 +599,7 @@
   },
   "distributionSet": {
     "distributionSettings": "Distribution Settings",
-    "total": "total",
+    "total": "Total",
     "leftTitle": "Distribution settings",
     "rightAdd": "Add equipment distributor",
     "equipName": "Equipment name",
@@ -766,7 +771,7 @@
   },
   "merchantManage": {
     "merchantManagement": "Merchant management",
-    "total": "total",
+    "total": "Total",
     "recordsInTotal": "Records",
     "search": "search",
     "telephone": "Telephone",
@@ -960,8 +965,8 @@
     "successfullyModifiedRole": "Successfully modified role",
     "failedToModifyRole": "Failed to modify role",
     "rolePermissionSettings": "Role permission settings",
-    "total": "total",
-    "inTotal": "individual",
+    "total": "Total ",
+    "inTotal": " individual",
     "addTo": "addRole",
     "edit": "edit",
     "delete": "delete",
@@ -1069,8 +1074,8 @@
   },
   "taskMessage": {
     "equipmentInitializationApproval": "Equipment initialization approval",
-    "total": "total",
-    "recordsInTotal": "Records",
+    "total": "Total ",
+    "recordsInTotal": " Records",
     "search": "search",
     "affiliatedMerchants": "Affiliated merchants",
     "equipmentNo": "Equipment No",

src/assets/language/zh.json

@@ -273,6 +273,7 @@
     "humidityParameterConfiguration": "湿度参数配置",
     "submitUpdates": "提交更新",
     "modificationSucceeded": "修改成功",
+    "noParameterData": "暂无参数数据",
     "addDistributor": "添加分销人",
     "equipmentNoLabel": "设备编号",
     "equipmentNoPlaceholder": "请输入设备编号",
@@ -395,6 +396,7 @@
     "todaysMakeList": "今日制作列表",
     "submitToMakeSugar": "提交",
     "viewResults": "查看结果",
+    "notUploadData": "机器未上传数据",
     "dataOverview": "设备管理",
     "search": "搜索",
     "totalNumberOfRuns": "运行总数",
@@ -427,6 +429,7 @@
     "humidity": "%RH",
     "volume": "音量",
     "alarmContent": "报警内容",
+    "alarmContentNoData": "机器正常，无报警",
     "alarmClock": "设备报警！",
     "eliminateAlarm": "消除",
     "editDevice": "设备详细信息",
@@ -576,6 +579,7 @@
     "pleaseEnterTheValidityPeriod": "请输入有效期",
     "Months": "个月",
     "noMoreThanMonths": "(不超过3个月)",
+    "days": "天",
     "type": "类型",
     "deductionRoll": "抵扣卷",
     "discount2": "打折",

src/styles/alarmClock/index.less

@@ -404,10 +404,10 @@
           .info4 {
             width: auto;
             margin-top: 3px;
-            height: 13px;
+            height: 14px;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
-            font-size: 13px;
+            font-size: 14px;
             text-align: left;
             white-space: nowrap;
             line-height: 13px;

src/views/device/alarmClock.vue

@@ -84,7 +84,7 @@ export default {
       const { data } = await getAlaramClockList({adminId : user.id});
       if (data.code) {
         list.value = data.data;
-      } else { showFailToast(data.message); }
+      }
     }
 
     const addAlarmClock = () => {

src/views/device/alarmClockSet/index.vue

@@ -29,7 +29,7 @@
       <div class="ImageText1">
         <div class="mod4 justify-between">
           <div class="TextGroup1">
-            <span class="info4">{{ $t("device.effectiveImmediately") }}：</span>
+            <span class="info4">{{ $t("device.effectiveImmediately") }}</span>
           </div>
           <div class="">
             <van-switch  v-model="checked" size="20px"/>

src/views/device/doSugar.vue

@@ -48,7 +48,7 @@
         </div>
         <div v-if="!doSugartData" class="block5 flex-col" @click="submitDoSugar"><span class="txt3">{{
           $t('device.submitToMakeSugar') }}</span></div>
-        <van-button v-if="doSugartData" round type="primary" class="volumeChangeButton" :disabled="doSugartType"
+        <van-button v-if="doSugartData" style="padding: 1em;" round type="primary" class="block5 flex-col" :disabled="doSugartType"
           @click="checkData()">{{ $t('device.viewResults') }}</van-button>
 
       </div>
@@ -60,7 +60,7 @@ import { onMounted, ref } from 'vue';
 import sHeader from "@/components/SimpleHeader";
 import { useRoute, useRouter } from 'vue-router';
 import { getDeviceDetal, selectProducts, doSugar, selectSugarStatus } from '@/service/device'
-import { showFailToast, showSuccessToast } from 'vant';
+import { showFailToast, showSuccessToast, showToast } from 'vant';
 import { useI18n } from 'vue-i18n';
 import { styleUrl } from "../../common/js/utils";
 
@@ -134,7 +134,7 @@ export default {
         showSuccessToast(data.message);
         doSugartData.value = null;
         doSugartType.value = true;
-      } else { showFailToast(data.message); }
+      } else { showToast(t('device.notUploadData')); }
     };
 
     const pushToDaySugarList = async () => {

src/views/device/index.vue

@@ -216,7 +216,7 @@
                     <span class="info3 o-pr-10 kBordBott">{{ $t("device.alarmContent") }}：{{
                       item.alarmList && item.alarmList[0]
                       ? item.alarmList[0].alarmContent
-                      : item.alarmContent
+                      : $t("device.alarmContentNoData")
                     }}
                     </span>
                     <van-button v-if="item.alarmList && item.alarmList[0]" type="primary" size="small" color="#07c160"

src/views/device/openDoor.vue

@@ -89,10 +89,12 @@ export default {
           type: 0,
           status: outDoor,
         }).then((res) => {
-          showToast(res.data.message);
+          if (res.data.code == "00000") {
+            showToast(t('device.sentSuccessfully'));
+          }
           setTimeout(() => {
             getDeviceDetalFun();
-          }, 1000);
+          }, 1500);
         });
       });
     };
@@ -108,10 +110,12 @@ export default {
           type: 1,
           status: inDoor,
         }).then((res) => {
-          showToast(res.data.message);
+          if (res.data.code == "00000") {
+            showToast(t('device.sentSuccessfully'));
+          }
           setTimeout(() => {
             getDeviceDetalFun();
-          }, 1000);
+          }, 1500);
         });
       });
     };

src/views/device/paramsSet/paramsSetInfo.vue

@@ -43,7 +43,7 @@ import { onMounted, ref } from "vue";
 import sHeader from "@/components/SimpleHeader";
 import { useRoute } from "vue-router";
 import { getDeviceDetal, getParameters, updateParameters } from "@/service/device";
-import { showFailToast, showSuccessToast, showConfirmDialog } from "vant";
+import { showFailToast, showSuccessToast, showConfirmDialog, showToast } from "vant";
 import { useI18n } from 'vue-i18n';
 import { styleUrl } from "../../../common/js/utils";
 
@@ -114,7 +114,7 @@ export default {
         // console.log("checked:", checked.value);
 
       } else {
-        showFailToast(data.message);
+        showToast(t('device.noParameterData'));
       }
     };
 

src/views/discountCode/payCode.vue

@@ -138,10 +138,10 @@ export default {
       router.go(-1);
     }
     // 有效天数
-    const validDays = ref('0天');
+    const validDays = ref('0'+ t('discountCode.days'));
     // 监听有效期，计算有效天数
     watch(() => payParams.month, (newVal) => {
-      validDays.value = Format_calcuDecial(newVal, 30) + '天';
+      validDays.value = Format_calcuDecial(newVal, 30) + t('discountCode.days');
     }, { immediate: true, deep: true });
     return {
       ...toRefs(payParams),