Parcourir la source

docs: "参数补充,上次的提交错了"

ritchie il y a 2 ans
Parent
commit
511ac84bba
3 fichiers modifiés avec 158 ajouts et 121 suppressions
  1. 119 97
      src/assets/language/en.json
  2. 23 1
      src/assets/language/zh.json
  3. 16 23
      src/views/device/paramsSet/paramsSetInfo.vue

+ 119 - 97
src/assets/language/en.json

@@ -28,12 +28,12 @@
     "weChatScanning": "WeChat scanning",
     "antiScanningOfAlipay": "Anti scanning of Alipay",
     "weChatBackScanning": "WeChat back scanning",
-    "unpaid":"Unpaid",
-    "paid":"Paid",
-    "refunding":"refunding",
-    "refunded":"Refunded",
-    "orderStatus":"Order Status",
-    "allSuboUsers":"All subordinate users"
+    "unpaid": "Unpaid",
+    "paid": "Paid",
+    "refunding": "refunding",
+    "refunded": "Refunded",
+    "orderStatus": "Order Status",
+    "allSuboUsers": "All subordinate users"
   },
   "navBar": {
     "homePage": "home page",
@@ -163,12 +163,12 @@
         "submit": "Submit Rules",
         "search": "search",
         "selectAd": "Please select an advertisement",
-        "pushMerchant":"Push merchants",
-        "pushMerchantPlace":"Separate them with English commas, and there should also be a comma at the end",
-        "screen":"screen",
-        "adScreen":"Advertising screening",
-        "adName":"Advertising name",
-        "adNamePlace":"Please enter the advertisement name"
+        "pushMerchant": "Push merchants",
+        "pushMerchantPlace": "Separate them with English commas, and there should also be a comma at the end",
+        "screen": "screen",
+        "adScreen": "Advertising screening",
+        "adName": "Advertising name",
+        "adNamePlace": "Please enter the advertisement name"
       }
     }
   },
@@ -232,10 +232,10 @@
     "weekday": "Working days (Monday to Friday)",
     "weekend": "Weekend (Saturday to Sunday)",
     "custom": "custom",
-	"messageReceiver1":"Device alarm contact 1",
-	"messageReceiver2":"Device alarm contact 2",
-	"messageReceiver3":"Device alarm contact 3",
-	"equipmentmessageReceiverPlaceholder":"Please enter email",
+    "messageReceiver1": "Device alarm contact 1",
+    "messageReceiver2": "Device alarm contact 2",
+    "messageReceiver3": "Device alarm contact 3",
+    "equipmentmessageReceiverPlaceholder": "Please enter email",
     "repetitionsLabel": "Repetitions",
     "repetitionsPlaceholder": "Please enter the number of repetitions",
     "alarmTypeLabel": "Alarm type",
@@ -252,9 +252,9 @@
     "furnaceHeadClosed": "Furnace head closed",
     "startSleep": "Start Sleep",
     "endSleep": "End Sleep",
-	"sleepDesc": "Sleep description",
-	"sleepDescPlace": "Please enter a sleep description",
-	"SuspendBusiness": "Suspend Business",
+    "sleepDesc": "Sleep description",
+    "sleepDescPlace": "Please enter a sleep description",
+    "SuspendBusiness": "Suspend Business",
     "successfullyAddedAlarmClock": "Successfully added alarm clock",
     "parameterAdjustment": "Parameter adjustment",
     "generalParameterConfiguration": "General parameter configuration",
@@ -302,11 +302,11 @@
     "closeFurnHead": "Close furnace head",
     "remoteDoorOpening": "Remote door opening",
     "remoteSugarMaking": "Remote sugar making",
-	"outDoor": "Outer door",
-	"inDoor": "Inner door",
-	"openRemind": "Remind",
-	"openRemindOut": "Are you sure you want to switch the outer door?",
-	"openRemindIn": "Are you sure you want to switch the Inner door?",
+    "outDoor": "Outer door",
+    "inDoor": "Inner door",
+    "openRemind": "Remind",
+    "openRemindOut": "Are you sure you want to switch the outer door?",
+    "openRemindIn": "Are you sure you want to switch the Inner door?",
     "modulation": "modulation",
     "equipmentRecharge": "Equipment recharge",
     "parameterSetting": "Parameter setting",
@@ -319,7 +319,7 @@
     "open": "open",
     "close": "close",
     "success": "success",
-    "sysOffSuccess":"System offline successfully",
+    "sysOffSuccess": "System offline successfully",
     "remoteDoorOpeningSucceeded": "Remote door opening succeeded",
     "enterAnyInformationToSearch": "Enter any information to search",
     "equipmentCodeLabel": "Equipment code",
@@ -415,54 +415,54 @@
       "confirm": "confirm"
     },
     "sysOffline": "System offline",
