:art: 设备信息

src/styles/device/index.less

@@ -390,7 +390,6 @@
             }
 
             .editDeviceBtnCon {
-
               .box2 {
                 width: 10px;
                 height: 0.5rem;
@@ -398,7 +397,6 @@
                 background-size: 100%;
                 // margin-top: 0.2rem;
               }
-
               .c-text-14 {
                 display: inline-block;
                 /* 将行内文本转为块级元素 */
@@ -412,6 +410,10 @@
                 cursor: pointer;
                 /* 设置光标样式 */
               }
+              .l-flex-RC {
+                margin-left: 10px;
+                margin-right: 10px;
+              }
             }
 
             .bd8 {

src/views/device/index.vue

@@ -70,22 +70,52 @@
                   <div v-if="!item.hasTodayAlarm" class="layer2 o-mr-5"
                     :class="{ deviceOn: item.eqeStatus === 1, layerLeft: item.hasTodayAlarm, }"></div>
                 </div>
-                <!-- 所属商家 -->
-                <span class="txt1 o-mt-10">{{ $t("device.affiliatedMerchants") }}：{{ item.adminUserName }}</span>
                 <!-- 机器编码 -->
                 <span class="txt1 o-mt-10">{{ $t("device.machineUniqueCode") }}：{{ item.clientId }}</span>
                 <!-- 锁机状态 -->
                 <span v-if="user.type < 1" class="txt1 o-mt-10">
-                  {{ $t("device.lockCondition") }}：{{ item.isBlocked ? $t("device.lockState") : $t("device.unLockState")
-                  }}
+                  {{ $t("device.lockCondition") }}：{{ item.isBlocked ? $t("device.lockState") : $t("device.unLockState") }}
                 </span>
+                <!-- 温湿度 -->
+                <!-- <span v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'"
+                  class="txt1 o-mt-10">
+                  <van-col class="word5" style="">{{ $t("device.furnaceHeadTemperature") + '：' +
+                    item.furnaceTm
+                    + $t("device.degree") }}</van-col>
+                  <van-col class="word5" style="">{{ '&nbsp;' + $t("device.temperatureInCabinet") + '：' + item.cabinetTm
+                    + $t("device.degree") }}</van-col>
+                  <van-col class="word5" style="">{{ '&nbsp;' + $t("device.humidityInCabinet") + '：' + item.cabinetHd
+                    + $t("device.humidity") }}</van-col>
+                </span> -->
+                <span v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'"
+                  class="txt1 o-mt-10">
+                  {{ $t("device.furnaceHeadTemperature") + '：' +
+                    item.furnaceTm
+                    + $t("device.degree") }}
+                </span>
+                <span v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'"
+                  class="txt1 o-mt-10">
+                  {{ $t("device.temperatureInCabinet") + '：' + item.cabinetTm
+                    + $t("device.degree") }}
+                </span>
+                <span v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'"
+                  class="txt1 o-mt-10">
+                  {{ $t("device.humidityInCabinet") + '：' + item.cabinetHd
+                    + $t("device.humidity") }}
+                </span>
+
                 <img v-if="item.checkType" class="pic1" referrerpolicy="no-referrer" src="../../assets/home/line.png" />
                 <div class="contentBottomCon" v-if="item.checkType">
+
+                  <!-- 所属商家 -->
+                  <!-- <span class="txt1 o-mt-10">{{ $t("device.affiliatedMerchants") }}：{{ item.adminUserName }}</span> -->
+                  <div class="contentWord kBordBott">{{ $t("device.affiliatedMerchants") }}：{{ item.adminUserName }}
+                  </div>
                   <!-- 睡眠状态 -->
                   <div class="contentWord kBordBott">
                     <span class="o-mr-10">{{ $t("device.sleepState") }}：{{ item.isSleep ? $t("device.sleeping") :
-        $t("device.notSleeping") }}</span>
-                    <van-switch :model-value="item.isSleep"  size="23px" @click="changeSleep(item)" />
+                      $t("device.notSleeping") }}</span>
+                    <van-switch :model-value="item.isSleep" size="23px" @click="changeSleep(item)" />
                   </div>
                   <!-- 睡眠描述 -->
                   <div v-if="item.isSleep" class="contentWord kBordBott">
@@ -114,7 +144,7 @@
                   <div class="contentWord kBordBott" v-if="item.machineType == null || item.machineType == '0'">
                     <span>
                       {{ (item.machineType == '0' || item.machineType == null) ? $t("device.furnHeadStatus") :
-        $t("device.deviceStatus") }}：
+                        $t("device.deviceStatus") }}：
                       {{ item.eqeStatus === 1 ? $t("device.opened") : $t("device.closed") }}
                     </span>
                     <div class="o-ml-10">
@@ -145,26 +175,15 @@
                     <span>{{ $t("device.position") }}：</span>
                     <a class="clickable-link" @click="viewPosiClk(item)">{{ item.fullName }}</a>
                   </span>
