:art:​ 返回设备页时保留上一次的搜索结果

src/store/mutations.js

@@ -1,5 +1,5 @@
 export default {
-  addCart (state, payload) {
+  addCart(state, payload) {
     state.cartCount = payload.count
   },
   // 标签

src/store/state.js

@@ -1,4 +1,3 @@
-
 import {
   getLocal
 } from "@/common/js/utils";

src/views/device/deviceSearch.vue

@@ -15,8 +15,9 @@
             :placeholder="$t('device.merchantNamePlaceholder')" />
           <!-- 公司平台 -->
           <div v-if="isShowCompany()">
-            <van-field label-width="86" v-model="companyTypeText" is-link readonly :label="$t('device.companyTypeLabel')"
-              :placeholder="$t('device.companyTypePlaceholder')" @click="companyTypeShow = true" class="field" />
+            <van-field label-width="86" v-model="companyTypeText" is-link readonly
+              :label="$t('device.companyTypeLabel')" :placeholder="$t('device.companyTypePlaceholder')"
+              @click="companyTypeShow = true" class="field" />
             <van-popup v-model:show="companyTypeShow" round position="bottom">
               <van-cascader v-model="companyType" :title="$t('device.companyTypePlaceholder')"
                 :options="companyTypeOptions" @close="companyTypeShow = false" @finish="companyTypeFinish" />
@@ -187,9 +188,7 @@ export default {
     ]);
 
 
-    const deviceGroupOptions = ref([
-
-    ]);
+    const deviceGroupOptions = ref([]);
 
     const machineTypeFinish = ({ selectedOptions }) => {
       machineTypeShow.value = false;

src/views/device/deviceSet.vue

@@ -25,37 +25,6 @@
           <div></div>
         </div>
         <van-field readonly v-model="deviceDetal.adminUserName" :label="`${$t('device.affiliatedMerchant')}`" />
-        <!-- 地区 -->
-        <!-- <div v-if="areaShow" class="bd7 l-flex-between">
-          <div class="l-flex-RC">
-            <div class="cust_vantBorder">
-              <div class="filedInpPad">
-                <van-field colon @click-input="fieldValueInpClk" readonly clearable v-model="fieldValue"
-                  :label="`${$t('device.affiliatedArea')}`" :placeholder="$t('user.regionPlace')">
-                  <template #right-icon>
-                    <div class="l-flex-RC">
-                      <van-icon v-if="fieldValue" @click="
-                        fieldValue = '';
-                      deviceDetal.areaId = '';
-                      " class="o-mr-6" name="clear" />
-                      <van-icon @click="fieldValueInpClk" name="arrow-down" />
-                    </div>
-                  </template>
-                  <template #extra>
-                    <van-icon @click="areaShow = !areaShow" size="20" name="edit" />
-                  </template>
-                </van-field>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div v-else class="bd7 l-flex-between">
-          <van-field colon readonly v-model="fieldValue" :label="`${$t('device.affiliatedArea')}`" placeholder="">
-            <template #extra>
-              <van-icon @click="areaShow = !areaShow" size="20" name="edit" />
-            </template>
-          </van-field>
-        </div> -->
         <van-field readonly v-model="deviceDetal.equimentType" :label="`${$t('device.machineType')}`" placeholder="" />
         <!-- mg280才有到期时间 -->
         <template v-if="deviceDetal?.equimentType?.indexOf('mg280') !== -1">
@@ -135,18 +104,20 @@
                 message: $t('device.operatorTelephonePlaceholder'),
               },
             ]" />
-
           <!-- <van-field clearable v-model="deviceDetal.timeRuleId" :label="`${$t('device.advertisingRulesLabel')}:`"
             :placeholder="$t('device.advertisingRulesPlaceholder')" /> -->
         </div>
         <div class="custom-line"></div>
         <div class="cust_vantBorder">
           <van-field clearable label-width="32%" v-model="deviceDetal.messageReceiver1"
-            :label="`${$t('device.messageReceiver1')}`" :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
+            :label="`${$t('device.messageReceiver1')}`"
+            :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
           <van-field clearable label-width="32%" v-model="deviceDetal.messageReceiver2"
-            :label="`${$t('device.messageReceiver2')}`" :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
+            :label="`${$t('device.messageReceiver2')}`"
+            :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
           <van-field clearable label-width="32%" v-model="deviceDetal.messageReceiver3"
-            :label="`${$t('device.messageReceiver3')}`" :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
+            :label="`${$t('device.messageReceiver3')}`"
+            :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
         </div>
         <div class="custom-line"></div>
         <!-- <div class="cust_vantBorder">
