Bladeren bron

style:“优化设备页面部分样式”

soobin 1 jaar geleden
bovenliggende
commit
2b5ef19733

BIN
src/assets/device/alarm.png


+ 36 - 35
src/assets/language/en.json

@@ -195,9 +195,9 @@
     }
   },
   "alarmHistory": {
-    "equipmentNoLabel": "Equipment No",
-    "equipmentNoPlaceholder": "Please enter the equipment number",
-    "equipmentNameLabel": "Equipment name",
+    "equipmentNoLabel": "Machine No",
+    "equipmentNoPlaceholder": "Please enter the Machine number",
+    "equipmentNameLabel": "Machine name",
     "equipmentNamePlaceholder": "Please enter the Machine name",
     "alarmTime": "Alarm time",
     "to": "to",
@@ -212,8 +212,8 @@
     "recordsTotal": " Records",
     "search": "search",
     "affiliatedMerchants": "Affiliated merchants",
-    "equipmentNo": "Equipment No",
-    "equipmentName": "Equipment name",
+    "equipmentNo": "Machine No",
+    "equipmentName": "Machine name",
     "creationTime": "Alarm time",
     "alarmContent": "Alarm content",
     "allDevices": "All devices"
@@ -300,13 +300,14 @@
     "to": " to ",
     "attention": "(Note: the number of bits is incorrect, updating may cause machine anomalies)",
     "submitUpdates": "Submit Updates",
+    "nameLength":"The name of the machine should not exceed 15 words",
     "modificationSucceeded": "Modification succeeded",
     "existsFailed": "The machine name already exists",
     "editFailed": "Modification failure",
     "noParameterData": "No parameter data is available !",
     "addDistributor": "Add Distributor",
-    "equipmentNoLabel": "Equipment No",
-    "equipmentNoPlaceholder": "Please enter the equipment number",
+    "equipmentNoLabel": "Machine No",
+    "equipmentNoPlaceholder": "Please enter the Machine number",
     "proportionOfPlatformDistributionLabel": "Proportion of platform distribution",
     "proportionOfPlatformDistributionPlaceholder": "Please enter the distribution proportion of the platform",
     "merchantDistributionProportionLabel": "Merchant distribution proportion",
@@ -336,7 +337,7 @@
     "sunday": "Sun",
     "deletionSucceeded": "Deletion succeeded",
     "commonOperations": "Remote operation",
-    "equipmentNo": "Equipment No",
+    "equipmentNo": "Machine No",
     "restart": "Reset machine",
     "restartFurnaceHead": "Restart furnace head",
     "restartFurnaceHeadTips": "Are you sure you want to restart the furnace head?",
@@ -358,7 +359,7 @@
     "openRemindOut": "Are you sure you want to switch the outer door?",
     "openRemindIn": "Are you sure you want to switch the Inner door?",
     "modulation": "Modulation",
-    "equipmentRecharge": "Equipment recharge",
+    "equipmentRecharge": "Machine recharge",
     "parameterSetting": "Parameter setting",
     "operationConfirmation": "Operation confirmation",
     "pleaseConfirmAgainWhetherToOperate": "Please confirm again whether to operate",
@@ -378,23 +379,23 @@
     "sysOffSuccess": "System offline successfully",
     "remoteDoorOpeningSucceeded": "Remote door opening succeeded",
     "enterAnyInformationToSearch": "Enter any information to search",
-    "equipmentCodeLabel": "Equipment code",
+    "equipmentCodeLabel": "Machine code",
     "equipmentCodePlaceholder": "Please enter the equipment code",
-    "equipmentNameLabel": "Equipment name",
+    "equipmentNameLabel": "Machine name",
     "equipmentNamePlaceholder": "Please enter the Machine name",
     "merchantNameLabel": "Merchant name",
     "merchantNamePlaceholder": "Please enter the merchant name",
-    "equipmentTypeLabel": "Equipment type",
+    "equipmentTypeLabel": "Machine type",
     "equipmentTypePlaceholder": "Please select a Machine type",
     "companyTypeLabel": "Company type",
     "companyTypePlaceholder": "Please select a companytype",
     "deviceGroupPlaceholder": "Please select device group",
-    "equipmentModelLabel": "Equipment model",
+    "equipmentModelLabel": "Machine model",
     "equipmentModelPlaceholder": "Please select a Machine model",
     "powerOnStatus": "Power on status",
     "pleaseSelectThePowerOnStatus": "Please select the power on status",
-    "deviceGrouping": "Equipment grouping",
-    "equipmentStatus": "Equipment status",
+    "deviceGrouping": "Machine grouping",
+    "equipmentStatus": "Machine status",
     "pleaseSelectTheDeviceStatus": "Please select the Machine status",
     "plzSelectDeviceGroup": "Please select device group",
     "emptyingConditions": "Clear condition",
@@ -410,14 +411,14 @@
     "deactivate": "Deactivate",
     "deviceInformation": "Machine Information",
     "essentialInformation": "Basic Information",
-    "equipmentCode": "Equipment Code",
-    "equipmentRemarksLabel": "Equipment Remarks",
+    "equipmentCode": "Machine Code",
+    "equipmentRemarksLabel": "Machine Remarks",
     "equipmentRemarksPlaceholder": "Please enter Machine notes",
     "affiliatedMerchant": "Business Owner",
     "affiliatedArea": "Affiliated Area",
     "machineType": "Machine Type",
     "expirationTime": "Expiration Time",
-    "equipmentLabel": "Equipment Label",
+    "equipmentLabel": "Machine Label",
     "edit": "edit",
     "nameOfOperatorLabel": "Operator Name",
     "nameOfOperatorPlaceholder": "Please enter the name of the operator",
@@ -448,7 +449,7 @@
     "dataOverview": "Data Overview",
     "search": "search",
     "totalNumberOfRuns": "Total number of runs",
-    "totalNumberOfEquipment": "Total number of equipment",
+    "totalNumberOfEquipment": "Total number of Machine",
     "affiliatedMerchants": "Business Owner",
     "sleepState": "Sleep State",
     "sleeping": "Sleeping zzZ",
@@ -509,7 +510,7 @@
     "modifyPrice": "Modify Price",
     "modifyPricePage": {
       "title": "Commodity price adjustment",
-      "equipmentName": "Equipment name",
+      "equipmentName": "Machine name",
       "total": "Total: ",
       "goods": " goods",
       "batchModify": "Batch modification",
@@ -532,7 +533,7 @@
     "deleteDevice": "Delete Machine",
     "viewLogs": "View logs",
     "noPosition": "No positioning",
-    "equipLocation": "Equipment location",
+    "equipLocation": "Machine location",
     "position": "Position",
     "viewPositioning": "View positioning",
     "view": "view",
@@ -570,12 +571,12 @@
     },
     "showGoodsPage": {
       "title": "Goods display setting",
-      "equipmentName": "Equipment name"
+      "equipmentName": "Machine name"
     },
     "devicePasswordPage": {
       "title": "Changing Machine password",
-      "equipmentName": "Equipment name",
-      "deivcePwd": "Equipment password",
+      "equipmentName": "Machine name",
+      "deivcePwd": "Machine password",
       "adminPassword": "Administrator password",
       "guestPassword": "Secondary administrator password",
       "checkDeivcePwd": "Confirm password",
@@ -655,8 +656,8 @@
     "distributionSettings": "Distribution Settings",
     "total": "Total",
     "leftTitle": "Distribution settings",
-    "rightAdd": "Add equipment distributor",
-    "equipName": "Equipment name",
+    "rightAdd": "Add Machine distributor",
+    "equipName": "Machine name",
     "partners": "Partners",
     "distProp": "Distribution proportion",
     "applTime": "Application time",
@@ -665,9 +666,9 @@
     "addDist": {
       "title": "Add Distributor",
       "editTitle": "Edit Distributor",
-      "clientId": "Equipment code",
+      "clientId": "Machine code",
       "autoBrought": "Automatically brought out",
-      "clientIdPlace": "Please select the equipment code",
+      "clientIdPlace": "Please select the Machine code",
       "myDistProport": "My distribution proportion",
       "distInof": "Distribution Information",
       "platDistRange": "The distribution proportion range of the platform is 1-100",
@@ -944,7 +945,7 @@
     "orderNoPlaceholder": "Please enter the order number",
     "orderSerialNumberLabel": "Order serial number",
     "orderSerialNumberPlaceholder": "Please enter the order serial number",
-    "equipmentNoPlaceholder": "Please enter the equipment number",
+    "equipmentNoPlaceholder": "Please enter the Machine number",
     "orderDate": "Order Date",
     "startTime": "start time",
     "to": "to",
@@ -966,7 +967,7 @@
     "dataOverview": "Data overview",
     "groupType": "Group Type",
     "merchant": "Merchant",
-    "equipment": "equipment",
+    "equipment": "Machine",
     "orderDetails": "order details",
     "clickFilter": "Click Filter",
     "exportToExcel": "Export to Excel",
@@ -1137,12 +1138,12 @@
     }
   },
   "taskMessage": {
-    "equipmentInitializationApproval": "Equipment initialization approval",
+    "equipmentInitializationApproval": "Machine initialization approval",
     "total": "Total ",
     "recordsInTotal": " Records",
     "search": "search",
     "affiliatedMerchants": "Affiliated merchants",
-    "equipmentNo": "Equipment No",
+    "equipmentNo": "Machine No",
     "managementSystemID": "Management system ID",
     "state": "state",
     "applicationTime": "Application time",
@@ -1157,7 +1158,7 @@
     "contactName": "Contact Name",
     "contactPhoneNumber": "Contact phone number",
     "distributionApplicationApproval": "Distribution application approval",
-    "equipmentName": "Equipment name",
+    "equipmentName": "Machine name",
     "owner": "owner",
     "platform": "platform",
     "machineOwner": "Machine owner",
@@ -1175,8 +1176,8 @@
     "equipmentInit": {
       "searchPop": {
         "title": "Please enter any of the following criteria to query",
-        "equipmentNo": "Equipment code",
-        "equipmentNoPlace": "Please enter the equipment code",
+        "equipmentNo": "Machine code",
+        "equipmentNoPlace": "Please enter the Machine code",
         "managementSystemID": "Management system ID",
         "managementSystemIDPlace": "Please enter the Management system ID",
         "merchantName": "Merchant name",

+ 1 - 0
src/assets/language/ja.json

@@ -297,6 +297,7 @@
         "to": "に",
         "attention": "(注意:桁数が正しくない場合、更新によりマシンに異常が発生する可能性があります)",
         "submitUpdates": "更新を提出",
+        "nameLength":"装置名は15文字以内です",
         "modificationSucceeded": "変更に成功",
         "existsFailed": "デバイス名はすでに存在します",
         "editFailed": "変更に失敗",

+ 2 - 1
src/assets/language/zh.json

@@ -296,6 +296,7 @@
     "isUpdate": "是否更新",
     "to": "为",
     "attention": "(注意:位数不正确,更新可能会造成机器异常)",
+    "nameLength":"设备名称不超过15个字",
     "submitUpdates": "提交更新",
     "modificationSucceeded": "修改成功",
     "existsFailed": "设备名称已存在",
@@ -455,7 +456,7 @@
     "SuspendBusiness": "暂停营业",
     "sleepDescPlace": "请输入睡眠描述",
     "lastRefreshTime": "最近刷新时间",
-    "machineUniqueCode": "机器唯一编码",
+    "machineUniqueCode": "设备编码",
     "furnaceHeadTemperature": "炉头温度",
     "temperatureInCabinet": "柜内温度",
     "humidityInCabinet": "柜内湿度",

+ 24 - 7
src/styles/device/index.less

@@ -158,11 +158,11 @@
               border-radius: 2px;
               width: 4px;
               height: 12px;
-              margin-top: 4px;
+              // margin-top: 4px;
             }
 
             .txtBox {
-              width: 4.5rem;
+              width: 7rem;
               // overflow: auto;
 
               .txt1 {
@@ -173,7 +173,7 @@
                 text-align: left;
                 line-height: 0.7rem;
                 display: block;
-                margin: 3px 0 0 6px;
+                margin: 0 0 0 6px;
                 // overflow: hidden;
                 white-space: normal;
                 text-overflow: ellipsis;
@@ -181,10 +181,10 @@
             }
 
             .layer2 {
-              height: 0.5rem;
+              height: 0.6rem;
               background: url("../../assets/device/powerOff.png") 100% no-repeat;
               background-size: 100%;
-              width: 0.5rem;
+              width: 0.6rem;
               // margin-left: 30px;
 
               &.layerLeft {
@@ -197,10 +197,27 @@
               }
             }
 
+            .flash-icon {
+              animation: blink-animation 0.5s infinite; // 定义闪烁动画,1s表示1秒,infinite表示无限循环
+            }
+
+            @keyframes blink-animation {
+              0% {
+                opacity: 1; // 初始状态完全显示
+              }
+              50% {
+                opacity: 0; // 中间状态隐藏
+              }
+              100% {
+                opacity: 1; // 结束状态完全显示
+              }
+            }
+
             .box4 {
-              width: 1rem;
-              height: 0.8rem;
+              height: 0.7rem;
               background: url("../../assets/device/alarm.png") 100% no-repeat;
+              background-size: 100%;
+              width: 0.7rem;
             }
           }
 

+ 11 - 12
src/styles/taskMessage/index.less

@@ -76,9 +76,9 @@
     }
 
     .searchRow {
-      width: 90%;
-      height: 48px;
-      margin: 0 auto;
+      // width: 90%;
+      // height: 48px;
+      padding: 0.5rem 0.5rem;
       background: rgba(255, 255, 255, 1) url("../../assets/home/line.png") bottom center no-repeat;
       background-size: 100%;
       align-items: center;
@@ -88,8 +88,8 @@
         height: 16px;
 
         .outer4 {
-          width: 20px;
-          height: 26px;
+          width: 0.5rem;
+          height: 0.5rem;
           background: url("../../assets/alarmHistory/icon.png") top center no-repeat;
           background-size: 100%;
 
@@ -110,11 +110,11 @@
         }
 
         .txt2 {
-          width: 65px;
-          height: 14px;
+          // width: 65px;
+          height: 0.4rem;
           overflow-wrap: break-word;
           color: rgba(64, 77, 116, 1);
-          font-size: 15px;
+          font-size: 0.4rem;
           font-family: PingFangSC-Semibold;
           text-align: left;
           white-space: nowrap;
@@ -123,7 +123,7 @@
           font-weight: bold;
 
           .discountNumber {
-            font-size: 18px;
+            font-size: 0.5rem;
             color: red;
           }
         }
@@ -131,15 +131,14 @@
 
       .label3 {
         color: #4d6add;
-        width: 100px;
       }
 
       .main5 {
         width: auto;
 
         .label2 {
-          width: 20px;
-          height: 20px;
+          width: 0.5rem;
+          height: 0.5rem;
           margin-right: 5px;
           cursor: pointer;
         }

+ 4 - 0
src/views/device/deviceSet.vue

@@ -458,6 +458,10 @@ export default {
         };
       })[0];
       console.log(params);
+      if (params.name.length > 15) {
+        showToast(t("device.nameLength"));
+        return;
+      }
       const { data } = await updateDevice(params);
       if (data.code === "00000") {
         isUpdate.value = true;

+ 105 - 90
src/views/device/index.vue

@@ -16,7 +16,8 @@
             </div>
             <div class="flex-col">
               <div class="main5 flex-row justify-between">
-                <van-popover v-model:show="showPopover" placement="left-start" theme="dark" :actions="actions" @select="selectLabel">
+                <van-popover v-model:show="showPopover" placement="left-start" theme="dark" :actions="actions"
+                  @select="selectLabel">
                   <template #reference>
                     <van-icon name="bars" class="fixed-icon o-pr-15" style="font-size: 0.55rem;" color="#4d6add" />
                   </template>
@@ -36,16 +37,16 @@
                   <div class="group1 flex-col justify-between align-center">
                     <span class="word4">{{ equipStatus.machineUseNum }}</span>
                     <span class="info1">{{
-                      $t("device.totalNumberOfRuns")
-                    }}</span>
+        $t("device.totalNumberOfRuns")
+      }}</span>
                   </div>
                 </div>
                 <div @click="eqeStatusClk('')" class="TextGroup3 flex-col">
                   <div class="group1 flex-col justify-between align-center">
                     <span class="word4">{{ equipStatus.machineTotalNum }}</span>
                     <span class="info1">{{
-                      $t("device.totalNumberOfEquipment")
-                    }}</span>
+        $t("device.totalNumberOfEquipment")
+      }}</span>
                   </div>
                 </div>
               </div>
