From 3629dde86000f6412b35aea04399983921df7099 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 15 五月 2025 17:50:08 +0800
Subject: [PATCH] 1、OEE报表计算功能 选择时间添加限制，禁止选择选今天及未来日期 2、解决车间布局图点击设备详细弹窗展示异常问题（删除车间看板页面独立的详情弹窗组件，沿用设备监控页面详情弹窗组件）
---
src/views/mdc/base/modules/EquipmentList/UserModal.vue | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/src/views/mdc/base/modules/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
index a460738..01384b6 100644
--- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -129,20 +129,6 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="璁惧绾у埆" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绾у埆" dictCode="device_level" v-model="model.deviceLevel" :disabled="disableSubmit" allow-clear/>
- </a-form-model-item>
- </a-col>
- </a-row>
-
- <a-row :gutter="24">
- <a-col :span="12">
- <a-form-model-item label="璁惧绉嶇被" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绉嶇被" dictCode="device_category" v-model="model.deviceCategory" :disabled="disableSubmit"
- allow-clear/>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
<a-form-model-item label="鎺掑簭" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :disabled="disableSubmit" :readOnly="disableSubmit" placeholder="璇疯緭鍏ユ帓搴�"
v-model="model.sortNo" style="width: 100%"/>
@@ -376,6 +362,7 @@
this.model.driveType = val.drivetype
this.model.controlSystem = val.controlsystem
this.model.saveTableName = val.savetablename
+ this.model.systemType = val.controlsystem
}
},
--
Gitblit v1.9.3