From 20f77a55f8eeaceb026d1c5ad96de75d6edb712a Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 29 五月 2025 14:18:14 +0800
Subject: [PATCH] 1、报警分析页面报警页面调整比例饼图颜色 2、维修看板页面设备平均故障率柱状图Y轴去除%号以及去除柱子注释含义 3、设备管理页面新增弹窗添加禁止手输设备编号，新增安装位置字段（同时将MDC模块内所有设备名称显示调整为安装位置） 4、设备级看板页面的设备选择框新增安装位置显示 5、首页添加法士特沃克背景图 6、对比分析页面解决时间段查询选择框无法选择问题以及柱状图组件重置按钮关联设备树选择 7、OEE页面列表取消展示合格零件数量和加工零件数量字段，仅展示合格率字段
---
src/views/flowable/workflow/FlowCompleted.vue | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index c851a89..eec40ae 100644
--- a/src/views/flowable/workflow/FlowCompleted.vue
+++ b/src/views/flowable/workflow/FlowCompleted.vue
@@ -15,19 +15,26 @@
dictCode="flow_type"></j-dict-select-tag>
</a-form-item>
</a-col>
+ <a-col :xl="4" :lg="6" :md="8" :sm="24">
+ <a-form-item label="绠�瑕佹弿杩�">
+ <a-input placeholder="璇疯緭鍏ョ畝瑕佹弿杩�" v-model="queryParam.title"></a-input>
+ </a-form-item>
+ </a-col>
<a-col :xl="10" :lg="11" :md="12" :sm="24">
- <a-form-item label="鎿嶄綔鏃堕棿">
- <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨寮�濮嬫椂闂�" class="query-group-cust"
+ <a-form-item label="浠诲姟鏃堕棿鑼冨洿">
+ <j-date :show-time="false" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨寮�濮嬫椂闂�"
+ class="query-group-cust"
v-model="queryParam.startTime"></j-date>
<span class="query-group-split-cust"></span>
- <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨缁撴潫鏃堕棿" class="query-group-cust"
+ <j-date :show-time="false" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
+ class="query-group-cust"
v-model="queryParam.endTime"></j-date>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a-button @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
</span>
</a-col>
</a-row>
@@ -80,6 +87,10 @@
</div>
<inspection-order-handle ref="modalFormInspectionOrderXq" :selectShenpiData="selectInspectionOrderXqData"/>
+
+ <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal" :selectShenpiData="selectWeekMaintenanceData"/>
+
+ <repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectRepairOrderData"/>
</a-card>
</template>
@@ -90,11 +101,15 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
import InspectionOrderHandle from './InspectionOrder/InspectionOrderHandle'
+ import WeekMaintenanceApprovalModal from './weekMaintenance/WeekMaintenanceApprovalModal'
+ import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal'
export default {
name: 'NcDeviceCharactersList',
mixins: [JeecgListMixin, mixinDevice],
components: {
+ RepairOrderApprovalModal,
+ WeekMaintenanceApprovalModal,
InspectionOrderHandle,
JDictSelectTag
},
@@ -162,9 +177,9 @@
list: '/assign/flow/finishedList'
},
dictOptions: {},
- selectShenpiData: {},
- selectDispatchFileXqData: {},
- selectInspectionOrderXqData: {}
+ selectWeekMaintenanceData: {},
+ selectInspectionOrderXqData: {},
+ selectRepairOrderData: {}
}
},
created() {
@@ -188,6 +203,9 @@
case 'WEEK_MAINTENANCE':
this.handleWeekMaintenance(item)
break
+ case 'eam_repair':
+ this.handleRepairOrder(item)
+ break
default:
alert('娌℃壘鍒拌娴佺▼')
}
@@ -199,8 +217,11 @@
return result
},
- handleWeekMaintenance() {
-
+ handleWeekMaintenance(record) {
+ this.selectWeekMaintenanceData = Object.assign({}, record)
+ this.$refs.weekMaintenanceApprovalModal.handleDetail(record)
+ this.$refs.weekMaintenanceApprovalModal.title = '璇︽儏'
+ this.$refs.weekMaintenanceApprovalModal.disableSubmit = true
},
handInspectionOrder(record) {
@@ -220,6 +241,24 @@
processInstanceId: procInsId
})
this.$refs.modalFormInspectionOrderXq.getBasicInformation(record)
+ },
+
+ /**
+ * 鐐瑰嚮璁惧缁翠慨鍒嗙被娴佺▼璇︽儏鏃惰Е鍙�
+ * @param record
+ */
+ handleRepairOrder(record) {
+ this.selectRepairOrderData = Object.assign({}, record)
+ const { procInsId, taskName } = this.selectRepairOrderData
+ this.$refs.repairOrderApprovalModal.visible = true
+ this.$refs.repairOrderApprovalModal.disableSubmit = true
+ this.$refs.repairOrderApprovalModal.title = taskName
+ this.$refs.modalFormInspectionOrderXq.getAllApproveData({
+ ...record,
+ procInstId: procInsId,
+ processInstanceId: procInsId
+ })
+ this.$refs.repairOrderApprovalModal.getBasicInformation(record)
}
}
}
--
Gitblit v1.9.3