feat：“同步2024.07.29“

src/assets/language/en.json

@@ -458,6 +458,7 @@
     "stirringTemperature": "Temperature two",
     "cornGeneratorTemperature": "Temperature one",
     "cupQuantity": "Cup quantity",
+    "bucketWeight": "Sugar bucket weight",
     "numberOneTm": "NO.1000",
     "candyGeneratorTm": "Generator temperature",
     "outsideTm": "Outside temperature",
@@ -472,6 +473,7 @@
     "diyFlower": "DIY flower",
     "degree": "℃",
     "humidity": "%RH",
+    "weight": " kg",
     "volume": "Volume",
     "alarmContent": "Alarm content",
     "time": "Time",

src/assets/language/ja.json

@@ -467,6 +467,7 @@
         "stirringTemperature": "温度2です",
         "cornGeneratorTemperature": "温度1です",
         "cupQuantity": "カップの残量",
+        "bucketWeight": "砂糖缶の重さです",
         "numberOneTm": "NO.1000",
         "candyGeneratorTm": "ジェネレーター温度",
         "outsideTm": "外部温度",
@@ -478,6 +479,7 @@
         "unknownError": "未知のエラー",
         "degree": "℃",
         "humidity": "%RH",
+        "weight": " kg",
         "volume": "ボリューム",
         "alarmContent": "アラーム内容",
         "time": "時間",

src/assets/language/zh.json

@@ -470,6 +470,7 @@
     "stirringTemperature": "温度二",
     "cornGeneratorTemperature": "温度一",
     "cupQuantity": "杯子数量",
+    "bucketWeight": "糖桶总重量",
     "numberOneTm": "NO.1000",
     "candyGeneratorTm": "发生器温度",
     "outsideTm": "柜外温度",
@@ -481,6 +482,7 @@
     "diyFlower": "DIY花型",
     "degree": "℃",
     "humidity": "%RH",
+    "weight": " kg",
     "volume": "音量",
     "time": "时间",
     "alarmContent": "报警内容",

src/styles/device/index.less

@@ -172,7 +172,7 @@
                 font-size: 15px;
                 font-family: PingFangSC-Medium;
                 text-align: left;
-                line-height: 15px;
+                line-height: 20px;
                 display: block;
                 margin: 3px 0 0 6px;
                 overflow: hidden;

src/styles/merchantManage/index.less

@@ -253,16 +253,13 @@
 
         .tab {
             .info {
-                width: 98px;
-                height: 13px;
                 overflow-wrap: break-word;
                 color: rgba(64, 77, 116, 1);
                 font-size: 14px;
                 text-align: left;
-                white-space: nowrap;
-                line-height: 14px;
+                line-height: 25px;
                 display: block;
-                margin: 21px 0 0 32px;
+                margin: 10px 25px;
             }
 
             .activate {

src/views/device/index.vue

@@ -91,14 +91,17 @@
         + $t("device.degree") }}
                 </span>
                 <span v-if="item.machineType == '1' && item.equimentType == 'P30'" class="txt1 o-mt-10">
-                  {{ $t("device.cornGeneratorTemperature") + '：' + item.cabinetTm + $t("device.degree") }}
+                  {{ $t("device.cornGeneratorTemperature") + '：' + (item.cabinetTm ? item.cabinetTm : '0') + $t("device.degree") }}
                 </span>
                 <span v-if="item.machineType == '1' && item.equimentType == 'P30'" class="txt1 o-mt-10">
-                  {{ $t("device.stirringTemperature") + '：' + item.cabinetHd + $t("device.degree") }}
+                  {{ $t("device.stirringTemperature") + '：' + (item.cabinetHd ? item.cabinetHd : '0') + $t("device.degree") }}
                 </span>
-                <span v-if="item.machineType == '1' && item.equimentType == 'P30'" class="txt1 o-mt-10">
+                <span v-if="item.machineType == '1' && item.equimentType == 'P30' && (item.furnaceTm && item.furnaceTm != '-1')" class="txt1 o-mt-10">
                   {{ $t("device.cupQuantity") + '：' + item.furnaceTm }}
                 </span>
+                <span v-if="item.machineType == '1' && item.equimentType == 'P30' && item.furnaceSp" class="txt1 o-mt-10">
+                  {{ $t("device.bucketWeight") + '：' + item.furnaceSp + $t("device.weight") }}
+                </span>
                 <img v-if="item.checkType" class="pic1" referrerpolicy="no-referrer" src="../../assets/home/line.png" />
                 <div class="contentBottomCon" v-if="item.checkType">
                   <!-- 所属商家 -->

src/views/orderExport/index.vue

@@ -231,7 +231,8 @@ export default {
         loading.value = false;
       } else {
         loading.value = false;
-        showFailToast("数据加载失败");
+        finished.value = true;
+        showFailToast(data.message);
       }
     };
     // getOrderList(Object.assign(param, searchParams)).then((res) => {
@@ -324,6 +325,7 @@ export default {
     const confirmClk = () => {
       searchParams.clientId = searchForm.orderNo;
       searchParams.username = searchForm.busiName;
+      searchParams.userName = searchForm.busiName;
       searchParams.ifForeign = searchForm.ifForeign;
       searchParams.companyType = searchForm.companyType;
       tableData.value = [];
@@ -374,6 +376,7 @@ export default {
       type: "2", // 分组类型
       clientId: "", // 设备编号
       username: "",
+      userName: "",
       startDate: "",
       endDate: "",
       ifForeign: '0',