feat:"花型推送增加检查PLC版本提醒 "

src/assets/language/en.json

@@ -1605,8 +1605,10 @@
     "successfully": "Successfully sent, please wait a few seconds and re-enter"
   },
   "alramClean": {
-    "openStatus": "Machine clean reminder function switch status: On",
-    "closeStatus": "Machine clean reminder function switch status: Off",
+    "openCleanFunction": "Machine cleaning function: ON",
+    "closeCleanFunction": "Machine cleaning function: OFF",
+    "openStatus": "Machine clean reminder function switch status: ON",
+    "closeStatus": "Machine clean reminder function switch status: OFF",
     "tips": "Remind",
     "content": "Do you want to switch?",
     "successfully": "Successfully sent, please wait a few seconds and re-enter"

src/assets/language/ja.json

@@ -1624,6 +1624,8 @@
         "successfully": "送信に成功しました。数秒待ってから再入力してください"
     },
     "alramClean": {
+        "openCleanFunction": "洗浄機能です：オン",
+        "closeCleanFunction": "洗浄機能です：オフ",
         "openStatus": "装置のクリーニングリマインダースイッチの状態：オン",
         "closeStatus": "装置のクリーニングリマインダースイッチの状態：オフ",
         "tips": "リマインダー",

src/views/device/deviceSet.vue

@@ -15,11 +15,11 @@
         <div class="cust_vantBorder">
           <van-field required clearable v-model="deviceDetal.name" name="name"
             :label="`${$t('device.equipmentNameLabel')}`" :placeholder="$t('device.equipmentNamePlaceholder')" :rules="[
-              {
-                required: true,
-                message: $t('device.equipmentNamePlaceholder'),
-              },
-            ]" />
+      {
+        required: true,
+        message: $t('device.equipmentNamePlaceholder'),
+      },
+    ]" />
           <van-field clearable v-model="deviceDetal.selfName" :label="`${$t('device.equipmentRemarksLabel')}`"
             :placeholder="$t('device.equipmentRemarksPlaceholder')" />
           <div></div>
@@ -91,19 +91,19 @@
         <div class="cust_vantBorder">
           <van-field required clearable v-model="deviceDetal.contactName" name="contactName"
             :label="`${$t('device.nameOfOperatorLabel')}`" :placeholder="$t('device.nameOfOperatorPlaceholder')" :rules="[
-              {
-                required: true,
-                message: $t('device.nameOfOperatorPlaceholder'),
-              },
-            ]" />
+      {
+        required: true,
+        message: $t('device.nameOfOperatorPlaceholder'),
+      },
+    ]" />
           <van-field required clearable v-model="deviceDetal.contactPhone" name="contactPhone"
             :label="`${$t('device.operatorTelephoneLabel')}`" :placeholder="$t('device.operatorTelephonePlaceholder')"
             :rules="[
-              {
-                required: true,
-                message: $t('device.operatorTelephonePlaceholder'),
-              },
-            ]" />
+      {
+        required: true,
+        message: $t('device.operatorTelephonePlaceholder'),
+      },
+    ]" />
           <!-- <van-field clearable v-model="deviceDetal.timeRuleId" :label="`${$t('device.advertisingRulesLabel')}:`"
             :placeholder="$t('device.advertisingRulesPlaceholder')" /> -->
         </div>
@@ -156,11 +156,11 @@
               <div class="van-cell__value van-field__value radioBox">
                 <van-radio-group v-model="deviceDetal.channel" direction="horizontal">
                   <van-radio name="1" icon-size="16px">{{
-                    $t("device.tweets")
-                  }}</van-radio>
+      $t("device.tweets")
+    }}</van-radio>
                   <van-radio name="2" icon-size="16px">{{
-                    $t("device.mq")
-                  }}</van-radio>
+        $t("device.mq")
+      }}</van-radio>
                 </van-radio-group>
               </div>
             </template>
@@ -184,7 +184,7 @@
 </van-field> -->
           <van-field v-model="deviceDetal.flowers" is-link readonly
             :label="machineType === '1' ? '口味种类' : $t('device.flowerType')"
-            :placeholder="machineType === '1' ? '选择口味种类' : '选择花型种类'" @click="showFlowerPicker = true" />
+            :placeholder="machineType === '1' ? '选择口味种类' : '选择花型种类'" @click="clickFlowerPicker" />
         </template>
         <!-- 版本号 -->
         <van-field readonly v-model="deviceDetal.apkVersion" :label="`${$t('device.versionNo')}`" placeholder="" />
@@ -200,7 +200,7 @@
         </div>
         <div class="l-flex-center o-mtb-30">
           <van-button round type="primary" class="info7" native-type="submit">{{
-            $t("device.submitAndPushDeviceUpdates") }}</van-button>
+      $t("device.submitAndPushDeviceUpdates") }}</van-button>
         </div>
       </div>
     </van-form>