@@ -210,10 +181,10 @@
                 </van-radio-group>
               </div>
             </template>
-          </van-field> -->
-          <van-field v-model="deviceDetal.flowers" is-link readonly :label="machineType === '1'? '口味种类' : $t('device.flowerType')" 
-            :placeholder="machineType === '1'? '选择口味种类' : '选择花型种类'"
-            @click="showFlowerPicker = true" />
+</van-field> -->
+          <van-field v-model="deviceDetal.flowers" is-link readonly
+            :label="machineType === '1' ? '口味种类' : $t('device.flowerType')"
+            :placeholder="machineType === '1' ? '选择口味种类' : '选择花型种类'" @click="showFlowerPicker = true" />
         </template>
         <!-- 版本号 -->
         <van-field readonly v-model="deviceDetal.apkVersion" :label="`${$t('device.versionNo')}`" placeholder="" />
@@ -223,7 +194,7 @@
             :placeholder="$t('device.urlPlace')">
             <template #button>
               <van-button class="updateBtn" @click="updateUrlClk" type="primary">&nbsp;&nbsp;{{ $t("device.update")
-              }}&nbsp;&nbsp;</van-button>
+                }}&nbsp;&nbsp;</van-button>
             </template>
           </van-field>
         </div>
@@ -235,7 +206,8 @@
     </van-form>
     <!-- 地区弹窗 -->
     <kCascader @getareaname="getAreaName" :selectId="deviceDetal.areaId" @areapopfinish="areaPopFinish"
-      ref="kCascaderRef"></kCascader>
+      ref="kCascaderRef">
+    </kCascader>
     <!-- 更新弹窗 -->
     <kDialog :dialogTitle="$t('user.logOutTips')" :cancelBtnTxt="$t('user.cancelLog')"
       :confirmBtnTxt="$t('user.confirmLog')" ref="kDialogRef" :dialogContent="$t('device.sureUpdate')"
@@ -243,7 +215,8 @@
     </kDialog>
     <!-- 花型种类 -->
     <van-popup v-model:show="showFlowerPicker" round position="bottom">
-      <van-picker v-model="selectedFlower" :columns="flowerColumns" @cancel="showFlowerPicker = false" @confirm="onFlowerConfirm" />
+      <van-picker v-model="selectedFlower" :columns="flowerColumns" @cancel="showFlowerPicker = false"
+        @confirm="onFlowerConfirm" />
     </van-popup>
   </div>
 </template>
@@ -322,8 +295,8 @@ export default {
     });
     onBeforeRouteLeave((to, from, next) => {
       if (isUpdate.value) {
-        console.log("to.meta.keepAlive", to.meta.keepAlive);
-        to.meta.keepAlive = false;
+        // console.log("to.meta.keepAlive>>>", to.meta.keepAlive);
+        // to.meta.keepAlive = false;
       }
       next();
     });
@@ -358,7 +331,7 @@ export default {
     const onConfirm = ({ selectedOptions }) => {
       paymentValue.value = selectedOptions[0].text;
       deviceDetal.value.payType = selectedOptions[0].value;
-      console.log(deviceDetal.value.payType);
+      // console.log(deviceDetal.value.payType);
       showPayment.value = false;
     };
     // 初始化页面获取列表
@@ -458,7 +431,7 @@ export default {
           payType: item.payType
         };
       })[0];
-      console.log(params);
+      // console.log(params);
       if (params.name.length > 25) {
         showToast(t("device.nameLength"));
         return;
@@ -518,7 +491,7 @@ export default {
     };
     // 选择地区完成
     const areaPopFinish = async (e) => {
-      console.log("e", e);
+      // console.log("e", e);
       fieldValue.value = e.selectName;
       deviceDetal.value.areaId = e.selectId;
     };

src/views/device/index.vue

@@ -83,8 +83,10 @@
                 </span>
                 <!-- 温湿度 -->
                 <span v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'"
-                  class="txt1 o-mt-10" :style="{ color: item.furnaceTm <= 100 && item.eqeStatus == 1  ? '#ff0033' : '', 
-                  fontSize: item.furnaceTm <= 100 && item.eqeStatus == 1 ? '18px' : '' }">
+                  class="txt1 o-mt-10" :style="{
+                    color: item.furnaceTm <= 100 && item.eqeStatus == 1 ? '#ff0033' : '',
+                    fontSize: item.furnaceTm <= 100 && item.eqeStatus == 1 ? '18px' : ''
+                  }">
                   {{ $t("device.furnaceHeadTemperature") + '：' +
                     item.furnaceTm
                     + $t("device.degree") }}
