diff --git a/src/api/mes/energydevice/index.ts b/src/api/mes/energydevice/index.ts
index 18a963de..9e2460da 100644
--- a/src/api/mes/energydevice/index.ts
+++ b/src/api/mes/energydevice/index.ts
@@ -25,6 +25,10 @@ export const EnergyDeviceApi = {
getEnergyDevice: async (id: number) => {
return await request.get({ url: `/mes/energy-device/get?id=` + id })
},
+// 查询能源设备列表
+ getList: async (params: any) => {
+ return await request.get({ url: `/mes/energy-device/getList`, params })
+ },
// 新增能源设备
createEnergyDevice: async (data: EnergyDeviceVO) => {
@@ -71,4 +75,4 @@ export const EnergyDeviceApi = {
getEnergyDeviceCheckRecord: async (id: number) => {
return await request.get({ url: `/mes/energy-device/energy-device-check-record/get?id=` + id })
}
-}
\ No newline at end of file
+}
diff --git a/src/layout/components/Footer/src/Footer.vue b/src/layout/components/Footer/src/Footer.vue
index 3eede386..5d27f8b6 100644
--- a/src/layout/components/Footer/src/Footer.vue
+++ b/src/layout/components/Footer/src/Footer.vue
@@ -19,6 +19,6 @@ const title = computed(() => appStore.getTitle)
:class="prefixCls"
class="h-[var(--app-footer-height)] bg-[var(--app-content-bg-color)] text-center leading-[var(--app-footer-height)] text-[var(--el-text-color-placeholder)] dark:bg-[var(--el-bg-color)]"
>
- Copyright ©2022-{{ title }}
+ Copyright ©2024-BESURE-{{ title }}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 0565e7e8..af77c8e2 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -248,6 +248,8 @@ export enum DICT_TYPE {
MES_STOCK_OUT_TYPE = "mes_stock_out_type",
MES_PRODUCE_REPORT_TYPE = "mes_produce_report_type",
MES_ENERGY_DEVICE_TYPE = "mes_energy_device_type",
+ MES_MAINTAIN_TYPE = "mes_maintain_type",
+ MES_MAINTAIN_TIME_UNIT = "mes_maintain_time_unit",
//====iot
IOT_SIEMENS_TYPE = "iot_siemens_type",
IOT_MODBUS_TYPE = "iot_modbus_type",
diff --git a/src/views/mes/energydevicecheck/index.vue b/src/views/mes/energydevicecheck/index.vue
index a340d8fc..236c65c6 100644
--- a/src/views/mes/energydevicecheck/index.vue
+++ b/src/views/mes/energydevicecheck/index.vue
@@ -9,13 +9,21 @@
label-width="68px"
>
-
+ filterable
+ placeholder="请选择"
+ class="!w-180px"
+ >
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 能源报表
+
+
+
@@ -114,6 +129,7 @@ import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { EnergyDeviceCheckRecordApi, EnergyDeviceCheckRecordVO } from '@/api/mes/energydevicecheck'
import EnergyDeviceCheckRecordForm from './EnergyDeviceCheckRecordForm.vue'
+import {EnergyDeviceVO, EnergyDeviceApi} from "@/api/mes/energydevice";
/** 抄表记录 列表 */
defineOptions({ name: 'EnergyDeviceCheckRecord' })
@@ -123,6 +139,8 @@ const { t } = useI18n() // 国际化
const loading = ref(true) // 列表的加载中
const list = ref([]) // 列表的数据
+const deviceList = ref([]) // 列表
+
const total = ref(0) // 列表的总页数
const queryParams = reactive({
pageNo: 1,
@@ -195,7 +213,8 @@ const handleExport = async () => {
}
/** 初始化 **/
-onMounted(() => {
- getList()
+onMounted(async () => {
+ await getList()
+ deviceList.value = await EnergyDeviceApi.getTaskList()
})
diff --git a/src/views/mes/machine/MachineComponentForm.vue b/src/views/mes/machine/MachineComponentForm.vue
index 62168207..2d1d68e0 100644
--- a/src/views/mes/machine/MachineComponentForm.vue
+++ b/src/views/mes/machine/MachineComponentForm.vue
@@ -7,160 +7,213 @@
label-width="100px"
v-loading="formLoading"
>
-
-
-
-
-
-
-
-
-
-
- {{ dict.label }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ dict.label }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
确 定
diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue
index f244cf92..3c5931a6 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@@ -206,7 +206,7 @@
type="primary"
@click="handleStatus(scope.row.code, scope.row.id, 'start',2,'开工')"
v-hasPermi="['mes:plan:update']"
- v-if="scope.row.status === 1"
+ v-if="scope.row.status === 1 || scope.row.status ===4"
>
开工
diff --git a/src/views/mes/task/components/TaskDetailList.vue b/src/views/mes/task/components/TaskDetailList.vue
index bd7974fc..a968c14b 100644
--- a/src/views/mes/task/components/TaskDetailList.vue
+++ b/src/views/mes/task/components/TaskDetailList.vue
@@ -18,14 +18,6 @@
-
-
-
-
-
-
-
-
@@ -46,7 +38,7 @@
link
type="warning"
@click="addPlanForm(scope.row.taskId,scope.row.id, scope.row.productId, scope.row.number-scope.row.planNumber)"
- v-hasPermi="['mes:task:plan']"
+ v-hasPermi="['mes:plan:create']"
>
新增计划
@@ -55,7 +47,7 @@
link
type="success"
@click="openTaskPlanForm(scope.row.taskId,scope.row.id, scope.row.productId, scope.row.productName, scope.row.number, scope.row.planNumber)"
- v-hasPermi="['mes:task:plan']"
+ v-hasPermi="['mes:plan:create']"
>
排产