-                  <!-- 机器参数 -->
-                  <van-row class="layer5 kBordBott" justify="space-between"
-                    v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'">
-                    <van-col class="word5" style="">{{ $t("device.furnaceHeadTemperature") }}：{{
-        item.furnaceTm
-      }}{{ $t("device.degree") }}</van-col>
-                    <van-col class="word5" style="">{{ $t("device.temperatureInCabinet") }}：{{
-        item.cabinetTm
-      }}{{ $t("device.degree") }}</van-col>
-                    <van-col class="word5" style="">{{ $t("device.humidityInCabinet") }}：{{
-        item.cabinetHd
-      }}{{ $t("device.humidity") }}</van-col>
-                  </van-row>
+
+
                   <van-row class="layer5 kBordBott" justify="space-between" v-if="item.machineType == '1'">
                     <van-col class="word5" style="">{{ $t("device.cornGeneratorTemperature") }}：{{
-        item.cabinetTm
-      }}{{ $t("device.degree") }}</van-col>
+                      item.cabinetTm
+                    }}{{ $t("device.degree") }}</van-col>
                     <van-col class="word5" style="">{{ $t("device.stirringTemperature") }}：{{
-        item.cabinetHd
-      }}{{ $t("device.degree") }}</van-col>
+                      item.cabinetHd
+                    }}{{ $t("device.degree") }}</van-col>
                     <van-col class="word5" style="">{{ $t("device.cupQuantity") }}：{{ item.furnaceTm
                       }}</van-col>
                   </van-row>
@@ -185,8 +204,8 @@
                     </van-row>
                     <div class="sugarTxt kBordBott">
                       <span>{{ $t("device.stick") }}：{{
-        Format_calcuDecial(item.stick)
-      }}%</span>
+                        Format_calcuDecial(item.stick)
+                      }}%</span>
                     </div>
                     <van-row gutter="20" class="sugarTxt kBordBott">
                       <van-col>
@@ -200,7 +219,7 @@
                     <span class="contentWord kBordBott">
                       <span class="l-flex-RC">{{ $t("device.oneKeyFeed") }}：
                         <van-button class="replenishment" @click="replenishmentClk(item)" type="primary">{{
-        $t("device.replenishment") }}
+                          $t("device.replenishment") }}
                         </van-button>
                       </span>
                       <!-- <a class="replenishment" @click="replenishmentClk(item)">{{ $t("device.replenishment")
@@ -209,20 +228,20 @@
                   </template>
                   <!-- 最近刷新时间 -->
                   <span class="contentWord kBordBott">{{ $t("device.lastRefreshTime") }}：{{
-        showDateTime(item.lastUpdateTime)
-      }}</span>
+                    showDateTime(item.lastUpdateTime)
+                  }}</span>
                   <!-- 音量 -->
                   <span v-if="item.machineType != '2'" class="contentWord kBordBott">{{ $t("device.volume") }}：{{
-        item.volume }}</span>
+                    item.volume }}</span>
                   <!-- 报警内容 -->
                   <div class="contentWord kBordBott l-flex-LC justify-space-between">
                     <span>{{ $t("device.alarmContent") }}：</span>
                     <!-- <div class="l-flex-RC"> -->
                     <span class="word3">{{
-        item.alarmList && item.alarmList[0] && item.alarmList[0].alarmContent
-          ? showDateTime(item.alarmList[0].occurrenceTime) + " " + item.alarmList[0].alarmContent
-          : $t("device.alarmContentNoData")
-      }}
+                      item.alarmList && item.alarmList[0] && item.alarmList[0].alarmContent
+                        ? showDateTime(item.alarmList[0].occurrenceTime) + " " + item.alarmList[0].alarmContent
+                        : $t("device.alarmContentNoData")
+                    }}
                     </span>
                     <van-button v-if="item.alarmList && item.alarmList[0] && item.alarmList[0].alarmContent"
                       style="flex-shrink: 0; margin: 0;" type="primary" color="#07c160"
@@ -230,16 +249,19 @@
                     <!-- </div> -->
                   </div>
                   <div class="editDeviceBtnCon l-flex-center o-mt-10">
+                    <!-- 详细信息 -->
                     <div class="l-flex-RC" @click="deviceSet(item)">
                       <span class="c-text-14">{{
-        $t("device.editDevice")
-      }}</span>
+                        $t("device.editDevice")
+                      }}</span>
                       <div class="box2 flex-col"></div>
                     </div>
+
+                    <!-- 远程操作 -->
                     <div class="l-flex-RC" @click="deviceOprShow(item)">
                       <span class="c-text-14">{{
                         $t("device.commonOperations")
-                        }}</span>
+                      }}</span>
                       <div class="box2 flex-col"></div>
                     </div>
                   </div>
@@ -249,7 +271,7 @@
                   <div class="l-flex-RC">
                     <span class="info2 o-mr-2">{{
                       item.checkType ? $t("device.stow") : $t("device.seeMore")
-                      }}</span>
+                    }}</span>
                     <div class="group2 flex-col" :class="{ checkType: item.checkType }"></div>
                   </div>
                 </div>
