Merge remote-tracking branch 'origin/master'

src/api/pms/device/index.ts

@@ -10,6 +10,7 @@ export interface IotDeviceVO {
   deptId: number    // 所在部门id
   deptName: string  // 所在部门名称
   deviceStatus: string // 设备状态
+  deviceStatusName: string // 设备状态名称
   assetProperty: string // 资产性质
   picUrl: string // 图片
   remark: string // 备注
@@ -34,6 +35,7 @@ export interface IotDeviceVO {
   bomNodeId: number // bom节点id
   name: string // bom节点名称
   code: string // bom节点编码
+  devicePersons: string // 设备责任人 逗号分隔
 }
 
 // 设备台账 API

src/views/pms/bom/BomForm.vue

@@ -65,7 +65,7 @@
   </Dialog>
 </template>
 <script lang="ts" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import {DICT_TYPE, getIntDictOptions, getStrDictOptions} from '@/utils/dict'
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as BomApi from '@/api/pms/bom'
 import { CommonStatusEnum } from '@/utils/constants'
@@ -73,6 +73,10 @@ import { useTreeStore } from '@/store/modules/treeStore';
 import * as DeviceCategoryApi from '@/api/pms/productclassify'
 import { FormRules } from 'element-plus'
 import { defineEmits, ref } from 'vue';
+import { cloneDeep } from 'lodash-es'
+import { PropType } from 'vue'
+import { propTypes } from '@/utils/propTypes'
+import {copyValueToTarget} from "@/utils";
 
 defineOptions({ name: 'BomForm' })
 
@@ -125,6 +129,11 @@ const open = async (type: string, id?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  // 获得 设备分类树
+  await getDeviceCategoryTree()
+  // 获得 bom 树
+  await getTree()
+  console.log('open方法执行了！')
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -134,10 +143,6 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
-  // 获得 设备分类树
-  await getDeviceCategoryTree()
-  // 获得 bom 树
-  await getTree()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -146,7 +151,6 @@ const emit = defineEmits(['success', 'node-click']) // 定义 success 树点击
 /** 处理 设备分类 树 被点击 */
 const handleDeviceCategoryTreeNodeClick = async (row: { [key: string]: any }) => {
   emit('node-click', row)
-  // treeStore.setSelectedId(row.id);
   // 清空设备分类bom树的选择，重新查询筛选bom树
   selfDeviceCategoryId.value = row.id
   await getTree()

src/views/pms/device/ConfigDevicePerson.vue

@@ -26,7 +26,7 @@
                 class="radio-item"
               >
                 <el-radio :label="device.id">
-                  {{ device.deviceCode }} ({{ device.deviceName }})
+                  {{ device.deviceCode }} ({{ device.deviceName }}) - {{ device.devicePersons }}
                 </el-radio>
               </div>
             </el-radio-group>

src/views/pms/device/ConfigDeviceStatus.vue

@@ -26,7 +26,7 @@
                 class="checkbox-item"
               >
                 <el-checkbox :label="device.id">
-                  {{ device.deviceCode }} ({{ device.deviceName }})
+                  {{ device.deviceCode }} ({{ device.deviceName }}) - {{ device.deviceStatusName }}
                 </el-checkbox>
               </div>
             </el-checkbox-group>

src/views/pms/maintenance/MainPlanDeviceList.vue

@@ -8,13 +8,14 @@
         ref="queryFormRef"
         :inline="true"
         label-width="68px"
+        @submit.prevent
       >
         <el-form-item label="设备名称" prop="deviceName">
           <el-input
+            @keyup.enter="handleQuery"
             v-model="queryParams.deviceName"
             placeholder="请输入设备名称"
             clearable
-            @keyup.enter="handleQuery"
             class="!w-240px"
           />
         </el-form-item>