@@ -69,38 +70,39 @@
                       <span class="txt1">{{ item.name == null ? item.clientId.slice(-6) : item.name }}</span>
                     </div>
                   </div>
-                  <div class="l-flex-RC">
-                    <div v-if="item.hasTodayAlarm" class="l-flex-between o-pl-5">
-                      <div class="box4 flex-col "></div>
+                  <!-- <div class="l-flex-RC"> -->
+                    <!-- <div v-if="item.hasTodayAlarm" class="l-flex-between o-pl-5">
+                      <div class="box4 flex-col"></div>
                       <span class="o-pl-2" style="color: #fe5d55">{{ $t("device.alarmClock") }}</span>
-                    </div>
-                    <div class="layer2 flex-col" :class="{
-                      deviceOn: item.eqeStatus === 1,
-                      layerLeft: item.hasTodayAlarm,
-                    }"></div>
-                  </div>
+                    </div> -->
+                    <div v-if="item.hasTodayAlarm" :class="{ 'flash-icon': showAlert }" class="box4 o-mr-5"></div>
+                    <div v-if="!item.hasTodayAlarm" class="layer2 o-mr-5" :class="{
+        deviceOn: item.eqeStatus === 1,
+        layerLeft: item.hasTodayAlarm,
+      }"></div>
+                  <!-- </div> -->
                 </div>
                 <!-- 所属商家 -->
                 <span class="txt1 o-mt-10">{{ $t("device.affiliatedMerchants") }}:{{
-                  item.adminUserName
-                }}</span>
+        item.adminUserName
+      }}</span>
                 <!-- 机器编码 -->
                 <span class="txt1 o-mt-10 kBordBott">{{ $t("device.machineUniqueCode") }}:{{
-                  item.clientId
-                }}</span>
+        item.clientId
+      }}</span>
                 <!-- 锁机状态 -->
                 <span v-if="user.type < 1" class="txt1 o-mt-10 kBordBott">{{ $t("device.lockCondition") }}:{{
-                  item.isBlocked ? $t("device.lockState") : $t("device.unLockState")
-                }}</span>
+        item.isBlocked ? $t("device.lockState") : $t("device.unLockState")
+      }}</span>
                 <img v-if="item.checkType" class="pic1" referrerpolicy="no-referrer" src="../../assets/home/line.png" />
                 <div class="contentBottomCon" v-if="item.checkType">
                   <!-- 睡眠状态 -->
                   <div class="contentWord kBordBott">
                     <span class="">{{ $t("device.sleepState") }}:{{
-                      item.isSleep
-                      ? $t("device.sleeping")
-                      : $t("device.notSleeping")
-                    }}</span>
+        item.isSleep
+          ? $t("device.sleeping")
+          : $t("device.notSleeping")
+      }}</span>
                     <!-- <van-switch v-model="checked" disabled /> -->
 
                   </div>