-    "modifyPrice":"Modify Price",
-    "modifyPricePage":{
-      "title":"Commodity price adjustment",
-      "equipmentName":"Equipment name",
-      "total":"total",
-      "goods":"goods",
-      "batchModify":"Batch modification",
-      "modify":"modify",
-      "submit":"Submit",
-      "batchPrice":"Batch price",
-      "batchPricePlace":"Please enter the batch price",
-      "modifySubmit":"Modification submission"
+    "modifyPrice": "Modify Price",
+    "modifyPricePage": {
+      "title": "Commodity price adjustment",
+      "equipmentName": "Equipment name",
+      "total": "total",
+      "goods": "goods",
+      "batchModify": "Batch modification",
+      "modify": "modify",
+      "submit": "Submit",
+      "batchPrice": "Batch price",
+      "batchPricePlace": "Please enter the batch price",
+      "modifySubmit": "Modification submission"
     },
-    "deleteDevice":"Delete Device",
-    "noPosition":"No positioning",
-    "equipLocation":"Equipment location",
-    "position":"position",
-    "view":"view",
-    "oneKeyFeed":"One key feeding",
-    "replenishment":"replenishment",
-    "whiteSugar":"whiteSugar",
-    "redSugar":"redSugar",
-    "yellowSugar":"yellowSugar",
-    "blueSugar":"blueSugar",
-    "stick":"stick",
-    "water":"water",
-    "wasteWater":"wasteWater",
-    "turnOffHibe":"Turn off hibernation",
-    "enableSleep":"Enable Sleep",
-    "communiChannel":"Communication channel",
-    "tweets":"Tweets",
-    "mq":"Mq",
-    "versionNo":"Version No",
-    "url":"url",
-    "urlPlace":"please enter the url",
-    "update":"to update",
-    "sureUpdate":"Are you sure you want to update",
-    "coupon":"coupon",
-    "adRule":"Advertising rules",
-    "editAdRule":{
-      "title":"Edit Rule",
-      "ruleName":"Rule Name",
-      "ruleNamePlace":"Please enter the rule name",
-      "submitPush":"Submit and push",
-      "adRulePlace":"Please select the advertising rules first"
+    "deleteDevice": "Delete Device",
+    "noPosition": "No positioning",
+    "equipLocation": "Equipment location",
+    "position": "position",
+    "view": "view",
+    "oneKeyFeed": "One key feeding",
+    "replenishment": "replenishment",
+    "whiteSugar": "whiteSugar",
+    "redSugar": "redSugar",
+    "yellowSugar": "yellowSugar",
+    "blueSugar": "blueSugar",
+    "stick": "stick",
+    "water": "water",
+    "wasteWater": "wasteWater",
+    "turnOffHibe": "Turn off hibernation",
+    "enableSleep": "Enable Sleep",
+    "communiChannel": "Communication channel",
+    "tweets": "Tweets",
+    "mq": "Mq",
+    "versionNo": "Version No",
+    "url": "url",
+    "urlPlace": "please enter the url",
+    "update": "to update",
+    "sureUpdate": "Are you sure you want to update",
+    "coupon": "coupon",
+    "adRule": "Advertising rules",
+    "editAdRule": {
+      "title": "Edit Rule",
+      "ruleName": "Rule Name",
+      "ruleNamePlace": "Please enter the rule name",
+      "submitPush": "Submit and push",
+      "adRulePlace": "Please select the advertising rules first"
     },
-    "flowerType":"Flower type",
-    "flowerTypePlace":"Please select the flower type"
+    "flowerType": "Flower type",
+    "flowerTypePlace": "Please select the flower type"
   },
   "discountCode": {
     "discountCodeNoLabel": "Discount code No",
@@ -508,7 +508,7 @@
     "theValidityPeriodCannotExceedMonths": "The validity period cannot exceed 3 months",
     "discountCannotBeGreaterThan": "Discount cannot be greater than 10",
     "successfulProductionOfDiscountCode": "Successful production of discount code",
-    "applDiscCode":"Apply for discount code"
+    "applDiscCode": "Apply for discount code"
   },
   "distributionSet": {
     "distributionSettings": "Distribution Settings",
@@ -525,13 +525,13 @@
       "title": "Add Distributor",
       "editTitle": "Edit Distributor",
       "clientId": "Equipment code",
-      "autoBrought":"Automatically brought out",
+      "autoBrought": "Automatically brought out",
       "clientIdPlace": "Please select the equipment code",
       "myDistProport": "My distribution proportion",
       "distInof": "Distribution Information",
-      "platDistRange":"The distribution proportion range of the platform is0-100",
-      "distPropRange":"The distribution proportion range is0-100",
-      "notDelMore":"Can't delete any more"
+      "platDistRange": "The distribution proportion range of the platform is0-100",
+      "distPropRange": "The distribution proportion range is0-100",
+      "notDelMore": "Can't delete any more"
     }
   },
   "home": {
@@ -716,7 +716,7 @@
     "orderDetails": "order details",
     "exportToExcel": "Export to Excel",
     "equipmentNo": "Equipment No",
-	"equipmentName": "Equipment Name",
+    "equipmentName": "Equipment Name",
     "tradeName": "Trade name",
     "dividingDomesticService": "Dividing domestic service",
     "business": "business",
@@ -755,14 +755,14 @@
     "equipmentNoPlaceholder": "Please enter the equipment number",
     "orderDate": "Order Date",
     "startTime": "start time",
-    "to":"to",
+    "to": "to",
     "endTime": "End time",
     "clickSearch": "Click Search",
     "selectFullTime": "Select full time",
-    "refundAmount":"refund amount",
-    "refundAmountPlace":"Please enter the refund amount",
-    "most":"most",
-    "accountBalance":"Account balance"
+    "refundAmount": "refund amount",
+    "refundAmountPlace": "Please enter the refund amount",
+    "most": "most",
+    "accountBalance": "Account balance"
   },
   "orderExport": {
     "orderAnalysis": "Order Analysis",
@@ -774,8 +774,8 @@
     "clickFilter": "Click Filter",
     "exportToExcel": "Export to Excel",
     "totalSales": "Total sales",
-    "machines":"Machines",
-    "superior":"Superior",
+    "machines": "Machines",
+    "superior": "Superior",
     "searchPop": {
       "title": "Filter by the following criteria",
       "orderNo": "Order No",
@@ -784,10 +784,10 @@
       "busiNamePlace": "Please enter the merchant name",
       "clearFilter": "Emptying conditions",
       "filter": "screen",
-      "mainOver":"Mainland/overseas",
-      "mainOverPlace":"Please select Mainland/overseas",
-      "mainland":"mainland",
-      "overseas":"overseas"
+      "mainOver": "Mainland/overseas",
+      "mainOverPlace": "Please select Mainland/overseas",
+      "mainland": "mainland",
+      "overseas": "overseas"
     }
   },
   "role": {
@@ -815,7 +815,7 @@
     "systemOffline": "System offline",
     "labelMan": "Label management",
     "apkMan": "Apk management",
-    "merchantMan":"Merchant management",
+    "merchantMan": "Merchant management",
     "modifyRole": "Modify Role",
     "whole": "whole",
     "roleAddedSuccessfully": "Role added successfully",
@@ -1022,7 +1022,7 @@
     "forgetPassWord": "Forget password?",
     "regusterButton": "Click Register",
     "loginButton": "Sign in",
-    "loginSucess":"Login succeeded"
+    "loginSucess": "Login succeeded"
   },
   "register": {
     "header": "User Registration",
@@ -1078,7 +1078,7 @@
     "patternStatistics": "Pattern statistics",
     "salesStatistics": "Sales statistics",
     "seleWeekDateRangeNotSeveDays": "The date range of the selected week cannot exceed 7 days!!!",
-    "rankMethod":"Ranking method"
+    "rankMethod": "Ranking method"
   },
   "user": {
     "essentialInformation": "essential information",
@@ -1104,8 +1104,8 @@
     "cancelLog": "cancel",
     "confirmLog": "confirm",
     "logOutContent": "Are you sure you want to log out",
-    "corrEmailPlace":"Please enter the correct email address",
-    "corrPhonePlace":"Please enter the correct mobile number"
+    "corrEmailPlace": "Please enter the correct email address",
+    "corrPhonePlace": "Please enter the correct mobile number"
   },
   "labelMan": {
     "title": "Label management",
@@ -1136,11 +1136,33 @@
     "noDataTxt": "There is no data at the current time",
     "reqFailClkReload": "Request failed, click to reload"
   },
