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/system/modules/WorkshopModal.vue | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/views/system/modules/WorkshopModal.vue b/src/views/system/modules/WorkshopModal.vue
index 5c74232..2118a6d 100644
--- a/src/views/system/modules/WorkshopModal.vue
+++ b/src/views/system/modules/WorkshopModal.vue
@@ -12,14 +12,17 @@
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" v-bind="layout" :model="model" :rules="validatorRules">
- <a-form-model-item label="杞﹂棿缂栧彿" required prop="id">
- <a-input v-model="model.id" :disabled="isEdit" placeholder="璇疯緭鍏ヨ溅闂寸紪鍙�"/>
- </a-form-model-item>
<a-form-model-item label="杞﹂棿鍚嶇О" required prop="workshopName">
<a-input v-model="model.workshopName" placeholder="璇疯緭鍏ヨ溅闂村悕绉�"/>
</a-form-model-item>
<a-form-model-item label="杞﹂棿鑳屾櫙鍥�" required prop="backgroundImage">
<j-image-upload class="avatar-uploader" text="涓婁紶" v-model="model.backgroundImage"></j-image-upload>
+ </a-form-model-item>
+ <a-form-model-item label="璁惧缂栧彿棰滆壊">
+ <a-input type="color" v-model="model.equipmentIdColor"></a-input>
+ </a-form-model-item>
+ <a-form-model-item label="鎺堟潈鏍囪瘑">
+ <a-input placeholder="璇疯緭鍏ユ巿鏉冩爣璇�" v-model="model.perms"/>
</a-form-model-item>
</a-form-model>
</a-spin>
@@ -31,6 +34,7 @@
export default {
name: 'WorkshopModal',
+ components: {},
data() {
return {
title: '鎿嶄綔',
@@ -52,7 +56,7 @@
{ min: 0, max: 64, message: '闀垮害涓嶈秴杩� 64 涓瓧绗�', trigger: 'blur' },
{ validator: this.validateRoleCode }
],
- backgroundImage:[
+ backgroundImage: [
{ required: true, message: '璇蜂笂浼犺溅闂磋儗鏅浘!' }
]
}
@@ -98,10 +102,16 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.$emit('ok')
} else {
- that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.confirmLoading = false
--
Gitblit v1.9.3