@@ -127,47 +129,51 @@
                     </span>
                   </div> -->
                   <div v-if="item.isSleep" class="contentWord kBordBott">
-                      <span class="">{{ $t("device.sleepDesc") }}:</span>
-                      <!-- <div v-if="!sleepDescBoxShow" class="container l-flex-RC"> -->
-                        <van-field colon center class="word2" v-model="item.sleepDesc" v-if="!sleepDescBoxShow"
-                          :placeholder="$t('device.sleepDescPlace')" label-width="auto">
-                          <template #button class="button_1">
-                            <van-button type="primary" @click="sleepDescChg(item.sleepDesc, item.id)">{{
-                                  $t("device.confirm") }}
-                            </van-button>
-                            <van-button type="primary" @click="editSleepDesc()">{{ $t("device.cancel")
-                            }}</van-button>
-                          </template>
-                        </van-field>
-                        <!-- <div class="l-flex-RC">
+                    <span class="">{{ $t("device.sleepDesc") }}:</span>
+                    <!-- <div v-if="!sleepDescBoxShow" class="container l-flex-RC"> -->
+                    <van-field colon center class="word2" v-model="item.sleepDesc" v-if="!sleepDescBoxShow"
+                      :placeholder="$t('device.sleepDescPlace')" label-width="auto">
+                      <template #button class="button_1">
+                        <van-button type="primary" @click="sleepDescChg(item.sleepDesc, item.id)">{{
+        $t("device.confirm") }}
+                        </van-button>
+                        <van-button type="primary" @click="editSleepDesc()">{{ $t("device.cancel")
+                          }}</van-button>
+                      </template>
+                    </van-field>
+                    <!-- <div class="l-flex-RC">
                         </div> -->