-  "kCascader":{
-    "selectRegion":"Please select your region"
+  "kCascader": {
+    "selectRegion": "Please select your region"
   },
   "paramNames": {
-    "D405": "A",
-    "D406": "B"
+    "D405": "Stove low speed",
+    "D406": "Stove medium speed",
+    "D407": "Stove high speed",
+    "D408": "Pump on time",
+    "D409": "Fan blowing time",
+    "D412": "Manual door closing waiting time",
+    "D416": "Lower sugar thickness factor",
+    "D418": "Furnace operating temperature",
+    "D419": "Sugar temperature error allowed in the cabinet",
+    "D435": "Medium speed of the stove",
+    "D444": "Base coefficient",
+    "D445": "Base humidity",
+    "D460": "Low temperature setting (stove temperature rise)",
+    "D461": "High temperature environment setting (external circulation fan)",
+    "D467": "Furnace head temperature N degrees during humidification",
+    "D468": "Monitoring time during humidification",
+    "D471": "Waiting time for the robot after the stick is released",
+    "D472": "Humidification OFF time",
+    "D473": "Humidification ON time",
+    "D475": "Humidification OFF time",
+    "D476": "Humidification ON Time",
+    "D477": "Humidification start delay",
+    "D478": "Humidification stop delay",
+    "M504": "Differential Adjustment"
   }
 }

