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/site/SiteModel.vue | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/views/eam/modules/site/SiteModel.vue b/src/views/eam/modules/site/SiteModel.vue
index abd2fec..22eb73c 100644
--- a/src/views/eam/modules/site/SiteModel.vue
+++ b/src/views/eam/modules/site/SiteModel.vue
@@ -21,9 +21,9 @@
:wrapperCol="{span:18}"
>
<a-input
- :readOnly="disableSubmit"
+ :readOnly="codeDisable"
allow-clear
- placeholder="璇疯緭鍏ュ伐鍘傜紪鍙�"
+ placeholder="灏嗙敱绯荤粺鑷姩鐢熸垚"
v-decorator="['num', validatorRules.num ]"
/>
</a-form-item>
@@ -71,7 +71,7 @@
<script>
import pick from 'lodash.pick'
-import { postAction, requestPut } from '@/api/manage'
+import { getAction, postAction, requestPut } from '@/api/manage'
import { duplicateCheck } from '@/api/api'
export default {
@@ -114,9 +114,11 @@
},
url: {
add: "/base/site/add",
- edit: "/base/site/edit"
+ edit: "/base/site/edit",
+ getNum: '/eam/sysIdentity/getNumNew',
},
disableSubmit: false,
+ codeDisable: false,
//鏂板銆佺紪杈戙�佸垹闄ゃ�佹壒閲忓垹闄ゆ搷浣滄敼鍙樻暟鎹悗鍒锋柊鍏宠仈鐨勭粍浠剁殑鐩戝惉灞炴��
alterFlag: ""
}
@@ -132,9 +134,22 @@
this.model = Object.assign({}, record);
this.visible = true;
this.disableSubmit = false;
+
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model, 'num', 'name', 'remark'))
});
+ if (!record.id) {
+ this.$nextTick(() => {
+ getAction(this.url.getNum, { type: 'Site', length: '4' }).then((res) => {
+ if (res.success) {
+ this.form.setFieldsValue({ num: res.message });
+ }
+ })
+ });
+ this.codeDisable = false;
+ } else {
+ this.codeDisable = true;
+ } 4
},
close() {
this.$emit('close');
--
Gitblit v1.9.3