Merge remote-tracking branch 'origin/master'

src/views/pms/device/BrandList.vue

@@ -118,6 +118,12 @@ const handleRowClick = (row) => {
 };
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
+  queryParams.pageNo = 1
+  queryParams.label = ''
+  queryParams.status = undefined
+  await getList()
+  // 查询字典（精简)列表
+  dictTypeList.value = await DictTypeApi.getSimpleDictTypeList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const getList = async () => {
@@ -145,12 +151,6 @@ const resetQuery = () => {
   queryFormRef.value.resetFields()
   handleQuery()
 }
-/** 初始化 **/
-onMounted(async () => {
-  await getList()
-  // 查询字典（精简)列表
-  dictTypeList.value = await DictTypeApi.getSimpleDictTypeList()
-})
 </script>
 <style lang="scss">
 .no-label-radio .el-radio__label {

src/views/pms/device/CustomerList.vue

@@ -140,7 +140,9 @@
   })
   const open = async (type: string) => {
     dialogVisible.value = true
-
+    queryParams.name = undefined
+    selectedRow.value = null
+    await getList();
   }
   defineExpose({ open }) // 提供 open 方法，用于打开弹窗
   const getList = async () => {
@@ -168,13 +170,6 @@
     queryFormRef.value.resetFields()
     handleQuery()
   }
-  onMounted(async ()=>{
-    selectedRow.value = null
-    // customerType.value = type
-    //
-    // dialogTitle.value = type==='supplier'?'供应商':'制造商';
-    await getList();
-  })
 </script>
 <style scoped lang="scss">
 

src/views/pms/device/IotDeviceForm.vue

@@ -25,17 +25,6 @@
               <el-input v-model="formData.deviceName" placeholder="请输入设备名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="品牌" prop="brandName">
-              <el-select
-                clearable
-                v-model="formData.brandName"
-                @clear="brandClear"
-                placeholder="请输入品牌"
-                @click="openForm"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="所在部门" prop="deptId">
               <el-tree-select
@@ -94,6 +83,17 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="品牌" prop="brandName">
+              <el-select
+                clearable
+                v-model="formData.brandName"
+                @clear="brandClear"
+                placeholder="请输入品牌"
+                @click="openForm"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="8" >
             <div style="display: flex;flex-direction: row">
               <el-form-item label="规格型号" prop="model" style="width: 86%">
@@ -422,7 +422,7 @@ const formRules = reactive({
   assetClass: [{ required: true, message: '资产类别不能为空', trigger: 'blur' }],
   deviceCode: [{ required: true, message: '资产编码不能为空', trigger: 'blur' }],
   deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
-  brand: [{ required: true, message: '品牌不能为空', trigger: 'blur' }],
+  brandName: [{ required: true, message: '品牌不能为空', trigger: 'blur' }],
   deptId: [{ required: true, message: '所在部门不能为空', trigger: 'blur' }],
   deviceStatus: [{ required: true, message: '设备状态不能为空', trigger: 'blur' }],
   assetProperty: [{ required: true, message: '资产性质不能为空', trigger: 'blur' }],
@@ -613,7 +613,9 @@ onMounted(async () => {
       formLoading.value = false
     }
   } else {
-    formData.value.deptId = Number(deptId)
+    if (deptId) {
+      formData.value.deptId = Number(deptId)
+    }
     formType.value = 'create';
   }
 })

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

@@ -97,24 +97,24 @@
                   style="display: flex; justify-content: center; align-items: center; width: 100%"
                 >
                   <div style="margin-right: 10px">
-                    <Icon style="vertical-align: middle; color: #c36e5b" icon="ep:view" />
                     <el-button
                       style="vertical-align: middle"
                       link
                       type="warning"
                       @click="viewRoute(scope.row.itemJson)"
                     >
+                      <Icon style="vertical-align: middle; color: #c36e5b" icon="ep:view" />
                       巡检路线
                     </el-button>
                   </div>
                   <div>
-                    <Icon style="vertical-align: middle; color: #ea3434" icon="ep:zoom-out" />
                     <el-button
                       style="vertical-align: middle"
                       link
                       type="danger"
                       @click="handleDelete(scope.row.code)"
                     >
+                      <Icon style="vertical-align: middle; color: #ea3434" icon="ep:zoom-out" />
                       移除
                     </el-button>
                   </div>

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