+ 23 - 1
src/assets/language/zh.json

@@ -1143,6 +1143,28 @@
   },
   "paramNames": {
     "D405": "炉头低速",
-    "D406": "炉头中速"
+    "D406": "炉头中速",
+    "D407": "炉头高速",
+    "D408": "水泵开启时间",
+    "D409": "风机吹气时间",
+    "D412": "手动门关闭等待时间",
+    "D416": "下糖粗细系数",
+    "D418": "炉头工作温度",
+    "D419": "柜内允许做糖温度误差",
+    "D435": "炉头中速",
+    "D444": "基准系数",
+    "D445": "基准湿度",
+    "D460": "低温环境设定(炉头升柜温)",
+    "D461": "高温环境设定(外循环风机)",
+    "D467": "加湿时炉头升温N度",
+    "D468": "加湿时候监控时间",
+    "D471": "出棍后机械手等待时间",
+    "D472": "加湿OFF时间",
+    "D473": "加湿ON时间",
+    "D475": "加湿OFF时间",
+    "D476": "加湿ON时间",
+    "D477": "加湿启动延时",
+    "D478": "加湿停止延时",
+    "M504": "回差调节"
   }
 }

+ 16 - 23
src/views/device/paramsSet/paramsSetInfo.vue

@@ -6,21 +6,14 @@
       <div class="wrap2 flex-col van-hairline--bottom">
         <div class="outer1 flex-row justify-between">
           <div class="block1 flex-col"></div>
-          <span class="txt2"
-            >{{$t('device.equipmentName')}}:{{ deviceDetal ? deviceDetal.name : "" }}</span
-          >
+          <span class="txt2">{{ $t('device.equipmentName') }}:{{ deviceDetal ? deviceDetal.name : "" }}</span>
         </div>
       </div>
       <div class="paramsList" v-for="(item, key) in paramsList" :key="key">
-        <van-field
-          v-model="item.val"
-          name="phone"
-          type="tel"
-    
-          :label="paramName[key]"
-        >
+        <van-field v-model="item.val" name="phone" type="tel" :label="paramName[key]">
           <template #button>
-            <van-button size="small" type="primary" class="updataButton" @click="updateParams(item)">{{$t('device.submitUpdates')}}</van-button>
+            <van-button size="small" type="primary" class="updataButton"
+              @click="updateParams(item)">{{ $t('device.submitUpdates') }}</van-button>
           </template>
         </van-field>
       </div>
@@ -31,13 +24,13 @@
 <script>
 // import { createApp } from "vue";
 // import App from './App.vue';
-import {  onMounted, ref } from "vue";
+import { onMounted, ref } from "vue";
 import sHeader from "@/components/SimpleHeader";
 import { useRoute } from "vue-router";
 import { getDeviceDetal, getParameters, updateParameters } from "@/service/device";
 import { Toast } from "vant";
 import { useI18n } from 'vue-i18n';
-import zh from '@/assets/language/zh.json';
+// import zh from '@/assets/language/zh.json';
 
 export default {
   components: { sHeader },
@@ -94,23 +87,23 @@ export default {
       if (data.code) {
         paramsList.value = data.data;
         paramsList.value.forEach((paramItem) => {
-          console.log(paramItem.name);
+          // console.log(paramItem.name);
           comParams.value.push(paramItem.name);
-          paramName.value.push(t("paramNames."+paramItem.name));
-          console.log(zh.paramNames[paramItem.name]);        
+          paramName.value.push(t("paramNames." + paramItem.name));
+          // console.log(zh.paramNames[paramItem.name]);        
         })
-        console.log(comParams.value);
+        // console.log(comParams.value);
 
       } else {
         Toast.fail(data.message);
       }
     };
-/*     const paramName = computed(() => {
-      return zh.paramNames[comParams.value.name];
-    }) */
+    /*     const paramName = computed(() => {
+          return zh.paramNames[comParams.value.name];
+        }) */
     // const paramName = zh.paramNames[comParams.value.name];
-    console.log(t("paramNames.D405"));
-    
+    // console.log(t("paramNames.D405"));
+
 
     // // 定义过滤器
     // computed: {
@@ -167,7 +160,7 @@ export default {
   },
 };
 </script>
-  <style lang="less" scoped>
+<style lang="less" scoped>
 @import "../../../common/style/common";
 @import "./index.less";
 </style>