From 222efa89f74386c97cce2b0ea33d13b1ddbdb49e Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 10 九月 2025 15:43:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/maintenance/modules/EamSecondMaintenanceOrderBatchPrintModal.vue | 2
src/components/page/GlobalLayout.vue | 2
src/views/dashboard/WorkshopSectionSignage.vue | 81 ++++++----------------------------------
src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceFurnaceApprovalModal.vue | 2
4 files changed, 16 insertions(+), 71 deletions(-)
diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index 341ba4e..d579b1d 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -70,7 +70,7 @@
<!-- layout content -->
<a-layout-content
- :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' ,background: $route.meta.title=='棣栭〉'?'#FEFEFE':''}">
+ :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' ,background: $route.meta.title=='棣栭〉'?'#FDFDFD':''}">
<slot></slot>
</a-layout-content>
diff --git a/src/views/dashboard/WorkshopSectionSignage.vue b/src/views/dashboard/WorkshopSectionSignage.vue
index 4ff428c..976e442 100644
--- a/src/views/dashboard/WorkshopSectionSignage.vue
+++ b/src/views/dashboard/WorkshopSectionSignage.vue
@@ -7,31 +7,17 @@
</div>
<dv-border-box-9 style="padding: 15px 15px 0">
- <div id="tech_condition_chart" style="width:100%;height: 240px;"></div>
- <div id="warranty_malfunction_chart" style="width:100%;height: 240px;"></div>
- <div>
- <div style="display: flex;flex-direction:column;align-items: center">
- <dv-decoration-11
- style="width:45%;height:60px;color: rgba(0,0,0,.45);font-size: 20px;align-self: flex-start">涓変繚璁″垝
- </dv-decoration-11>
- <div class="support-plan-container">
- <div v-for="(item,index) in supportPlanList" :key="index" class="support-plan-item"
- :style="{background:item.backgroundColor}" @click="openMaintenanceModal(item)">
- <div>{{item.planTime}}</div>
- <div class="plan-value-container">
- <div class="plan-value">{{$data[item.planValueLabel]}}</div>
- <div>鍙�</div>
- </div>
+ <div id="tech_condition_chart" style="width:100%;height: 280px;"></div>
+ <div id="warranty_malfunction_chart" style="width:100%;height: 280px;"></div>
+ <div style="display: flex;flex-direction:column;align-items: center;margin-top: 40px">
+ <div class="support-plan-container">
+ <div v-for="(item,index) in supportPlanList" :key="index" class="support-plan-item"
+ :style="{background:item.backgroundColor}" @click="openMaintenanceModal(item)">
+ <div>{{item.planTime}}</div>
+ <div class="plan-value-container">
+ <div class="plan-value">{{$data[item.planValueLabel]}}</div>
+ <div>鍙�</div>
</div>
- </div>
- </div>
-
- <div style="display: flex;margin-top: 10px;justify-content: space-between;align-items: center;">
- <dv-decoration-11 style="width:45%;height:60px;font-size: 20px;color: rgba(0,0,0,.45)">浜屼繚璁″垝
- </dv-decoration-11>
- <div
- style="flex:1;text-align:center;font-size: 25px;color: rgba(0,0,0,.45);overflow: hidden;text-overflow: ellipsis;white-space: nowrap">
- 2024骞�4鏈�1鏃ュぇ淇�
</div>
</div>
</div>
@@ -365,46 +351,6 @@
signageApi.getEquipmentOEEMonthStatisticsApi(this.productionCode)
.then(res => {
if (res.success && res.result) {
- const res = {
- result: [
- {
- equipmentId: '2140311',
- overallEquipmentEfficiency: 12
- },
- {
- equipmentId: '2140511',
- overallEquipmentEfficiency: 32
- },
- {
- equipmentId: '2420011',
- overallEquipmentEfficiency: 15
- },
- {
- equipmentId: '2140023',
- overallEquipmentEfficiency: 62
- },
- {
- equipmentId: '2110011',
- overallEquipmentEfficiency: 46
- },
- {
- equipmentId: '2140211',
- overallEquipmentEfficiency: 75
- },
- {
- equipmentId: '2144011',
- overallEquipmentEfficiency: 86
- },
- {
- equipmentId: '2140021',
- overallEquipmentEfficiency: 97
- },
- {
- equipmentId: '2145031',
- overallEquipmentEfficiency: 57
- }
- ]
- }
this.barChartData = res.result.map(item => {
return {
name: item.equipmentId,
@@ -680,9 +626,9 @@
const equipmentIdObj = {
equipmentId: item.equipmentId,
equipmentName: item.equipmentName,
- openRate: 84,
- startRate: 70,
- utilizationRate: 42
+ openRate: 0,
+ startRate: 0,
+ utilizationRate: 0
}
this.first7DaysEfficiencyData.dataList.push(equipmentIdObj)
}
@@ -1384,7 +1330,6 @@
justify-content: space-around;
flex-wrap: wrap;
color: #fff;
- padding-top: 20px;
.support-plan-item {
border-radius: 3px;
diff --git a/src/views/eam/maintenance/modules/EamSecondMaintenanceOrderBatchPrintModal.vue b/src/views/eam/maintenance/modules/EamSecondMaintenanceOrderBatchPrintModal.vue
index f4b6b7d..f696db2 100644
--- a/src/views/eam/maintenance/modules/EamSecondMaintenanceOrderBatchPrintModal.vue
+++ b/src/views/eam/maintenance/modules/EamSecondMaintenanceOrderBatchPrintModal.vue
@@ -163,7 +163,7 @@
close() {
this.$emit('close')
this.visible = false
- this.$refs.form.clearValidate()
+ if (this.$refs.form) this.$refs.form.clearValidate()
}
}
}
diff --git a/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceFurnaceApprovalModal.vue b/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceFurnaceApprovalModal.vue
index 4a345d1..d240d81 100644
--- a/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceFurnaceApprovalModal.vue
+++ b/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceFurnaceApprovalModal.vue
@@ -243,7 +243,7 @@
getAction(this.url.queryById, { id: record.dataId })
.then(res => {
if (res.success) {
- that.model = Object.assign({ confirmDealType: '1' }, res.result)
+ that.model = Object.assign({}, res.result, { confirmDealType: '1' })
that.model.dataId = record.dataId
that.model.taskId = record.id
that.model.userId = record.assignee
--
Gitblit v1.9.3