@@ -243,7 +243,7 @@ import {
   Api_getDiscCodeStatus,
   getGoodsNumber,
 } from "@/service/device/index";
-import { showFailToast, showSuccessToast, showToast } from "vant";
+import { showFailToast, showSuccessToast, showToast, closeToast } from "vant";
 import { useI18n } from "vue-i18n";
 import dateUtil from "@/utils/dateUtil";
 import { styleUrl } from "../../common/js/utils";
@@ -470,7 +470,11 @@ export default {
     const onFlowerConfirm = ({ selectedOptions }) => {
       showFlowerPicker.value = false;
       deviceDetal.value.flowers = selectedOptions[0].text;
-      showToast("提示：\n修改花型后需要重新设置价格")
+      showToast({
+        message: "提示：\n修改花型后需要重新设置价格",
+        duration: 3000,
+        forbidClick: true
+      })
     }
 
     // 点击去到编辑标签页
@@ -547,6 +551,33 @@ export default {
         query: { deviceId: route.query.deviceId, adRuleList: JSON.stringify(adRuleList.value) },
       });
     };
+    const clickFlowerPicker = () => {
+
+      const toast = showToast({
+        duration: 0,
+        forbidClick: true,
+        message: '提示：\n请确认PLC版本支持修改的花型，避免出现程序错乱，导致客诉！！！倒计时 5 S',
+      });
+
+      let second = 5;
+      const timer = setInterval(() => {
+        second--;
+        if (second) {
+          toast.message = `提示：\n请确认PLC版本支持修改的花型，避免出现程序错乱，导致客诉！！！倒计时 ${second} S`;
+        } else {
+          clearInterval(timer);
+          closeToast();
+          showFlowerPicker.value = true;
+        }
+      }, 1000);
+
+      // showToast({
+      //   message: "提示：\n是否确认过PLC版本支持该花型，避免出现程序错乱，导致客诉！！！",
+      //   duration: 3000,
+      //   forbidClick: true
+      // })
+      // showFlowerPicker.value = true;
+    }
     return {
       deviceDetal,
       updateDeviceFun,
@@ -577,6 +608,7 @@ export default {
       showFlowerPicker,
       selectedFlower,
       onFlowerConfirm,
+      clickFlowerPicker
     };
   },
 };

src/views/device/index.vue

@@ -82,8 +82,7 @@
                   }}
                 </span>
                 <!-- 温湿度 -->
-                <span v-if="item.machineType == '0' || item.machineType == null"
-                  class="txt1 o-mt-10" :style="{
+                <span v-if="item.machineType == '0' || item.machineType == null" class="txt1 o-mt-10" :style="{
         color: item.furnaceTm <= 100 && item.eqeStatus == 1 ? '#ff0033' : '',
         fontSize: item.furnaceTm <= 100 && item.eqeStatus == 1 ? '0.5rem' : ''
       }">
@@ -91,32 +90,27 @@
         $t("device.degree")
                   }}
                 </span>
-                <span v-if="item.machineType == '0' || item.machineType == null"
-                  class="txt1 o-mt-10">
+                <span v-if="item.machineType == '0' || item.machineType == null" class="txt1 o-mt-10">
                   {{ $t("device.temperatureInCabinet") + '：' + (item.cabinetTm ? item.cabinetTm : '0')
         + $t("device.degree") }}
                 </span>
-                <span v-if="item.machineType == '0' || item.machineType == null"
-                  class="txt1 o-mt-10">
+                <span v-if="item.machineType == '0' || item.machineType == null" class="txt1 o-mt-10">
                   {{ $t("device.humidityInCabinet") + '：' + (item.cabinetHd ? item.cabinetHd : '0')
         + $t("device.humidity") }}
                 </span>
                 <span v-if="item.machineType == '1'" class="txt1 o-mt-10">
                   {{ $t("device.cornGeneratorTemperature") + '：' + (item.cabinetTm ? item.cabinetTm : '0') +
-                    $t("device.degree")
+        $t("device.degree")
                   }}
                 </span>
-                <span v-if="item.machineType == '1'" class="txt1 o-mt-10">
+                <span v-if="item.machineType == '1' && item.equimentType != 'P10'" class="txt1 o-mt-10">
                   {{ $t("device.stirringTemperature") + '：' + (item.cabinetHd ? item.cabinetHd : '0') +
-                    $t("device.degree") }}
+        $t("device.degree") }}
                 </span>
-                <span
-                  v-if="item.machineType == '1' && (item.furnaceTm && item.furnaceTm != '-1')"
-                  class="txt1 o-mt-10">
+                <span v-if="item.machineType == '1' && (item.furnaceTm && item.furnaceTm != '-1')" class="txt1 o-mt-10">
                   {{ $t("device.cupQuantity") + '：' + item.furnaceTm }}
                 </span>
