Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web

# Conflicts:
#	src/views/mes/energydevicecheck/index.vue

src/api/iot/device/index.ts

@@ -184,6 +184,11 @@ export const DeviceApi = {
     return await request.delete({ url: `/iot/device-contact-model/delete?ids=` + ids })
   },
 
+  // 导出设备属性 Excel
+  exportDeviceContactModel: async (params) => {
+    return await request.download({ url: `/iot/device-contact-model/export-excel`, params })
+  },
+
   // 获得设备属性
   getDeviceAttribute: async (id: number) => {
     return await request.get({ url: `/iot/device-contact-model/get?id=` + id })

src/api/mes/criticalComponent/index.ts

@@ -5,6 +5,7 @@ export interface CriticalComponentVO {
   code: string
   name: string
   description?: string
+  count?: number
   remark?: string
   createTime?: string
 }

src/locales/zh-CN.ts

@@ -1015,6 +1015,7 @@ export default {
     },
     // 设备关键件
     EquipmentKeyItems: {
+      count: '数量',
       code: '编码',
       name: '名称',
       batchDelete: '批量删除',
@@ -1027,7 +1028,8 @@ export default {
       placeholderCode: '请输入编码',
       placeholderName: '请输入名称',
       placeholderDescription: '请输入描述',
-      placeholderRemark: '请输入备注'
+      placeholderRemark: '请输入备注',
+      placeholderCount: '请输入数量'
     },
     // 项目维护
     DvSubject: {

src/views/iot/device/components/DeviceAttributeList.vue

@@ -33,7 +33,7 @@
           :placeholder="t('DataCollection.Device.placeholderAttributeType')"
           class="!w-240px"
         >
-          <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.name" />
+          <el-option v-for="item in typeList" :key="item.id" :label="item.code + '-' + item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -184,7 +184,6 @@ import { DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { DeviceApi } from '@/api/iot/device'
-import { DeviceModelAttributeApi } from '@/api/iot/devicemodelattribute'
 import DeviceAttributeForm from './DeviceAttributeForm.vue'
 import { DeviceAttributeTypeApi, DeviceAttributeTypeVO } from '@/api/iot/deviceattributetype'
 
@@ -332,7 +331,7 @@ const handleExport = async () => {
     if (selectedIds.value.length) {
       params.ids = selectedIds.value.join(',')
     }
-    const data = await DeviceModelAttributeApi.exportDeviceModelAttribute(params)
+    const data = await DeviceApi.exportDeviceContactModel(params)
     download.excel(data, t('DataCollection.Device.attributeExportFilename'))
   } catch {
   } finally {
@@ -342,8 +341,8 @@ const handleExport = async () => {
 
 onMounted(async () => {
   try {
-    const data = await DeviceAttributeTypeApi.getDeviceAttributeTypePage({ pageNo: 1, pageSize: 10 })
+    const data = await DeviceAttributeTypeApi.getDeviceAttributeTypeList()
-    typeList.value = data?.list ?? []
+    typeList.value = data ?? []
   } catch {
     typeList.value = []
   }

src/views/iot/devicemodel/components/ModelAttributeList.vue

@@ -18,7 +18,7 @@ v-model="queryParams.attributeName"
         <el-select
 v-model="queryParams.attributeType" clearable filterable
           :placeholder="t('DataCollection.DeviceModel.placeholderAttributeType')" class="!w-240px">
-          <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
+          <el-option v-for="item in typeList" :key="item.id" :label="item.code + '-' + item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <!-- <el-form-item label="寄存器地址" prop="address">

src/views/mes/bom/BomForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1200px">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1200px" :close-on-click-modal="false">
     <el-form
       ref="formRef"
       :model="formData"

src/views/mes/criticalComponent/CriticalComponentForm.vue

@@ -23,6 +23,14 @@
           clearable
           type="textarea"
         />
+      </el-form-item>
+        <el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.count')" prop="count">
+        <el-input
+          v-model="formData.count"
+          :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderCount')"
+          clearable
+          type="number"
+        />
       </el-form-item>
       <el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.remark')" prop="remark">
         <el-input
@@ -59,6 +67,7 @@ const formData = ref<Partial<CriticalComponentVO>>({
   code: undefined,
   name: undefined,
   description: undefined,
+  count: undefined,
   remark: undefined
 })
 
@@ -73,6 +82,7 @@ const resetForm = () => {
     code: undefined,
     name: undefined,
     description: undefined,
+    count: undefined,
     remark: undefined
   }
   formRef.value?.resetFields?.()
@@ -89,6 +99,7 @@ const open = (type: 'create' | 'update', row?: Partial<CriticalComponentVO>) =>
       code: row.code,
       name: row.name,
       description: row.description,
+      count: row.count,
       remark: row.remark
     }
   }

src/views/mes/criticalComponent/index.vue

@@ -75,6 +75,9 @@ v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
         min-width="140" />
       <el-table-column
 :label="t('EquipmentManagement.EquipmentKeyItems.description')" align="center" prop="description"
+        min-width="180" />
+              <el-table-column
+:label="t('EquipmentManagement.EquipmentKeyItems.count')" align="center" prop="count"
         min-width="180" />
       <el-table-column
 :label="t('EquipmentManagement.EquipmentKeyItems.remark')" align="center" prop="remark"

src/views/mes/energydevicecheck/index.vue

@@ -15,11 +15,12 @@
 
       <el-form-item :label="t('EnergyManagement.EnergyDeviceCheck.searchTimeRangeLabel')" prop="timeRange">
         <el-date-picker
-          v-model="queryParams.timeRange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
+v-model="queryParams.timeRange" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
-          format="YYYY-MM-DD HH" :start-placeholder="t('EnergyManagement.EnergyDeviceCheck.searchTimeRangeStartPlaceholder')" :end-placeholder="t('EnergyManagement.EnergyDeviceCheck.searchTimeRangeEndPlaceholder')"
+          format="YYYY-MM-DD HH"
+          :start-placeholder="t('EnergyManagement.EnergyDeviceCheck.searchTimeRangeStartPlaceholder')"
+          :end-placeholder="t('EnergyManagement.EnergyDeviceCheck.searchTimeRangeEndPlaceholder')"
           :default-time="[new Date('2000-01-01 00:00:00'), new Date('2000-01-01 23:00:00')]"
-          :disabled-time="getDisabledTime" class="!w-360px " popper-class="energydevicecheckPicker"
+          :disabled-time="getDisabledTime" class="!w-360px " popper-class="energydevicecheckPicker" />
-          :teleported="false" />
       </el-form-item>
 
       <el-form-item>
@@ -35,7 +36,7 @@
       </el-form-item>
     </el-form>
   </ContentWrap>
-    <ContentWrap>
+  <ContentWrap>
     <el-table
 ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id"
       :expand-row-keys="expandRowKeys" :row-class-name="getRowClassName" style=" min-height: 50vh;margin-top: 20px"

src/views/mes/organization/OrganizationForm.vue

@@ -97,7 +97,7 @@
           default-expand-all
           placeholder="请选择机台"
         /> -->
-        <el-select v-model="formData.machineId" :placeholder="t('FactoryModeling.FactoryStructure.dialogMachinePlaceholder')">
+        <el-select v-model="formData.machineId" :placeholder="t('FactoryModeling.FactoryStructure.dialogMachinePlaceholder')" clearable>
           <el-option
             v-for="item in deviceList"
             :key="item.id"
@@ -107,7 +107,7 @@
         </el-select>
       </el-form-item>
           <el-form-item :label="t('EquipmentManagement.EquipmentLedger.dvName')" prop="dvId" v-if="formData.orgClass == 'workplace'">
-        <el-select v-model="formData.dvId" filterable :placeholder="t('EquipmentManagement.EquipmentLedger.dvId')">
+        <el-select v-model="formData.dvId" filterable :placeholder="t('EquipmentManagement.EquipmentLedger.dvId')" clearable>
           <el-option
             v-for="item in dvList"
             :key="item.id"