lipenghui 3 mesi fa
parent
commit
88f95f530e

+ 30 - 9
src/views/pms/device/monitor/TdDeviceInfo.vue

@@ -1,26 +1,44 @@
 <template>
   <ContentWrap v-loading="formLoading">
     <ContentWrap>
-      <el-form>
+      <el-form style="height:39px;margin-left: 15px;">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="资产编码:" prop="deviceCode"
-              >{{ formData.deviceCode }}
+            <el-form-item prop="deviceCode">
+              <template #label>
+                <span class="custom-label">资产编码:</span>
+              </template>
+              <span class="custom-label">{{ formData.deviceCode }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="设备类别:" prop="deviceName"
-              >{{ formData.deviceName }}
+            <el-form-item prop="deviceName">
+              <template #label>
+                <span class="custom-label">设备类别:</span>
+              </template>
+              <span class="custom-label">{{ formData.deviceName }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="是否在线:" prop="ifInline"
-              >{{ getDictLabel(DICT_TYPE.IOT_DEVICE_STATUS, formData.ifInline) }}
+            <el-form-item  prop="ifInline">
+              <template #label>
+                <span class="custom-label">是否在线:</span>
+              </template>
+<!--              <span class="custom-label">{{ getDictLabel(DICT_TYPE.IOT_DEVICE_STATUS, formData.ifInline) }}</span>-->
+<!--              <span class="custom-label">-->
+<!--                {{ getDictLabel(DICT_TYPE.IOT_DEVICE_STATUS, formData.ifInline) }}-->
+                <template #default>
+                  <dict-tag :type="DICT_TYPE.IOT_DEVICE_STATUS" :value="formData.ifInline" />
+                </template>
+<!--              </span>-->
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="最后在线时间:" prop="lastInlineTime"
-              >{{ formData.lastInlineTime }}
+            <el-form-item prop="lastInlineTime">
+              <template #label>
+                <span class="custom-label">最后数据时间:</span>
+              </template>
+              <span class="custom-label">{{ formData.lastInlineTime }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -276,4 +294,7 @@ input[type="datetime-local"]:focus {
   height: 500px;
   margin-top: 20px;
 }
+.custom-label{
+  font-size: 15px;
+}
 </style>

+ 2 - 2
src/views/pms/information/IotInformationDbForm.vue

@@ -26,8 +26,8 @@
         </el-form-item>
           </el-col>
         <el-col :span="12">
-        <el-form-item label="故障模块" prop="failureSystem">
-          <el-input v-model="formData.failureSystem" placeholder="请输入故障模块" />
+        <el-form-item label="故障系统" prop="failureSystem">
+          <el-input v-model="formData.failureSystem" placeholder="请输入故障系统" />
         </el-form-item>
           </el-col>
         <el-col :span="12">

+ 3 - 3
src/views/pms/information/index.vue

@@ -18,10 +18,10 @@
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
-      <el-form-item label="故障模块" prop="failureSystem">
+      <el-form-item label="故障系统" prop="failureSystem">
         <el-input
           v-model="queryParams.failureSystem"
-          placeholder="请输入故障模块"
+          placeholder="请输入故障系统"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
@@ -72,7 +72,7 @@
       </el-table-column>
       <el-table-column label="设备分类" align="center" prop="deviceType" />
       <el-table-column label="故障影响" align="center" prop="failureInfluence" />
-      <el-table-column label="故障模块" align="center" prop="failureSystem" />
+      <el-table-column label="故障系统" align="center" prop="failureSystem" />
       <el-table-column label="描述" align="center" prop="description" />
       <el-table-column label="解决办法" align="center" prop="solutions" />
       <el-table-column label="备注" align="center" prop="remark" />

+ 2 - 1
src/views/pms/inspect/item/IotInspectItemForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 45vw;height: 40vh" >
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 50vw;height: 40vh" >
     <el-form
       ref="formRef"
       :model="formData"
@@ -123,6 +123,7 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }else {
+    formData.value.sort = 0
     deviceLabel.value = ''
   }
 

+ 4 - 0
src/views/pms/inspect/route/InspectItemList.vue

@@ -70,6 +70,7 @@
         />
         <el-table-column label="巡检项" align="center" prop="item" />
         <el-table-column label="巡检标准" align="center" prop="standard" />
+        <el-table-column label="排序" align="center" prop="sort" />
         <el-table-column
           label="创建时间"
           align="center"
@@ -165,6 +166,9 @@ const getList = async () => {
 
     const data = await IotInspectItemApi.getIotInspectItemPage(queryParams)
     list.value = data.list
+    list.value = list.value.sort((a, b) => {
+      return a.sort-b.sort
+    })
     total.value = data.total
   } finally {
     loading.value = false

+ 7 - 6
src/views/pms/inspect/route/IotInspectRoute.vue

@@ -351,21 +351,22 @@ const handleDelete = async (id: number) => {
   cursor: move;
   display: flex;
   flex-direction: column;
-  gap: 12px;
+  gap: 9px;
   //max-height: 80vh;
   overflow-y: auto;
-  padding: 8px;
+  padding: 7px;
 }
 
 .sortable-item {
   display: flex;
   align-items: center;
-  padding: 16px;
+  padding: 8px;
   background: #fff;
   border: 1px solid #ebeef5;
   border-radius: 8px;
   transition: transform 0.3s, box-shadow 0.3s;
   user-select: none;
+  height: 50%;
 }
 
 .sortable-item:hover {
@@ -373,15 +374,15 @@ const handleDelete = async (id: number) => {
 }
 
 .order-number {
-  width: 32px;
-  height: 32px;
+  width: 24px;
+  height: 24px;
   display: flex;
   align-items: center;
   justify-content: center;
   background: #409eff;
   color: white;
   border-radius: 50%;
-  margin-right: 12px;
+  margin-right: 7px;
   font-weight: bold;
 }