From e081f232138b318338ffca07e7c9fcd941ac20b4 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 12 四月 2024 09:54:17 +0800
Subject: [PATCH] 1、设备综合效率分析以及设备加工工件报表页面表格高度设置为页面进入时即可拖动水平滚动条的高度 2、首页 （1）OEE标题增加月份展示，利用率等效率标题增加日期展示 （2）公司及车间级看板单击OEE车间图表跳转至设备综合效率分析页面并根据唯一编号筛选页面对应数据 （3）工段级看板单击设备效率统计仪表盘图标跳转至统计分析页面并根据唯一编号筛选页面对应数据 （4）调整折线图数据展示维度，通过当前工段下各个设备前7天的利用率、开动率和开机率轮播展示
---
src/views/system/modules/WorkshopModal.vue | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/views/system/modules/WorkshopModal.vue b/src/views/system/modules/WorkshopModal.vue
index 364a8fa..2118a6d 100644
--- a/src/views/system/modules/WorkshopModal.vue
+++ b/src/views/system/modules/WorkshopModal.vue
@@ -18,6 +18,12 @@
<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>
</a-modal>
@@ -28,6 +34,7 @@
export default {
name: 'WorkshopModal',
+ components: {},
data() {
return {
title: '鎿嶄綔',
@@ -49,7 +56,7 @@
{ min: 0, max: 64, message: '闀垮害涓嶈秴杩� 64 涓瓧绗�', trigger: 'blur' },
{ validator: this.validateRoleCode }
],
- backgroundImage:[
+ backgroundImage: [
{ required: true, message: '璇蜂笂浼犺溅闂磋儗鏅浘!' }
]
}
@@ -95,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