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/Daily3MaintenanceOrderList.vue | 71 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 19 deletions(-)
diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue
index 81fa62f..0ab4543 100644
--- a/src/views/eam/Daily3MaintenanceOrderList.vue
+++ b/src/views/eam/Daily3MaintenanceOrderList.vue
@@ -297,21 +297,31 @@
type="vertical"
/>
<a
- v-show="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == true "
@click="handleStoveDetection(record)"
v-has="'daily3MaintenanceOrder:StoveCategory'"
>鐐夌被妫�娴�</a>
+ <!-- v-show="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')" -->
<a-divider
- v-show="record.status === '5'&& record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show=" record.status === '5' && record.isNotStoveCategoryFlag == true "
type="vertical"
/>
<a
- v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '0'"
+ v-show=" record.status === '5' && record.isNotStoveCategoryFlag == true "
+ @click="handleStoveReport(record)"
+ v-has="'daily3MaintenanceOrder:StoveCategoryReport'"
+ >鐐夌被鎶ュ憡</a>
+ <a-divider
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == true "
+ type="vertical"
+ />
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters != '1'"
@click="handleTechnologyStatus(record)"
v-has="'daily3MaintenanceOrder:TechnologyStatus'"
>鎶�鏈姸鎬侀壌瀹�</a>
<a-divider
- v-show="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '0' "
+ v-show="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters != '1'"
type="vertical"
/>
<a
@@ -367,10 +377,10 @@
</a-table>
</div>
- <maintenance-order-modal
+ <maintenance-order3-modal
ref="modalForm"
@ok="modalFormOk"
- ></maintenance-order-modal>
+ ></maintenance-order3-modal>
<finish-devolution-modal
ref="FinishDevolutionModal"
@ok="modalFormOk"
@@ -387,6 +397,10 @@
ref="StoveCategoryModal"
@ok="modalFormOk"
></stove-category-modal>
+ <stove-category-report-modal
+ ref="StoveCategoryReportModal"
+ @ok="modalFormOk"
+ ></stove-category-report-modal>
<maintenance-order-assign-modal
ref="MaintenanceOrderAssignModal"
@ok="modalFormOk"
@@ -399,6 +413,10 @@
ref="EquipmentTechnologyStatusModal"
@ok="modalFormOk"
></equipment-technology-status-modal>
+ <technology-status-authenticate-modal
+ ref="TechnologyStatusAuthenticateModal"
+ @ok="modalFormOk"
+ ></technology-status-authenticate-modal>
<maintenance-3-receipt-modal
ref="Maintenance3ReceiptModal"
@ok="modalFormOk"
@@ -411,14 +429,16 @@
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import MaintenanceOrderModal from './modules/dailyMaintenanceOrder/MaintenanceOrderModal'
+import MaintenanceOrder3Modal from './modules/daily3MaintenanceOrder/MaintenanceOrder3Modal'
import FinishDevolutionModal from './modules/dailyMaintenanceOrder/FinishDevolutionModal'
import MaintenanceOrderChangeModal from './modules/dailyMaintenanceOrder/MaintenanceOrderChangeModal'
import EquipmentPrecisionCheckOrderModal from './modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal'
import StoveCategoryModal from './modules/daily3MaintenanceOrder/StoveCategoryModal'
+import StoveCategoryReportModal from './modules/daily3MaintenanceOrder/StoveCategoryReportModal'
import MaintenanceOrderAssignModal from './modules/dailyMaintenanceOrder/MaintenanceOrderAssignModal'
import DailyMaintenanceOrderExeDrawer from './modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer'
import EquipmentTechnologyStatusModal from './modules/daily3MaintenanceOrder/EquipmentTechnologyStatusModal'
+import TechnologyStatusAuthenticateModal from './modules/daily3MaintenanceOrder/TechnologyStatusAuthenticateModal'
import Maintenance3ReceiptModal from './modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue'
import { getAction, postAction, requestPut } from '@/api/manage'
import JEllipsis from "@/components/jeecg/JEllipsis";
@@ -427,14 +447,16 @@
name: 'DailyMaintenanceOrderList',
mixins: [JeecgListMixin, mixinDevice],
components: {
- MaintenanceOrderModal,
+ MaintenanceOrder3Modal,
FinishDevolutionModal,
MaintenanceOrderAssignModal,
EquipmentPrecisionCheckOrderModal,
DailyMaintenanceOrderExeDrawer,
MaintenanceOrderChangeModal,
StoveCategoryModal,
+ StoveCategoryReportModal,
EquipmentTechnologyStatusModal,
+ TechnologyStatusAuthenticateModal,
Maintenance3ReceiptModal,
JEllipsis
},
@@ -525,12 +547,12 @@
// align: "center",
// dataIndex: 'workingHourQuota'
// },
- // {
- // title: '璁″垝寮�濮嬫椂闂�',
- // align: "center",
- // dataIndex: 'planStartTime',
- // //width: '120px',
- // },
+ {
+ title: '璁″垝寮�濮嬫椂闂�',
+ align: "center",
+ dataIndex: 'planStartTime',
+ //width: '120px',
+ },
// {
// title: '璁″垝缁撴潫鏃堕棿',
// align: "center",
@@ -555,9 +577,9 @@
// dataIndex: 'actualWorkingHourQuota',
// },
{
- title: '鎵ц浜�',
+ title: '鎶ュ伐浜�',
align: "center",
- dataIndex: 'maintenanceUserName'
+ dataIndex: 'maintenanceUserId'
},
{
title: '闂鍙婄浉搴斿鐞嗘帾鏂芥弿杩�',
@@ -683,9 +705,13 @@
},
handleTechnologyStatus: function (record) {
- this.$refs.EquipmentTechnologyStatusModal.edit(record);
- this.$refs.EquipmentTechnologyStatusModal.title = "鎶�鏈姸鎬佺紪杈�";
- this.$refs.EquipmentTechnologyStatusModal.disableSubmit = false;
+ // this.$refs.EquipmentTechnologyStatusModal.edit(record);
+ // this.$refs.EquipmentTechnologyStatusModal.title = "鎶�鏈姸鎬佺紪杈�";
+ // this.$refs.EquipmentTechnologyStatusModal.disableSubmit = false;
+ this.$refs.TechnologyStatusAuthenticateModal.edit(record);
+ this.$refs.TechnologyStatusAuthenticateModal.title = "鎶�鏈姸鎬佺紪杈�";
+ this.$refs.TechnologyStatusAuthenticateModal.disableSubmit = false;
+
},
handleStoveDetection: function (record) {
@@ -693,6 +719,13 @@
this.$refs.StoveCategoryModal.title = "娓╁害鍧囧寑鎬ф娴嬫潯浠剁‘璁よ〃";
this.$refs.StoveCategoryModal.disableSubmit = false;
},
+ handleStoveReport: function (record) {
+ this.$refs.StoveCategoryReportModal.add();
+ this.$refs.StoveCategoryReportModal.title = "鐐夌被璁惧鎶ュ憡涓婁紶";
+ this.$refs.StoveCategoryReportModal.disableSubmit = false;
+ this.$refs.StoveCategoryReportModal.maintenanceStandardId = record.id
+ this.$refs.StoveCategoryReportModal.equipmentId = record.equipmentId
+ },
handleOrderChange: function (record) {
this.$refs.MaintenanceOrderChangeModal.edit(record);
--
Gitblit v1.9.3