From e0c3ec75023a48fefe14a1f5ad11ebe50ec44afa Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 25 七月 2024 10:21:51 +0800
Subject: [PATCH] 钢化模块解决bug
---
UI-Project/src/views/ReportWork/reportWork.vue | 57 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index 1b280e6..f28dac1 100644
--- a/UI-Project/src/views/ReportWork/reportWork.vue
+++ b/UI-Project/src/views/ReportWork/reportWork.vue
@@ -25,26 +25,26 @@
<el-button type="success">鎶ュ伐</el-button>
<el-table height="100%" ref="table" :data="reportData"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
- <el-table-column prop="reportData.line" align="center" label="绾胯矾" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="宸ュ簭" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="鐜荤拑id" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="宸ョ▼鍙�" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="閽㈠寲鐗堝浘id" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="鐢熶骇鏃堕棿" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="澶囨敞" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="绫诲瀷" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="鐘舵��" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="娴佺▼鍗�" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="搴忓彿" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="灞�" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="鐮存崯绫诲瀷" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="鐮存崯鍘熷洜" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="璐ｄ换宸ュ簭" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="璐ｄ换浜哄憳" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="璐ｄ换鐝粍" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="璐ｄ换璁惧" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="鎶ュ伐鐝粍" min-width="120" />
- <el-table-column prop="reportData.line" align="center" label="鎶ュ伐璁惧" min-width="120" />
+ <el-table-column prop="teamsGroupsName" align="center" label="鎶ュ伐鐝粍" min-width="120" />
+ <el-table-column prop="deviceName" align="center" label="鎶ュ伐璁惧" min-width="120" />
+ <el-table-column prop="line" align="center" label="绾胯矾" min-width="120" />
+ <el-table-column prop="workingProcedure" align="center" label="宸ュ簭" min-width="120" />
+ <el-table-column prop="glassId" align="center" label="鐜荤拑id" min-width="120" />
+ <el-table-column prop="engineerId" align="center" label="宸ョ▼鍙�" min-width="120" />
+ <el-table-column prop="temperingLayoutId" align="center" label="閽㈠寲鐗堝浘id" min-width="120" />
+ <el-table-column prop="damageTime" align="center" label="鐢熶骇鏃堕棿" min-width="120" />
+ <el-table-column prop="type" align="center" label="绫诲瀷" min-width="120" />
+ <el-table-column prop="status" align="center" label="鐘舵��" min-width="120" />
+ <el-table-column prop="processId" align="center" label="娴佺▼鍗�" min-width="120" />
+ <el-table-column prop="orderNumber" align="center" label="搴忓彿" min-width="120" />
+ <el-table-column prop="technologyNumber" align="center" label="灞�" min-width="120" />
+ <el-table-column prop="breakageType" align="center" label="鐮存崯绫诲瀷" min-width="120" />
+ <el-table-column prop="breakageReason" align="center" label="鐮存崯鍘熷洜" min-width="120" />
+ <el-table-column prop="responsibleProcess" align="center" label="璐ｄ换宸ュ簭" min-width="120" />
+ <el-table-column prop="responsiblePersonnel" align="center" label="璐ｄ换浜哄憳" min-width="120" />
+ <el-table-column prop="responsibleTeam" align="center" label="璐ｄ换鐝粍" min-width="120" />
+ <el-table-column prop="responsibleEquipment" align="center" label="璐ｄ换璁惧" min-width="120" />
+ <el-table-column prop="remark" align="center" label="澶囨敞" min-width="120" />
</el-table>
</div>
</template>
@@ -58,9 +58,9 @@
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
const report = ref({
- type: '',
- status: '',
- workingProcedure: '',
+ type: '0',
+ status: '0',
+ workingProcedure: '0',
});
const reportData = ref([])
const timeRange = ref(["2022-01-01", "2022-01-01"])
@@ -68,8 +68,7 @@
// 鏌ヨ鏁版嵁
const selectReportData = async () => {
- console.log(timeRange.value[0])
- const response = await request.post("/loadGlass/damage/selectDamage", {
+ const response = await request.post("/cacheVerticalGlass/damage/selectDamage", {
startTime: timeRange.value[0],
endTime: timeRange.value[1],
type: report.value.type,
@@ -82,6 +81,14 @@
} else {
ElMessage.error(response.message);
}
+
+ const responses = await request.post("/cacheVerticalGlass/damage/insertDamage", {
+ glassId:"P24060403|3|6",
+ line:"2001",
+ workingProcedure:"鍐峰姞宸�",
+ remark:"",
+ status:"2"
+ })
};
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/screen`;
--
Gitblit v1.8.0