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/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue | 52 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
index db7ef0f..ede2781 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
@@ -19,6 +19,14 @@
type="primary"
v-has="'dailyInspectionOrder:SW'"
>寮�宸�</a-button>
+
+ <a-button
+ :style="{marginRight: '8px'}"
+ @click="handleNormalReport"
+ :disabled="buttonDistable"
+ type="primary"
+ v-has="'dailyInspectionOrder:normalReport'"
+ >缁撴灉鍏ㄩ儴姝ｅ父</a-button>
<a-button
:style="{marginRight: '8px'}"
@click="handleReport"
@@ -26,13 +34,6 @@
type="primary"
v-has="'dailyInspectionOrder:report'"
>鎶ュ伐</a-button>
- <a-button
- :style="{marginRight: '8px'}"
- @click="handleNormalReport"
- :disabled="buttonDistable"
- type="primary"
- v-has="'dailyInspectionOrder:normalReport'"
- >缁撴灉姝ｅ父骞舵姤宸�</a-button>
<a-button
:style="{marginRight: '8px'}"
@click="handleReset"
@@ -156,6 +157,16 @@
alt=""
style="max-width:80px;font-size: 12px;font-style: italic;"
/>
+ <!-- <j-dict-select-tag
+ v-if="col.dataIndex == 'inspectionProjectResult' "
+ allow-clear
+ @input="handleChange()"
+ :disabled="record.disabled"
+ :placeholder="'璇烽�夋嫨鐐规缁撴灉'"
+ :triggerChange="true"
+ style="width: 100%"
+ dictCode="inspection_project_result"
+ /> -->
<a-select
v-if="col.dataIndex == 'inspectionProjectResult' "
:value="text"
@@ -163,7 +174,6 @@
style="width: 100%"
:disabled="record.disabled"
>
- <!-- :options="record.inspectionCycles" -->
<a-select-option value="1">姝ｅ父</a-select-option>
<a-select-option value="2">寮傚父</a-select-option>
<a-select-option value="3">鏁呴殰鍋滄満</a-select-option>
@@ -507,7 +517,7 @@
this.loadData1(1)
},
loadData() {
- this.loadData1(1)
+ // this.loadData1(1)
},
getBackground() {
return "background-color:rgba(127, 127, 127,0.08)";
@@ -630,8 +640,20 @@
})
},
- //鎶ュ伐
+ //鎵�鏈夌粨鏋滄甯�
handleNormalReport() {
+ const that = this;
+ for (let i = 0; i < that.dataSource.length; i++) {
+ let o = this.dataSource[i]
+ o.inspectionProjectResult = "1"
+ o.abnormalDesc = ""
+ o.treatmentMeasure = null
+ }
+ },
+
+
+ //鎶ュ伐
+ handleNormalReport1() {
const that = this;
that.confirmLoading = true;
let formData = Object.assign(this.model);
@@ -757,11 +779,11 @@
// }
// } else {
target[column.dataIndex] = value;
- // if (value == "1") {
- // target['judgmentResult'] = "pass";
- // } else {
- // target['judgmentResult'] = "fail";
- // }
+ if (value == 1) {
+ target['abnormalDesc'] = null;
+ }
+ target['treatmentMeasure'] = null;
+
// if (value == null || value == "") {
// target['judgmentResult'] = "";
// }
--
Gitblit v1.9.3