소스 검색

页面调整

lipenghui 3 달 전
부모
커밋
dd61b5d52a

+ 15 - 0
src/views/pms/failure/DeviceList.vue

@@ -17,6 +17,15 @@
             class="!w-240px"
           />
         </el-form-item>
+        <el-form-item label="资产编码" prop="deviceCode">
+          <el-input
+            v-model="queryParams.deviceCode"
+            placeholder="请输入资产编码"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
           <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -87,6 +96,8 @@ const queryParams = reactive({
   status: undefined,
   deptId: undefined,
   assetClass: undefined,
+  deviceName: undefined,
+  deviceCode: undefined,
 })
 
 const selectedRow = ref(null)
@@ -105,7 +116,11 @@ const handleRowClick = (row) => {
 const open = async (classify) => {
   dialogVisible.value = true
   queryParams.assetClass = classify
+  selectedRow.value = ''
   debugger
+  queryParams.deviceName = undefined
+  queryParams.deviceCode = undefined
+  queryParams.pageNo = 1
   await getList()
 }
 defineExpose({ open })

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

@@ -35,12 +35,12 @@
             <el-input v-model="formData.solutions" placeholder="请输入解决办法" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="24">
         <el-form-item label="描述" prop="description">
           <el-input v-model="formData.description" type="textarea" height="150px" />
         </el-form-item>
           </el-col>
-        <el-col :span="12">
+        <el-col :span="24">
         <el-form-item label="备注" prop="remark">
           <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>

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

@@ -110,7 +110,7 @@
   </ContentWrap>
 
   <!-- 表单弹窗:添加/修改 -->
-  <IotInformationDbForm ref="formRef" @success="getList" />
+  <IotInformationDbForm ref="formRef" style="width: 60vw;" @success="getList" />
 </template>
 
 <script setup lang="ts">

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

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

+ 1 - 1
src/views/pms/inspect/order/WriteOrder.vue

@@ -1,6 +1,6 @@
 <template>
     <ContentWrap>
-    <el-tabs v-model="activeTab" type="border-card" tab-position="left" v-loading="loading" style="height: 80vh">
+    <el-tabs v-model="activeTab" type="border-card" tab-position="left" v-loading="loading" style="height: 84vh">
       <el-tab-pane
         style="height: 100%"
         v-for="(tab, tabIndex) in tabs"

+ 1 - 0
src/views/pms/inspect/order/index.vue

@@ -128,6 +128,7 @@
               查看
             </el-button>
             <el-button
+              v-if="scope.row.status==='todo'"
               link
               type="primary"
               @click="openWrite(scope.row.id)"

+ 17 - 3
src/views/pms/inspect/plan/InspectRouteList.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" title="选择设备路线" style="width: 1100px; max-height: 800px">
+  <Dialog v-model="dialogVisible" title="选择设备路线" style="width: 1300px; max-height: 800px">
     <ContentWrap>
       <el-form
         class="-mb-15px"
@@ -14,6 +14,17 @@
             placeholder="请输入设备名称"
             clearable
             @keyup.enter="handleQuery"
+            class="!w-200px"
+          />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createTime">
+          <el-date-picker
+            v-model="queryParams.createTime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            type="daterange"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
             class="!w-240px"
           />
         </el-form-item>
@@ -103,7 +114,9 @@ const queryParams = reactive({
   label: '',
   status: undefined,
   deptId: undefined,
-  assetClass: undefined
+  assetClass: undefined,
+  createTime: undefined,
+  deviceName: undefined,
 })
 
 const handleConfirm = () => {
@@ -173,7 +186,8 @@ const handleRowClick = (row) => {
 const open = async (classify) => {
   dialogVisible.value = true
   queryParams.assetClass = classify
-  debugger
+  queryParams.deviceName = undefined
+  queryParams.createTime = undefined
   await getList()
   selectedRows.value = []
 }

+ 2 - 1
src/views/pms/inspect/plan/RouteInspectItemDrawer.vue

@@ -28,7 +28,8 @@
 
             <!-- 组件内容 -->
             <div class="component-content">
-              巡检项:{{ element.item }} 巡检标准:{{ element.standard }}
+              <span style="font-weight: bold">巡检项:</span><span style="font-size: 14px">{{ element.item }}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+              <span style="font-weight: bold">巡检标准:</span><span style="font-size: 14px">{{element.standard}}</span>
             </div>
           </div>
         </template>

+ 18 - 3
src/views/pms/inspect/route/InspectItemList.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" title="选择巡检项" style="width: 1100px; max-height: 100%">
+  <Dialog v-model="dialogVisible" title="选择巡检项" style="width: 1300px; max-height: 115%">
     <ContentWrap>
       <el-form
         class="-mb-15px"
@@ -14,6 +14,17 @@
             placeholder="请输入巡检项"
             clearable
             @keyup.enter="handleQuery"
+            class="!w-200px"
+          />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createTime">
+          <el-date-picker
+            v-model="queryParams.createTime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            type="daterange"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
             class="!w-240px"
           />
         </el-form-item>
@@ -54,7 +65,7 @@
         <!--        </el-table-column>-->
         <el-table-column
           type="selection"
-          :reserve-selection="false"
+          :reserve-selection="true"
           :selectable="(row) => !row.disabled"
         />
         <el-table-column label="巡检项" align="center" prop="item" />
@@ -95,7 +106,8 @@ const queryParams = reactive({
   item: undefined,
   deptId: undefined,
   deviceClassify: undefined,
-  deviceId: undefined
+  deviceId: undefined,
+  createTime: undefined,
 })
 const toggleAll = () => {
   list.value.forEach((row) => {
@@ -137,6 +149,9 @@ const open = async (classify, id) => {
   } else {
     queryParams.deviceClassify = classify
   }
+  queryParams.createTime = undefined
+  queryParams.item = undefined
+  queryParams.pageNo = 1;
   await getList()
 }
 defineExpose({ open })

+ 2 - 1
src/views/pms/inspect/route/IotInspectRoute.vue

@@ -79,7 +79,8 @@
 
             <!-- 组件内容 -->
             <div class="component-content">
-              巡检项:{{ element.item }}  巡检标准:{{element.standard}}
+              <span style="font-weight: bold">巡检项:</span><span style="font-size: 14px">{{ element.item }}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+              <span style="font-weight: bold">巡检标准:</span><span style="font-size: 14px">{{element.standard}}</span>
             </div>
             <div>
               <el-button type="warning" @click="deleteDraggable(index)">删除</el-button>