-                        <!-- </span> -->
-                      <!-- </div> -->
-                      <!-- <div v-else class="container l-flex-RC"> -->
-                        <span class="word10 l-flex-RC" v-if="sleepDescBoxShow">{{ item.sleepDesc == null ? $t("device.SuspendBusiness") :
-                          item.sleepDesc }}
-                        <van-icon name="edit" size="18" class="editIcon o-pl-5" @click="editSleepDesc()" />
-                          </span>
-                      <!-- </div> -->
+                    <!-- </span> -->
+                    <!-- </div> -->
+                    <!-- <div v-else class="container l-flex-RC"> -->
+                    <span class="word10 l-flex-RC" v-if="sleepDescBoxShow">{{ item.sleepDesc == null ?
+        $t("device.SuspendBusiness") :
+        item.sleepDesc }}
+                      <van-icon name="edit" size="18" class="editIcon o-pl-5" @click="editSleepDesc()" />
+                    </span>
+                    <!-- </div> -->
                   </div>
-                  <span v-if="item.machineType == null || item.machineType == '0'" class="contentWord kBordBott l-flex-RC">
-                    <span>{{$t("device.clickRestart")}}:</span>
-                    <van-button @click="restartHead(item.id)" type="primary">{{$t("device.restartHead")}}</van-button>
+                  <span v-if="item.machineType == null || item.machineType == '0'"
+                    class="contentWord kBordBott l-flex-RC">
+                    <span>{{ $t("device.clickRestart") }}:</span>
+                    <van-button @click="restartHead(item.id)" type="primary">{{ $t("device.restartHead") }}</van-button>
                   </span>
                   <!-- 炉头状态 -->
                   <div class="contentWord kBordBott" v-if="item.machineType == null || item.machineType == '0'">
                     <!-- <div> -->