@@ -524,7 +546,7 @@ export default {
           equipmentId: row.id
         });
         if (data.code) {
-          showSuccessToast(t("device.sentSuccessfully")); 
+          showSuccessToast(t("device.sentSuccessfully"));
           setTimeout(() => {
             // router.go(0);
             init();

src/views/taskMessage/equipment/index.vue

@@ -4,30 +4,36 @@
     <s-header :name="$t('taskMessage.taskMessage')" :noback="false"></s-header>
     <div class="taskMessageBox flex-col">
       <van-list v-model:loading="loading" v-model:error="error" :error-text="$t('common.reqFailClkReload')"
-        :finished="finished" :finished-text="$t('common.noMoreTxt')" offset="300" :immediate-check="false" @load="onLoad">
+        :finished="finished" :finished-text="$t('common.noMoreTxt')" offset="300" :immediate-check="false"
+        @load="onLoad">
         <div class="searchRow flex-row justify-between">
           <div class="flex-col">
             <div class="flex-row justify-between bd3">
               <div class="flex-col outer4 equipmentIcon"></div>
               <span class="flex-col txt2">{{ $t("taskMessage.total")
-              }}<span class="discountNumber">{{ alarmHistoryTotal }}</span>{{ $t("taskMessage.recordsInTotal") }}</span>
+                }}<span class="discountNumber">{{ alarmHistoryTotal }}</span>{{ $t("taskMessage.recordsInTotal")
+                }}</span>
             </div>
           </div>
+
           <div class="l-flex-RC">
+            <!-- 查看待审批的申请 -->
             <div @click="reviewedClk" class="label3 o-mr-30">
               {{ $t("taskMessage.toViewAppro") }}
             </div>
+            <!-- 搜索图片 -->
             <div @click="noticeClk" class="main5 l-flex-RC">
               <img class="label2 o-mr-5" src="../../../assets/device/searchIcon.png" />
-              <!-- <span class="txt3">{{ $t("taskMessage.search") }}</span> -->
             </div>
           </div>
+          
         </div>
         <div class="listBox">
           <div v-for="(item, index) in alarmHistoryList" :key="index" class="listItem">
             <div class="itemBox">
               <div class="itemRow">
-                <span class="itemTitle">{{ $t("taskMessage.affiliatedMerchants") }}:&nbsp;</span>{{ item.adminUserName }}
+                <span class="itemTitle">{{ $t("taskMessage.affiliatedMerchants") }}:&nbsp;</span>{{ item.adminUserName
+                }}
               </div>
               <div class="itemRow">
                 <span class="itemTitle">{{ $t("taskMessage.equipmentNo") }}:&nbsp;</span>{{ item.clientId }}
@@ -45,7 +51,8 @@
                   showDateTime(item.createDate) }}
               </div>
               <div class="itemRow" v-if="item.statusType !== 1">
-                <span class="itemTitle">{{ $t("taskMessage.approvalTime") }}:&nbsp;</span>{{ showDateTime(item.modifyDate)
+                <span class="itemTitle">{{ $t("taskMessage.approvalTime") }}:&nbsp;</span>{{
+                  showDateTime(item.modifyDate)
                 }}
               </div>
               <div v-if="item.statusType === 1 && isOper" class="itemRow"
@@ -92,7 +99,7 @@
             " :label="$t('taskMessage.equipmentInit.searchPop.equipmentNo')" />
           <van-field clearable v-model="searchForm.managementSystemID" :placeholder="$t('taskMessage.equipmentInit.searchPop.managementSystemIDPlace')
             " :label="$t('taskMessage.equipmentInit.searchPop.managementSystemID')
-    " />
+              " />
           <van-field clearable v-model="searchForm.merchantName" :placeholder="$t('taskMessage.equipmentInit.searchPop.merchantNamePlace')
             " :label="$t('taskMessage.equipmentInit.searchPop.merchantName')" />
           <van-field @click-input="busiInpClk" readonly clearable v-model="searchForm.stateName"
@@ -325,5 +332,4 @@ export default {
 
 <style lang="less" scoped>
 @import "../../../common/style/common.less";
-</style>
-  
+</style>

src/views/user.vue

@@ -36,9 +36,9 @@
                     <template #right-icon>
                       <div class="l-flex-RC">
                         <van-icon v-if="fieldValue" @click="
-        fieldValue = '';
-      accountDetail.areaId = '';
-      " class="o-mr-6" name="clear" />
+                          fieldValue = '';
+                        accountDetail.areaId = '';
+                        " class="o-mr-6" name="clear" />
                         <van-icon @click="fieldValueInpClk" name="arrow-down" />
                       </div>
                     </template>
@@ -136,7 +136,7 @@
 
                 <template #button>
                   <van-button type="primary" @click="mailboxChg(cofficentForm.currencySymbol, 5)">{{
-        $t("user.confirmLog") }}
+                    $t("user.confirmLog") }}
                   </van-button>
                 </template>
               </van-field>
@@ -156,7 +156,7 @@
 
                   <template #button>
                     <van-button type="primary" @click="mailboxChg(diyPassword, 6)">{{
-        $t("user.confirmLog") }}
+                      $t("user.confirmLog") }}
                     </van-button>
                   </template>
                 </van-field>