-                <span v-if="item.machineType == '1' && item.furnaceSp"
-                  class="txt1 o-mt-10">
+                <span v-if="item.machineType == '1' && 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" />
@@ -264,7 +258,7 @@
                 <div class="bd6 l-flex-center o-ptb-7" @click="item.checkType = !item.checkType">
                   <div class="l-flex-RC">
                     <span class="info2 o-mr-5">{{
-        item.checkType ? $t("device.stow") : $t("device.seeMore")
+                      item.checkType ? $t("device.stow") : $t("device.seeMore")
                       }}</span>
                     <div class="group2 flex-col" :class="{ checkType: item.checkType }"></div>
                   </div>

src/views/home/index.vue

@@ -141,9 +141,13 @@
                   <!-- 纸币 -->
                   <!-- <van-col span="8">{{ $t("home.bills") }}: {{ item.bills }}</van-col> -->
                   <!-- 硬币+纸币 -->
-                  <van-col span="12">{{ $t("home.coinsBills") }}: {{ item.coinsBills !== undefined ? item.coinsBills : '0' }}</van-col>
+                  <van-col span="12">{{ $t("home.coinsBills") }}: {{ item.coinsBills !== undefined ? item.coinsBills :
+        '0'
+                    }}</van-col>
                   <!-- 信用卡 -->
-                  <van-col span="12">{{ $t("home.creditCard") }}: {{ item.creditCard !== undefined ? item.creditCard : '0' }}</van-col>
+                  <van-col span="12">{{ $t("home.creditCard") }}: {{ item.creditCard !== undefined ? item.creditCard :
+        '0'
+                    }}</van-col>
                   <!-- 电子支付 -->
                   <!-- <van-col span="8">{{ $t("home.electronicPayment") }}: {{ item.electronicPayment }}</van-col> -->
                   <!-- 所有支付方式合计 -->
@@ -154,10 +158,6 @@
           </div>
         </van-list>
       </div>
-      <div v-else style="text-align: center;">
-        <br>
-        {{ $t("home.migrationInstructions") }}
-      </div>
 
     </div>
     <!-- 通知弹窗 -->
@@ -167,14 +167,6 @@
         <div class="o-w" style="max-height: 50vh; overflow-y: auto" v-html="noticeContent.note"></div>
       </template>
     </kDialog>
-    <!-- <nav-bar></nav-bar> -->
-    <!-- <van-dialog v-model:show="firstLogin" title="标题" show-cancel-button style="">
-      <div style="max-height: 60vh; overflow-y: auto;">
-        <van-image v-model="pic1" src="https://fastly.jsdelivr.net/npm/@vant/assets/apple-3.jpeg"/>
-        <van-image src="https://fastly.jsdelivr.net/npm/@vant/assets/apple-3.jpeg" />
-        <van-image src="https://fastly.jsdelivr.net/npm/@vant/assets/apple-3.jpeg" />
-      </div>
-    </van-dialog> -->
     <van-dialog v-model:show="showAlarm" :title="$t('home.alarmTitle')" @confirm="confirmAlarm">
       <div style="max-height: 30vh; overflow-y: auto;">
         <div v-for="(item, index) in alarmList" :key="index" style="padding: 2px 5px;">
@@ -187,14 +179,7 @@
       <van-floating-bubble v-model:offset="offset" axis="xy" :icon="robotIcon" magnetic="x"
         @offset-change="onOffsetChange" @click="onClickBot">
       </van-floating-bubble>
-
-      <!-- <van-popup v-model:show="popupVisible" closeable close-icon="close" position="bottom" :style="{ height: '90%' }" round 
-        @click="onClose"  >
-        <iframe :src="aiUrl" sandbox="allow-same-origin allow-scripts allow-popups allow-forms"
-          style="width: 100%; height: 100%;"></iframe>
-      </van-popup> -->
       <van-popup v-model:show="popupVisible" position="bottom" :style="{ height: '90%' }" round @click="onClose">
-        <!--    @click-overlay="onClickOverlay" @click-close-icon="onClickCloseIcon" -->
         <iframe :src="aiUrl" sandbox="allow-same-origin allow-scripts allow-popups allow-forms"
           style="width: 100%; height: 100%;"></iframe>
       </van-popup>
@@ -415,8 +400,8 @@ export default {
                 type: "inside",
                 xAxisIndex: 0,
                 filterMode: "none",
-                startValue: null,
-                endValue: null,
+                startValue: 0,
+                endValue: 50,
                 zoomLock: true,
               },
             ],

src/views/settlement/index.vue

@@ -545,6 +545,10 @@ export default {
         value: "03140000",
       },
       {
+        text: '广州银行',
+        value: "03134401",
+      },
+      {
         text: '其他，请咨询售后人员',
         value: "",
       },