-                      <!-- <span class="word3 o-pr-5" v-if="item.machineType == '0' || item.machineType == null">{{
+                    <!-- <span class="word3 o-pr-5" v-if="item.machineType == '0' || item.machineType == null">{{
                         $t("device.furnHeadStatus") }}: </span>
                       <span class="word3 o-pr-5" v-else>{{ $t("device.deviceStatus") }}: </span> -->
-                      <span>{{ (item.machineType == '0' || item.machineType == null) ? $t("device.furnHeadStatus") : $t("device.deviceStatus")}}:
-                        {{ item.eqeStatus === 1 ? $t("device.opened") : $t("device.closed") }}</span>
-                      <!-- <span>{{ item.eqeStatus === 1 ? $t("device.opened") : $t("device.closed") }} -->
-                      <!-- </span> -->
+                    <span>{{ (item.machineType == '0' || item.machineType == null) ? $t("device.furnHeadStatus") :
+        $t("device.deviceStatus") }}:
+                      {{ item.eqeStatus === 1 ? $t("device.opened") : $t("device.closed") }}</span>
+                    <!-- <span>{{ item.eqeStatus === 1 ? $t("device.opened") : $t("device.closed") }} -->
+                    <!-- </span> -->
                     <!-- </div> -->
                     <div class="o-ml-10">
-                      <van-button @click="openCloseHead(item.id, 1)" type="primary">{{$t("device.open")}}</van-button>
-                      <van-button @click="openCloseHead(item.id, 0)" type="primary">{{$t("device.close")}}</van-button>
+                      <van-button @click="openCloseHead(item.id, 1)" type="primary">{{ $t("device.open") }}</van-button>
+                      <van-button @click="openCloseHead(item.id, 0)" type="primary">{{ $t("device.close")
+                        }}</van-button>
                     </div>
                   </div>
                   <!-- <span class="txt5 o-ptb-10 kBordBott l-flex-RC"><span>远程开门:</span>
@@ -188,32 +194,32 @@
                   </div> -->
 
                   <!-- 定位: -->
-                    <span v-if="item.latitude" class="contentWord kBordBott l-flex-RC">
-                      <span>{{ $t("device.position") }}:</span>
-                      <a class="clickable-link" @click="viewPosiClk(item)">{{ item.fullName }}</a>
-                    </span>
+                  <span v-if="item.latitude" class="contentWord kBordBott l-flex-RC">
+                    <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>
+        item.furnaceTm
+      }}{{ $t("device.degree") }}</van-col>
                     <van-col class="word5" style="">{{ $t("device.temperatureInCabinet") }}:{{
-                      item.cabinetTm
-                    }}{{ $t("device.degree") }}</van-col>
+        item.cabinetTm
+      }}{{ $t("device.degree") }}</van-col>
                     <van-col class="word5" style="">{{ $t("device.humidityInCabinet") }}:{{
-                      item.cabinetHd
-                    }}{{ $t("device.humidity") }}</van-col>
+        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.cabinetHd
-                    }}{{ $t("device.degree") }}</van-col>
+        item.cabinetTm
+      }}{{ $t("device.degree") }}</van-col>
                     <van-col class="word5" style="">{{ $t("device.stirringTemperature") }}:{{
-                      item.cabinetTm
-                    }}{{ $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-col>
                   </van-row>
                   <template v-if="item.isMaterialUse === '1' && (item.machineType == '0' || item.machineType == null)">
                     <van-row justify="space-between" class="sugarTxt kBordBott">
@@ -232,8 +238,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>
@@ -246,7 +252,8 @@
                     <!-- 一键补料 -->
                     <span class="contentWord kBordBott">
                       <span class="l-flex-RC">{{ $t("device.oneKeyFeed") }}:
-                        <van-button class="replenishment" @click="replenishmentClk(item)" type="primary">{{ $t("device.replenishment") }}
+                        <van-button class="replenishment" @click="replenishmentClk(item)" type="primary">{{
+        $t("device.replenishment") }}
                         </van-button>
                       </span>
                       <!-- <a class="replenishment" @click="replenishmentClk(item)">{{ $t("device.replenishment")
@@ -255,36 +262,37 @@
                   </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-RC">
+                  <div class="contentWord kBordBott l-flex-RC">
                     <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" type="primary" color="#07c160"
-                        :text="$t('device.eliminateAlarm')" @click="clearAlarm(item.alarmList[0])"></van-button>
+                    <van-button v-if="item.alarmList && item.alarmList[0] && item.alarmList[0].alarmContent"
+                      type="primary" color="#07c160" :text="$t('device.eliminateAlarm')"
+                      @click="clearAlarm(item.alarmList[0])"></van-button>
                     <!-- </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>
+                        }}</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>
@@ -294,7 +302,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>
@@ -405,6 +413,7 @@ export default {
       labelId: "", // 分组标签
     });
     // 初始化页面获取列表
+    const showAlert = ref(false);
     onMounted(() => {
       sleepDescBoxShow.value = true;
       init();
@@ -412,6 +421,9 @@ export default {
       // window.addEventListener('scroll', handleScroll);
       // 加载样式
       styleUrl('device');
+      setInterval(() => {
+        showAlert.value = !showAlert.value;
+      }, 500); // 1000毫秒即1秒
     });
     // 初始化
     const init = () => {
@@ -633,7 +645,7 @@ export default {
       { text: t("device.group"), value: '0' },
       { text: t("device.addGroup"), value: '1' },
     ];
-    const selectLabel = (action) =>  {
+    const selectLabel = (action) => {
       // showToast(action.value);
       if (action.value == '0') {
         router.push('/labelMan');
@@ -648,7 +660,7 @@ export default {
       showConfirmDialog({
         title: t('user.tips'),
         message: t('device.restartFurnaceHeadTips'),
-      }).then(async() => {
+      }).then(async () => {
         const { data } = await setFurnace({
           equipmentId: id,
           eqeStatus: 1,
@@ -672,13 +684,13 @@ export default {
       showConfirmDialog({
         title: t('user.tips'),
         message: (status == 1 ? t("device.openFurnaceHeadTips") : t("device.closeFurnaceHeadTips")),
-      }).then(async() => {
+      }).then(async () => {
         const { data } = await setFurnace({
           equipmentId: id,
           eqeStatus: status,
         });
         if (data.code) {
-          showSuccessToast((status == 1 ? t("device.open") : t("device.close"))+t("device.success"));
+          showSuccessToast((status == 1 ? t("device.open") : t("device.close")) + t("device.success"));
           setTimeout(() => {
             router.go(0);
           }, 1000);
@@ -689,7 +701,10 @@ export default {
         return;
       })
     };
+
+
     return {
+      showAlert,
       ...toRefs(searchParams),
       list,
       loading,

+ 1 - 1
src/views/taskMessage/proportion/index.vue

@@ -14,7 +14,7 @@
             </div>
           </div>
           <div class="l-flex-RC">
-            <div @click="reviewedClk" class="label3 o-mr-30">{{
+            <div @click="reviewedClk" class="label3 o-mr-10">{{
               $t('taskMessage.toViewAppro')
             }}</div>
             <div @click="noticeClk" class="main5 l-flex-RC">