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/eam/RepairOrderList.vue | 78 ++++++++++++++++++++++++++++++++------
1 files changed, 65 insertions(+), 13 deletions(-)
diff --git a/src/views/eam/RepairOrderList.vue b/src/views/eam/RepairOrderList.vue
index fdf05fe..4e45b89 100644
--- a/src/views/eam/RepairOrderList.vue
+++ b/src/views/eam/RepairOrderList.vue
@@ -162,25 +162,56 @@
</a-form-item>
</a-col>
</a-row>
- <!-- <a-row :gutter="24">
- <a-col
- :xl="6"
- :lg="7"
- :md="8"
- :sm="24">
+ <a-row :gutter="24">
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
<a-form-item
- label="宸ュ尯"
+ label="ABC鏍囪瘑"
>
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨宸ュ尯"
+ placeholder="璇烽�夋嫨ABC鏍囪瘑"
:triggerChange="true"
- dictCode="mom_base_area,name,id,del_flag!='1'"
- v-model="queryParam.factoryModelId"
+ dictCode="ABC-standard-result"
+ v-model="queryParam.equipmentImportanceId"
/>
</a-form-item>
</a-col>
- </a-row> -->
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
+ <a-form-item label="鎶ヤ慨鏃堕棿">
+ <a-range-picker
+ style="width: 100%;"
+ format="YYYY-MM-DD HH:mm:ss"
+ v-model="faultTime"
+ @change="timeChange"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
+ <a-form-item label="鍒涘缓鏃堕棿">
+ <a-range-picker
+ style="width: 100%;"
+ format="YYYY-MM-DD HH:mm:ss"
+ v-model="createTimes"
+ @change="timeChangeCreate"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
</a-form>
</div>
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
@@ -216,6 +247,11 @@
@click="searchReset"
icon="reload"
>閲嶇疆</a-button>
+ <a-button
+ type="primary"
+ icon="download"
+ @click="handleExportXls('缁翠慨灞ュ巻')"
+ >瀵煎嚭</a-button>
<a-button
hidden
type="primary"
@@ -508,6 +544,7 @@
import FaultReportRepair from './modules/repairorder/moudles/select/FaultReportRepair.vue'
import store from '@/store'
import dayjs from 'dayjs'
+import moment from 'moment'
export default {
name: "RepairOrderList",
mixins: [JeecgListMixin],
@@ -536,6 +573,8 @@
return {
description: '缁翠慨宸ュ崟绠＄悊椤甸潰',
// 琛ㄥご
+ faultTime: [],
+ createTimes:[],
columns: [
{
title: '#',
@@ -553,6 +592,11 @@
dataIndex: 'specificEquipment',
width: 90,
scopedSlots: { customRender: 'specificEquipment' }
+ },
+ {
+ title: 'ABC鏍囪瘑',
+ align: "center",
+ dataIndex: 'equipmentImportanceId',
},
{
title: '鐘舵��',
@@ -800,8 +844,14 @@
},
methods: {
-
-
+ timeChange() {
+ this.queryParam.faultStartTime = moment(this.faultTime[0]).format("YYYY-MM-DD HH:mm:ss")
+ this.queryParam.faultEndTime = moment(this.faultTime[1]).format("YYYY-MM-DD HH:mm:ss")
+ },
+ timeChangeCreate(){
+ this.queryParam.createStartTime = moment(this.createTimes[0]).format("YYYY-MM-DD HH:mm:ss")
+ this.queryParam.createEndTime = moment(this.createTimes[1]).format("YYYY-MM-DD HH:mm:ss")
+ },
clickThenSelect(record) {
return {
on: {
@@ -966,6 +1016,8 @@
this.loadData(1)
this.onClearSelected()
this.$refs.FaultDescriptionList.faultId = '-1'
+ this.faultTime = []
+ this.createTimes=[]
},
getReports() {
this.$refs.FaultReportRepair.title = '鏁呴殰鎶ヤ慨鍗�';
--
Gitblit v1.9.3