diff --git a/src/api/mes/criticalComponent/index.ts b/src/api/mes/criticalComponent/index.ts index 662913fd..1bd41587 100644 --- a/src/api/mes/criticalComponent/index.ts +++ b/src/api/mes/criticalComponent/index.ts @@ -32,6 +32,10 @@ export const CriticalComponentApi = { return await request.download({ url: `/mes/critical-component/export-excel`, params }) }, + importCriticalComponentTemplate: async () => { + return await request.download({ url: `/mes/critical-component/get-import-template` }) + }, + exportDeviceComponent: async (params: any) => { return await request.download({ url: `/mes/critical-component/export-device-component`, params }) } diff --git a/src/views/iot/devicemodel/components/ModelAttributeList.vue b/src/views/iot/devicemodel/components/ModelAttributeList.vue index b5758068..ed951e17 100644 --- a/src/views/iot/devicemodel/components/ModelAttributeList.vue +++ b/src/views/iot/devicemodel/components/ModelAttributeList.vue @@ -111,7 +111,7 @@ link type="primary" @click="openForm('update', scope.row.id)" diff --git a/src/views/mes/criticalComponent/index.vue b/src/views/mes/criticalComponent/index.vue index dece9ed6..5df85d23 100644 --- a/src/views/mes/criticalComponent/index.vue +++ b/src/views/mes/criticalComponent/index.vue @@ -3,50 +3,31 @@ +v-model="queryParams.code" :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderCode')" + clearable @keyup.enter="handleQuery" class="!w-240px" /> +v-model="queryParams.name" :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderName')" + clearable @keyup.enter="handleQuery" class="!w-240px" /> +v-model="queryParams.description" + :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderDescription')" clearable + @keyup.enter="handleQuery" class="!w-240px" /> +v-model="queryParams.remark" + :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderRemark')" clearable + @keyup.enter="handleQuery" class="!w-240px" /> +v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange" + :start-placeholder="t('common.startTimeText')" :end-placeholder="t('common.endTimeText')" + :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-220px" /> @@ -62,22 +43,18 @@ {{ t('action.add') }} +type="danger" plain @click="handleBatchDelete" :disabled="!selectedIds.length" + v-hasPermi="['mes:critical-component:delete']"> {{ t('EquipmentManagement.EquipmentKeyItems.delete') }} + + + {{ t('action.import') }} + +type="success" plain @click="handleExport" :loading="exportLoading" + v-hasPermi="['mes:critical-component:export']"> {{ t('action.export') }} @@ -86,35 +63,87 @@ - + - - - - - - + + + + + + - + + + + + +
+ 将文件拖到此处,或点击上传 +
+ +
+ +