From 3a73cd63039981d1f7cd324afea8f14f37738467 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 07 三月 2025 11:24:49 +0800
Subject: [PATCH] 1、统计分析和统计图表、对比分析和利用率走势分析、利用率分段分析和报警分析页面新增筛选条件保持跟TEEP页面一致 2、全局中重要程度的筛选方式由多选改为单选 3、设备监控与车间看板页面的设备详情弹窗中的图表调整为一直展示但若无数据则不展示图表的指针与数值
---
src/views/eam/modules/line/EquipmentOfLineForm.vue | 98 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 94 insertions(+), 4 deletions(-)
diff --git a/src/views/eam/modules/line/EquipmentOfLineForm.vue b/src/views/eam/modules/line/EquipmentOfLineForm.vue
index fcbd6a2..27122d3 100644
--- a/src/views/eam/modules/line/EquipmentOfLineForm.vue
+++ b/src/views/eam/modules/line/EquipmentOfLineForm.vue
@@ -49,6 +49,85 @@
></a-input>
</a-form-model-item>
</a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="浣跨敤閮ㄩ棬"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="useId"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
+ :triggerChange="true"
+ dictCode="sys_depart,depart_name,id,del_flag!='1'"
+ v-model="model.useId"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="6">
+ <a-form-model-item
+ label="缁存姢閮ㄩ棬"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="manageId"
+ >
+ <!-- <a-tree-select
+ :disabled="formDisabled"
+ style="width: 100%"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+ :tree-data="treeData"
+ placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
+ tree-default-expand-all
+ v-model="model.manageId"
+ /> -->
+ <j-dict-select-tag
+ allow-clear
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
+ :triggerChange="true"
+ dictCode="sys_depart,depart_name,id,del_flag!='1'"
+ v-model="model.manageId"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="缁翠慨鐝粍"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="teamId"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨璐ｄ换鐝粍"
+ :triggerChange="true"
+ dictCode="mom_base_team,name,id,status='1' and del_flag='0'"
+ v-model="model.teamId"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item
+ label="宸ュ尯"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="factoryModelId"
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled="formDisabled"
+ placeholder="璇烽�夋嫨宸ュ尯"
+ :triggerChange="true"
+ dictCode="mom_base_area,name,id,del_flag!='1'"
+ v-model="model.factoryModelId"
+ />
+ </a-form-model-item>
+ </a-col>
</a-row>
</a-form-model>
</j-form-container>
@@ -65,7 +144,6 @@
:disabled="formDisabled"
:rowNumber="true"
:rowSelection="true"
- :bordered="true"
:alwaysEdit="true"
:toolbar="true"
@valueChange="changeDate"
@@ -125,11 +203,11 @@
},
labelCol: {
xs: { span: 24 },
- sm: { span: 5 },
+ sm: { span: 11 },
},
wrapperCol: {
xs: { span: 24 },
- sm: { span: 16 },
+ sm: { span: 13 },
},
model:{
},
@@ -145,7 +223,19 @@
],
equipmentCategoryId:[
{ required: true, message: '璇疯緭鍏ュ垎绫�!' }
- ]
+ ],
+ manageId: [
+ { required: true, message: '璇烽�夋嫨缁存姢閮ㄩ棬!' },
+ ],
+ useId: [
+ { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' },
+ ],
+ factoryModelId: [
+ { required: true, message: '璇烽�夋嫨宸ュ尯!' },
+ ],
+ teamId: [
+ { required: true, message: '璇烽�夋嫨璐ｄ换鐝粍!' },
+ ],
},
refKeys: ['equipmentOfLineTable', ],
tableKeys:['equipmentOfLineTable', ],
--
Gitblit v1.9.3