文件资料库调整

src/router/modules/remaining.ts

@@ -657,7 +657,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
     },
     children: [
       {
-        path: 'maintain/add',
+        path: 'maintain/add/:id?(\\d+)',
         component: () => import('@/views/pms/maintain/IotMaintain.vue'),
         name: 'MaintainAdd',
         meta: {

src/views/pms/device/DeviceInfo.vue

@@ -1,6 +1,7 @@
 <template>
   <ContentWrap>
     <div style="display: flex; flex-direction: row; height: 12em; margin-top: 2px">
+
       <div style="flex: 1; height: 12em; margin-left: 20px">
         <el-image
           :key="index"

src/views/pms/inspect/item/IotInspectItemForm.vue

@@ -95,6 +95,7 @@ const formData = ref({
   deviceClassifyName: undefined,
   deviceId: undefined,
   deviceName: undefined,
+  deviceCode: undefined,
   urls: undefined,
 })
 const formRules = reactive({
@@ -108,6 +109,7 @@ const formRef = ref() // 表单 Ref
 const deviceChoose = (row) => {
   formData.value.deviceId = row.id
   formData.value.deviceName = row.deviceName
+  formData.value.deviceCode = row.deviceCode
   formData.value.deptId = row.deptId;
   deviceLabel.value = row.deviceName
 }

src/views/pms/inspect/item/index.vue

@@ -74,6 +74,7 @@
         </template>
       </el-table-column>
       <el-table-column :label="t('monitor.category')" align="center" prop="deviceClassifyName" />
+      <el-table-column :label="t('iotDevice.code')" align="center" prop="deviceCode" />
       <el-table-column :label="t('monitor.deviceName')" align="center" prop="deviceName" />
       <el-table-column :label="t('inspect.InspectionItems')" align="center" prop="item" />
       <el-table-column :label="t('inspect.InspectionStandards')" align="center" prop="standard" />

src/views/pms/inspect/plan/InspectRouteList.vue

@@ -59,6 +59,7 @@
         <el-table-column :label="t('iotDevice.code')" align="center" prop="deviceCode" />
         <el-table-column :label="t('iotDevice.name')" align="center" prop="deviceName" />
         <el-table-column :label="t('route.RouteName')" align="center" prop="routeName" />
+        <el-table-column :label="t('iotDevice.dept')" align="center" prop="deptName" />
         <el-table-column
           :label="t('common.createTime')"
           align="center"

src/views/pms/inspect/plan/IotInspectPlan.vue

@@ -34,10 +34,17 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="t('route.cycle')" prop="planCycle">
-                <el-input
-                  type="number"
+<!--                <el-input-->
+<!--                  type="number"-->
+<!--                  v-model="formData.planCycle"-->
+<!--                  :disabled="formType === 'update'"-->
+<!--                />-->
+                <el-input-number
+                  style="width: 100%"
                   v-model="formData.planCycle"
-                  :disabled="formType === 'update'"
+                  :precision="0"
+                  :min="1"
+                  :max="99999"
                 />
               </el-form-item>
             </el-col>
@@ -246,6 +253,7 @@ const submitForm = async () => {
     formData.value.deviceIds = JSON.stringify(list.value)
     const data = formData.value as unknown as IotInspectPlanVO
     if (formType.value === 'create') {
+      //校验是否是已有计划
       formData.value.deptId = user.user.deptId
       await IotInspectPlanApi.createIotInspectPlan(data).then((res) => {
       })

src/views/pms/maintain/IotMaintain.vue

@@ -80,6 +80,7 @@
             <el-col :span="8">
               <el-form-item :label="t('iotMaintain.failureTime')" prop="failureTime" :rules="formData.type==='out'?failureTimeRule:[]" >
                 <el-date-picker
+                  @change="failureTimeBlur"
                   :disabled="formData.maintainType==='故障上报'"
                   style="width: 150%"
                   v-model="formData.failureTime"
@@ -441,6 +442,17 @@ const endTimeBlur = () => {
     formData.value.maintainEndTime = undefined
   }
 }
+
+const failureTimeBlur = () => {
+  if (formData.value.maintainStartTime < formData.value.failureTime) {
+    message.error('维修开始时间不得早于故障时间')
+    formData.value.maintainStartTime = undefined
+  }
+  if (formData.value.maintainEndTime < formData.value.failureTime) {
+    message.error('维修结束时间不得早于故障时间')
+    formData.value.maintainEndTime = undefined
+  }
+}
 const close = () => {
   delView(unref(currentRoute))
   push({ name: 'IotMaintain', params: {} })

src/views/pms/maintain/index.vue

@@ -280,7 +280,7 @@ const moreQuery = (show) => {
 const openForm = (type: string, id?: number) => {
   //修改
   if (typeof id === 'number') {
-    push({ name: 'MaintainEdit', params: {id } })
+    push({ name: 'MaintainAdd', params: {id } })
     return
   }
   // 新增