ソースを参照

fix:"优化爆米花参数名称"

soobin 8 ヶ月 前
コミット
1306379855
2 ファイル変更16 行追加13 行削除
  1. 13 13
      src/assets/language/ja.json
  2. 3 0
      src/views/orderCenter/index.vue

+ 13 - 13
src/assets/language/ja.json

@@ -467,10 +467,10 @@
         "furnaceHeadTemperature": "釜の温度",
         "temperatureInCabinet": "内部温度",
         "humidityInCabinet": "内部湿度",
-        "stirringTemperature": "温度2です",
-        "cornGeneratorTemperature": "温度1です",
+        "stirringTemperature": "攪拌温度",
+        "cornGeneratorTemperature": "発生器温度",
         "cupQuantity": "カップの残量",
-        "bucketWeight": "砂糖の重さです",
+        "bucketWeight": "砂糖の重さです",
         "numberOneTm": "NO.1000",
         "candyGeneratorTm": "ジェネレーター温度",
         "outsideTm": "外部温度",
@@ -1617,16 +1617,16 @@
         "M307": "攪拌モーターです"
     },
     "popParams": {
-        "D460": "NO.1095",
-        "D492": "NO.1091",
-        "D493": "NO.1092",
-        "D494": "NO.1093",
-        "D495": "NO.1094",
-        "D208": "NO.1084",
-        "D249": "NO.1034",
-        "D346": "NO.1052",
-        "D497": "NO.1096",
-        "D344": "NO.1083",
+        "D460": "砂糖投入係数",
+        "D492": "チョコレート係数",
+        "D493": "キャラメル係数",
+        "D494": "ピーチ係数",
+        "D495": "ブルーベリー係数",
+        "D208": "残ったコーンで作れるカップの数",
+        "D249": "最初のポップの後、X秒間加熱を続ける",
+        "D346": "製造時の発生器の最高温度",
+        "D497": "食事後のドア閉鎖時間",
+        "D344": "冷風吹き付け時間",
         "M559": "Block sugar shortage alarm",
         "M566": "Disarm insulation heating wire failure alarm",
         "M568": "Shield generator air pump alarm",

+ 3 - 0
src/views/orderCenter/index.vue

@@ -790,6 +790,9 @@ export default {
       if (idx === 1) {
         switch (item.status) {
           case 1:
+            // if (user.timeZone) {
+            //   return DateTime.fromMillis(item.payDate, { zone: user.timeZone }).toFormat('yyyy/MM/dd HH:mm:ss');
+            // }
             return dateUtil.timeZoneDate(new Date(dateUtil.formateDate(new Date(item.payDate), "yyyy/MM/dd hh:mm:ss")));
           case 3:
             return dateUtil.timeZoneDate(new Date(dateUtil.formateDate(new Date(item.refundDate), "yyyy/MM/dd hh:mm:ss")));