From 6ce08fb7e3ac056ef2cda917232b4b72ffcdb157 Mon Sep 17 00:00:00 2001 From: liutao <790864623@qq.com> Date: Thu, 26 Mar 2026 15:20:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=85=8D=E6=96=B9=E5=BA=93=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/iot/recipepointrecord/index.ts | 4 + .../components/FormulaLibraryDetailTabs.vue | 193 +++++++++++------- 2 files changed, 127 insertions(+), 70 deletions(-) diff --git a/src/api/iot/recipepointrecord/index.ts b/src/api/iot/recipepointrecord/index.ts index 8f4e2ee0..423518f9 100644 --- a/src/api/iot/recipepointrecord/index.ts +++ b/src/api/iot/recipepointrecord/index.ts @@ -12,6 +12,10 @@ export interface RecipePointRecordVO { export const RecipePointRecordApi = { // 新增记录 + createRecipePointRecord: async (data: RecipePointRecordVO) => { + return await request.post({ url: `/iot/recipe-point-record/create`, data }) + }, + // 批量新增记录 createRecipePointRecordBatch: async (data: RecipePointRecordVO[]) => { return await request.post({ url: `/iot/recipe-point-record/batch-create`, data }) }, diff --git a/src/views/formula/formulaLibrary/components/FormulaLibraryDetailTabs.vue b/src/views/formula/formulaLibrary/components/FormulaLibraryDetailTabs.vue index 3e48583d..976d7b37 100644 --- a/src/views/formula/formulaLibrary/components/FormulaLibraryDetailTabs.vue +++ b/src/views/formula/formulaLibrary/components/FormulaLibraryDetailTabs.vue @@ -46,58 +46,62 @@ /> - - - 查询 - - - 重置 + + + + {{ t('RecipeManagement.RecipeLibrary.createButtonText') }} - --> + + sortable /> + sortable /> - + - + - + - - + + + + + - + @@ -183,10 +197,12 @@ + + diff --git a/src/views/mes/deviceledger/index.vue b/src/views/mes/deviceledger/index.vue index f2179aa4..38d7ef70 100644 --- a/src/views/mes/deviceledger/index.vue +++ b/src/views/mes/deviceledger/index.vue @@ -2,159 +2,309 @@
+ v-loading="typeTreeLoading" :data="typeTreeData" node-key="id" highlight-current + :props="typeTreeProps" + :default-expanded-keys="typeTreeExpandedKeys" :expand-on-click-node="false" + @node-click="handleTypeNodeClick"/>
- - + + + v-model="queryParams.deviceCode" + :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceCode')" + clearable @keyup.enter="handleQuery" + class="!w-240px"/> - + + v-model="queryParams.deviceName" + :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceName')" + clearable @keyup.enter="handleQuery" + class="!w-240px"/> - - - + + + - {{ t('common.query') }} + + {{ t('common.query') }} - {{ t('common.reset') }} + + {{ t('common.reset') }} - - {{ t('action.add') }} + + + {{ t('action.add') }} - - {{ t('EquipmentManagement.EquipmentLedger.batchDelete') }} + + + {{ t('EquipmentManagement.EquipmentLedger.batchDelete') }} - {{ t('action.export') }} + + {{ t('action.export') }} + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+ +
+ +
+
+ +
+ + +
+ + + +
+ + +
+
{{ item.name }}
+
{{ item.code }}
+
{{ item.model }}
+ + +
+ + {{ getStatusText(item.status) }} + +
+ + +
+ 运行: {{ formatRunningHours(item.runningHours) }} +
+ + +
+ + + + {{ item.location }} +
+
+
+
+ + + +
+
-
{{ t('EquipmentManagement.EquipmentLedger.detail') }}
+
{{ + t('EquipmentManagement.EquipmentLedger.detail') + }} +
- +
- {{ detailData?.deviceCode ?? '' }} - {{ detailData?.deviceName ?? '' }} + + {{ detailData?.deviceCode ?? '' }} + + + {{ detailData?.deviceName ?? '' }} + - + - {{ detailData?.deviceModel ?? '' }} - {{ detailData?.deviceSpec ?? '' }} + + {{ detailData?.deviceModel ?? '' }} + + + {{ detailData?.deviceSpec ?? '' }} + - {{ getDeviceTypeName(detailData?.deviceTypeName ?? detailData?.deviceType) - }} + {{ + getDeviceTypeName(detailData?.deviceTypeName ?? detailData?.deviceType) + }} + - {{ detailData?.deviceLocation ?? '' }} - {{ detailData?.deviceManagerName ?? '' }} - {{ formatDetailDate(detailData?.productionDate) }} - {{ formatDetailDate(detailData?.factoryEntryDate) - }} - {{ detailData?.remark ?? detailData?.deviceRemark ?? '' - }} - {{ detailData?.creatorName ?? '' }} - {{ formatDetailDate(detailData?.createTime) }} - {{ formatDetailDate(detailData?.updateTime) }} - - - - + + {{ detailData?.deviceLocation ?? '' }} + + + {{ detailData?.deviceManagerName ?? '' }} + + + {{ formatDetailDate(detailData?.productionDate) }} + + + {{ + formatDetailDate(detailData?.factoryEntryDate) + }} + + {{ + detailData?.remark ?? detailData?.deviceRemark ?? '' + }} + + + {{ detailData?.creatorName ?? '' }} + + + {{ formatDetailDate(detailData?.createTime) }} + + + {{ formatDetailDate(detailData?.updateTime) }} + + + @@ -162,62 +312,93 @@ link type="danger" @click="handleDelete(scope.row.id)"
- {{ t('common.query') }} + v-model="inspectionDateRange" type="daterange" value-format="YYYY-MM-DD HH:mm:ss" + :start-placeholder="t('common.startTimeText')" + :end-placeholder="t('common.endTimeText')" range-separator="-" :unlink-panels="true" + class="mr-10px"/> + {{ + t('common.query') + }} + {{ t('common.reset') }} - {{ t('action.export') }} + + {{ t('action.export') }}
- + - +