From 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 三月 2024 10:09:04 +0800
Subject: [PATCH] 1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字段默认值由1000调整为100 4、设备日志页面设备日志列表中若时段状态为关机则不弹出工作曲线 5、设备综合效率分析页面增加表格数据加载动画 6、jQuery.table2excel组件导出表格数据功能增加日期格式的转换 7、设备日志页面工作曲线Y轴增加颜色区分，与对应数据颜色保持一致 8、设备管理页面表单填写界面设备功率增加计量单位kw
---
src/views/eam/modules/equipmentNew/EquipmentModal.vue | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 5db4bea..2a4b56a 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -117,15 +117,9 @@
:wrapperCol="wrapperCol"
prop="useId"
>
- <!-- <a-tree-select
- style="width: 100%"
- :disabled="formDisabled"
- :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
- :tree-data="treeData"
- placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
- tree-default-expand-all
- v-model="model.useId"
- /> -->
+
+
+
<j-dict-select-tag
allow-clear
:disabled="formDisabled"
@@ -155,6 +149,40 @@
</a-col>
</a-row>
<a-row>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鏄惁鐢熶骇绾胯澶�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="isLineEquip"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨"
+ :triggerChange="true"
+ :disabled="true"
+ dictCode="is_product"
+ v-model="model.isLineEquip"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="鏄惁鐢熶骇绾�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="isLine"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨"
+ :triggerChange="true"
+ :disabled="true"
+ dictCode="is_product"
+ v-model="model.isLine"
+ />
+ </a-form-model-item>
+ </a-col>
<a-col :span="6">
<a-form-model-item
label="璁惧鍥剧墖"
@@ -1031,7 +1059,6 @@
},
methods: {
add() {
- this
this.edit(this.modelDefault);
},
edit(record) {
@@ -1039,6 +1066,8 @@
this.model = Object.assign({}, record);
if (!this.model.id) {
this.model.equipmentStatus = '1'
+ this.model.isLineEquip = 'no'
+ this.model.isLine = 'no'
}
this.visible = true;
},
--
Gitblit v1.9.3