@@ -49,7 +49,7 @@ defineOptions({
 const windowWidth = ref(window.innerWidth)
 // 动态计算百分比
 const computedSize = computed(() => {
-  return windowWidth.value > 800 ? '40%' : '60%'
+  return windowWidth.value > 800 ? '50%' : '60%'
 })
 
 const loading = ref(false)

src/views/pms/maintain/IotMaintainDetail.vue

@@ -271,31 +271,31 @@ const formData = ref({
   outFile: undefined
 })
 const formRules = reactive({
-  deviceName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
-  failureCode: [{ required: true, message: '故障编码不能为空', trigger: 'blur' }],
-  type: [{ required: true, message: '维修类型不能为空', trigger: 'blur' }],
-  ifStop: [{ required: true, message: '是否停机不能为空', trigger: 'blur' }],
-  failureName: [{ required: true, message: '故障名称不能为空', trigger: 'blur' }],
-  // failureTime: [{ required: true, message: '故障时间不能为空', trigger: 'blur' }],
-  maintainStartTime: [{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }],
-  maintainDescription: [{ required: true, message: '维修描述不能为空', trigger: 'blur' }],
-  maintainPerson: [{ required: true, message: '维修负责人不能为空', trigger: 'blur' }],
-  deviceId: [{ required: true, message: '设备id不能为空', trigger: 'blur' }],
-  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+  // deviceName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  // failureCode: [{ required: true, message: '故障编码不能为空', trigger: 'blur' }],
+  // type: [{ required: true, message: '维修类型不能为空', trigger: 'blur' }],
+  // ifStop: [{ required: true, message: '是否停机不能为空', trigger: 'blur' }],
+  // failureName: [{ required: true, message: '故障名称不能为空', trigger: 'blur' }],
+  // // failureTime: [{ required: true, message: '故障时间不能为空', trigger: 'blur' }],
+  // maintainStartTime: [{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }],
+  // maintainDescription: [{ required: true, message: '维修描述不能为空', trigger: 'blur' }],
+  // maintainPerson: [{ required: true, message: '维修负责人不能为空', trigger: 'blur' }],
+  // deviceId: [{ required: true, message: '设备id不能为空', trigger: 'blur' }],
+  // status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
 })
 const outFormRules = reactive({
-  deviceName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
-  failureCode: [{ required: true, message: '故障编码不能为空', trigger: 'blur' }],
-  type: [{ required: true, message: '维修类型不能为空', trigger: 'blur' }],
-  ifStop: [{ required: true, message: '是否停机不能为空', trigger: 'blur' }],
-  failureName: [{ required: true, message: '故障名称不能为空', trigger: 'blur' }],
-  maintainStartTime: [{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }],
-  maintainEndTime: [{ required: true, message: '维修结束时间不能为空', trigger: 'blur' }],
-  maintainDescription: [{ required: true, message: '维修描述不能为空', trigger: 'blur' }],
-  maintainPerson: [{ required: true, message: '维修负责人不能为空', trigger: 'blur' }],
-  deviceId: [{ required: true, message: '设备id不能为空', trigger: 'blur' }],
-  maintainFee: [{ required: true, message: '维修费用不能为空', trigger: 'blur' }],
-  supplier: [{ required: true, message: '供应商不能为空', trigger: 'blur' }]
+  // deviceName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
+  // failureCode: [{ required: true, message: '故障编码不能为空', trigger: 'blur' }],
+  // type: [{ required: true, message: '维修类型不能为空', trigger: 'blur' }],
+  // ifStop: [{ required: true, message: '是否停机不能为空', trigger: 'blur' }],
+  // failureName: [{ required: true, message: '故障名称不能为空', trigger: 'blur' }],
+  // maintainStartTime: [{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }],
+  // maintainEndTime: [{ required: true, message: '维修结束时间不能为空', trigger: 'blur' }],
+  // maintainDescription: [{ required: true, message: '维修描述不能为空', trigger: 'blur' }],
+  // maintainPerson: [{ required: true, message: '维修负责人不能为空', trigger: 'blur' }],
+  // deviceId: [{ required: true, message: '设备id不能为空', trigger: 'blur' }],
+  // maintainFee: [{ required: true, message: '维修费用不能为空', trigger: 'blur' }],
+  // supplier: [{ required: true, message: '供应商不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -304,10 +304,10 @@ const close = () => {
   push({ name: 'IotMaintain', params: {} })
 }
 const startRule = [
-  { required: true, message: '维修开始时间不能为空', trigger: 'blur' }
+  // { required: true, message: '维修开始时间不能为空', trigger: 'blur' }
 ];
 const endRule = [
-  { required: true, message: '维修结束时间不能为空', trigger: 'blur' }
+  // { required: true, message: '维修结束时间不能为空', trigger: 'blur' }
 ];
 const handleViewNew = (nodeId, bomId) => {
   drawerVisible.value = true