@@ -100,15 +102,21 @@
                     + $t("device.humidity") }}
                 </span>
                 <span v-if="item.machineType == '1' && item.equimentType == 'P30'" class="txt1 o-mt-10">
-                  {{ $t("device.cornGeneratorTemperature") + '：' + (item.cabinetTm ? item.cabinetTm : '0') + $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 ? item.cabinetHd : '0') + $t("device.degree") }}
+                  {{ $t("device.stirringTemperature") + '：' + (item.cabinetHd ? item.cabinetHd : '0') +
+                    $t("device.degree") }}
                 </span>
-                <span v-if="item.machineType == '1' && item.equimentType == 'P30' && (item.furnaceTm && item.furnaceTm != '-1')" 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">
+                <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" />
@@ -229,8 +237,8 @@
                     </div> -->
                   </div>
                   <div class="contentWord kBordBott l-flex-center" v-if="item.alarmList">
-                    <van-button type="primary" color="#07c160" style="margin: 0 10px;" :text="$t('device.oneClickClear')"
-                      @click="clearAllAlarm(item.alarmList, item)"></van-button>
+                    <van-button type="primary" color="#07c160" style="margin: 0 10px;"
+                      :text="$t('device.oneClickClear')" @click="clearAllAlarm(item.alarmList, item)"></van-button>
                   </div>
                   <div class="editDeviceBtnCon l-flex-center o-mt-10">
                     <!-- 详细信息 -->
@@ -278,7 +286,7 @@
 import {
   Api_postMachineNum,
 } from "../../service/home";
-import { onMounted, reactive, toRefs, ref, onActivated } from "vue";
+import { onMounted, reactive, toRefs, ref, onActivated, onBeforeUnmount } from "vue";
 import { showFailToast, showSuccessToast, showToast, showConfirmDialog } from "vant";
 import sHeader from "../../components/SimpleHeader";
 import { getLoginUser, Format_calcuDecial, styleUrl } from "../../common/js/utils";
@@ -295,7 +303,6 @@ import deviceOper from "./deviceOper";
 import { onBeforeRouteLeave, useRouter } from "vue-router";
 import dateUtil from "../../utils/dateUtil";
 import { useI18n } from "vue-i18n";
-import { onBeforeUnmount } from "vue";
 import { Api_getLabelList } from "../../service/labelMan";
 
 
@@ -496,26 +503,26 @@ export default {
       }
     };
     // 一键消除报警
-    const clearAllAlarm =  (e, e1) => {
+    const clearAllAlarm = (e, e1) => {
       showConfirmDialog({
         title: t('device.openRemind'),
         message: t('device.isClear'),
       }).then(async () => {
-        const { data } = await eliminate(Object.assign({}, {id: e[0].id}));
+        const { data } = await eliminate(Object.assign({}, { id: e[0].id }));
         if (data.code) {
-        showSuccessToast(t("device.successfullyEliminatedTheAlarm"));
-        setTimeout(() => {
-          list.value[list.value.findIndex((item) => item.id === e1.id)].alarmList = null;
-          e1.hasTodayAlarm = false;
-          if (e1.machineType == "0" || e1.machineType == null) {
-            restartHead(e1.id, t("device.clearAfter"));
-          }
-        }, 800);
-      } else {
-        showFailToast(data.message);
-      }
+          showSuccessToast(t("device.successfullyEliminatedTheAlarm"));
+          setTimeout(() => {
+            list.value[list.value.findIndex((item) => item.id === e1.id)].alarmList = null;
+            e1.hasTodayAlarm = false;
+            if (e1.machineType == "0" || e1.machineType == null) {
+              restartHead(e1.id, t("device.clearAfter"));
+            }
+          }, 800);
+        } else {
+          showFailToast(data.message);
+        }
       }).catch((error) => {
-          console.log(error);
+        console.log(error);
       });
     };
 
@@ -671,7 +678,7 @@ export default {
     const restartHead = (id, msg) => {
       showConfirmDialog({
         title: t('user.tips'),
-        message: msg ? msg: t('device.restartFurnaceHeadTips'),
+        message: msg ? msg : t('device.restartFurnaceHeadTips'),
       }).then(async () => {
         const { data } = await setFurnace({
           equipmentId: id,

src/views/login.vue

@@ -125,7 +125,7 @@ export default {
         setLocal("curLang", navigatorLanguage());
         languageName.value = getLocal("curLang");
       }
-      console.log("route.query.relation_admin_id >>>", route.query.relation_admin_id);
+      // console.log("route.query.relation_admin_id >>>", route.query.relation_admin_id);
       if (route.query.relation_admin_id) {
         getSysFun();
       }