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/EquipmentListOfAll.vue | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue index c553327..de4d6d5 100644 --- a/src/views/eam/EquipmentListOfAll.vue +++ b/src/views/eam/EquipmentListOfAll.vue @@ -39,7 +39,7 @@ :wrapperCol="wrapperCol" > <j-dict-select-tag - dictCode="mom_eam_equipment_category,name,id,del_flag!='1'" + :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id,del_flag!=\'1\'':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''" placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨" v-model="queryParam.equipmentCategoryId" /> @@ -869,10 +869,16 @@ RepairOrderListComponent, EquipmentCalibrationOrderComponent, }, + props: { + caytegoryParam: { + type: String, + default: 'all', + required: true, + }, + }, data() { return { description: '璁惧鍙拌处绠$悊椤甸潰', - caytegoryParam: 'all', // 琛ㄥご columns: [ { @@ -1291,7 +1297,10 @@ this.ipagination.current = 1; } this.onClearSelected() - var params = this.getQueryParams();//鏌ヨ鏉′欢 + if(this.caytegoryParam !== 'all') { + this.queryParam.equipmentCategoryUda1 = this.caytegoryParam; + } + let params = this.getQueryParams();//鏌ヨ鏉′欢 this.loading = true; getAction(this.url.list, params).then((res) => { if (res.success) { @@ -1434,6 +1443,11 @@ } }) } + else { + this.$message.warning('鏈煡璇㈠埌鏈夋晥妯℃澘') + } + } else { + this.$message.warning('鏈煡璇㈠埌鏈夋晥妯℃澘') } }) }, -- Gitblit v1.9.3