From bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 10:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/ReportWork/reportWork.vue | 315 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 233 insertions(+), 82 deletions(-)
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index 69f60e3..c4229d1 100644
--- a/UI-Project/src/views/ReportWork/reportWork.vue
+++ b/UI-Project/src/views/ReportWork/reportWork.vue
@@ -1,56 +1,120 @@
<template>
<div style="height: 600px;">
- <div style="display: flex; flex-direction: row; align-items: center; margin-top: 20px;">
- <span style="margin-left: 10px;" class="demonstration">{{ $t('reportmanage.productiontime') }}</span>
- <el-date-picker style="margin-left: 10px;" v-model="timeRange" type="daterange" format="YYYY/MM/DD" value-format="YYYY-MM-DD"
- :start-placeholder="$t('reportmanage.starttime')" :end-placeholder="$t('reportmanage.endtime')" :default-time="defaultTime" />
- <el-select v-model="report.type" :placeholder="$t('reportmanage.ctype')" style="margin-left: 10px;" >
- <el-option :label="$t('reportmanage.all')" value="0"></el-option>
- <el-option :label="$t('reportmanage.completed')" value="1"></el-option>
- <el-option :label="$t('reportmanage.broke')" value="2"></el-option>
- <el-option :label="$t('reportmanage.takeout')" value="3"></el-option>
- </el-select>
- <el-select v-model="report.status" :placeholder="$t('reportmanage.cstate')" style="margin-left: 10px;" >
- <el-option :label="$t('reportmanage.all')" value="0"></el-option>
- <el-option :label="$t('reportmanage.dreportwork')" value="1"></el-option>
- <el-option :label="$t('reportmanage.pendingwork')" value="2"></el-option>
- <el-option :label="$t('reportmanage.reportwork')" value="3"></el-option>
- </el-select>
- <el-select v-model="report.workingProcedure" :placeholder="$t('reportmanage.cprocess')" style="margin-left: 10px;" >
- <el-option :label="$t('reportmanage.all')" value="0"></el-option>
- <el-option :label="$t('reportmanage.incise')" value="1"></el-option>
- <el-option :label="$t('reportmanage.edging')" value="2"></el-option>
- <el-option :label="$t('reportmanage.steel')" value="3"></el-option>
- </el-select>
- <el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('reportmanage.inquire') }}</el-button>
- <el-button type="success" style="margin-left: 10px;" >{{ $t('reportmanage.signingwork') }}</el-button>
- </div>
+ <div style="display: flex; flex-direction: row; align-items: center; margin-top: 20px;">
+ <span style="margin-left: 10px;" class="demonstration">{{ $t('reportmanage.productiontime') }}</span>
+ <el-date-picker style="margin-left: 10px;" v-model="timeRange" type="daterange" format="YYYY/MM/DD"
+ value-format="YYYY-MM-DD" :start-placeholder="$t('reportmanage.starttime')"
+ :end-placeholder="$t('reportmanage.endtime')" :default-time="defaultTime" />
+ <el-select v-model="report.type" :placeholder="$t('reportmanage.ctype')" style="margin-left: 10px;">
+ <!-- <el-option :label="$t('reportmanage.all')" value="0"></el-option> -->
+ <!-- <el-option :label="$t('reportmanage.completed')" value="1"></el-option> -->
+ <el-option :label="$t('reportmanage.broke')" value="8"></el-option>
+ <el-option :label="$t('reportmanage.takeout')" value="9"></el-option>
+ </el-select>
+ <el-select v-model="report.status" :placeholder="$t('reportmanage.cstate')" style="margin-left: 10px;">
+ <!-- <el-option :label="$t('reportmanage.all')" value="0"></el-option> -->
+ <el-option :label="$t('reportmanage.dreportwork')" value="1"></el-option>
+ <!-- <el-option :label="$t('reportmanage.pendingwork')" value="2"></el-option> -->
+ <el-option :label="$t('reportmanage.reportwork')" value="3"></el-option>
+ </el-select>
+ <el-select v-model="report.workingProcedure" :placeholder="$t('reportmanage.cprocess')"
+ style="margin-left: 10px;">
+ <el-option :label="$t('reportmanage.all')" value="0"></el-option>
+ <el-option :label="$t('reportmanage.incise')" value="鍒囧壊"></el-option>
+ <el-option :label="$t('reportmanage.edging')" value="纾ㄨ竟"></el-option>
+ <el-option :label="$t('reportmanage.steel')" value="閽㈠寲"></el-option>
+ </el-select>
+ <el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('reportmanage.inquire')
+ }}</el-button>
+ <el-button type="success" style="margin-left: 10px;" :disabled="(!selectedStatus)" @click="handleConfirm">{{
+ $t('reportmanage.signingwork')
+ }}</el-button>
+ </div>
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
- <el-table height="540" ref="table" :data="reportData"
- :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
- <el-table-column prop="teamsGroupsName" align="center" :label="$t('reportmanage.reporteam')" min-width="120" />
- <el-table-column prop="deviceName" align="center" :label="$t('reportmanage.reportingequipment')" min-width="120" />
- <el-table-column prop="line" align="center" :label="$t('reportmanage.line')" min-width="120" />
- <el-table-column prop="workingProcedure" align="center" :label="$t('reportmanage.process')" min-width="120" />
- <el-table-column prop="glassId" align="center" :label="$t('reportmanage.glassID')" min-width="120" />
- <el-table-column prop="engineerId" align="center" :label="$t('reportmanage.projectnumber')" min-width="120" />
- <el-table-column prop="temperingLayoutId" align="center" :label="$t('reportmanage.layoutID')" min-width="120" />
- <el-table-column prop="damageTime" align="center" :label="$t('reportmanage.productiontime')" min-width="120" />
- <el-table-column prop="type" align="center" :label="$t('reportmanage.type')" min-width="120" />
- <el-table-column prop="status" align="center" :label="$t('reportmanage.state')" min-width="120" />
- <el-table-column prop="processId" align="center" :label="$t('reportmanage.processcards')" min-width="120" />
- <el-table-column prop="orderNumber" align="center" :label="$t('reportmanage.number')" min-width="120" />
- <el-table-column prop="technologyNumber" align="center" :label="$t('reportmanage.layer')" min-width="120" />
- <el-table-column prop="breakageType" align="center" :label="$t('reportmanage.typebreakage')" min-width="120" />
- <el-table-column prop="breakageReason" align="center" :label="$t('reportmanage.causebreakage')" min-width="120" />
- <el-table-column prop="responsibleProcess" align="center" :label="$t('reportmanage.responsibleprocess')" min-width="120" />
- <el-table-column prop="responsiblePersonnel" align="center" :label="$t('reportmanage.responsiblepersonnel')" min-width="120" />
- <el-table-column prop="responsibleTeam" align="center" :label="$t('reportmanage.responsibleteam')" min-width="120" />
- <el-table-column prop="responsibleEquipment" align="center" :label="$t('reportmanage.responsibleequipment')" min-width="120" />
- <el-table-column prop="remark" align="center" :label="$t('reportmanage.remark')" min-width="120" />
- </el-table>
- </div>
+ <el-table height="740" ref="table" :data="reportData"
+ :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
+ <el-table-column prop="teamsGroupsName" align="center" :label="$t('reportmanage.reporteam')"
+ min-width="120" />
+ <el-table-column prop="deviceName" align="center" :label="$t('reportmanage.reportingequipment')"
+ min-width="120" />
+ <el-table-column prop="line" align="center" :label="$t('reportmanage.line')" min-width="120" />
+ <el-table-column prop="workingProcedure" align="center" :label="$t('reportmanage.process')" min-width="120" />
+ <el-table-column prop="glassId" align="center" :label="$t('reportmanage.glassID')" min-width="130" />
+ <el-table-column prop="engineerId" align="center" :label="$t('reportmanage.projectnumber')" min-width="120" />
+ <el-table-column prop="temperingLayoutId" align="center" :label="$t('reportmanage.layoutID')"
+ min-width="120" />
+ <el-table-column prop="damageTime" align="center" :label="$t('reportmanage.productiontime')"
+ min-width="230" />
+ <el-table-column prop="type" align="center" :label="$t('reportmanage.type')" min-width="120" />
+ <el-table-column prop="status" align="center" :label="$t('reportmanage.state')" min-width="120" />
+ <el-table-column prop="processId" align="center" :label="$t('reportmanage.processcards')" min-width="140" />
+ <el-table-column prop="orderNumber" align="center" :label="$t('reportmanage.number')" min-width="120" />
+ <el-table-column prop="technologyNumber" align="center" :label="$t('reportmanage.layer')" min-width="120" />
+ <el-table-column prop="breakageType" align="center" :label="$t('reportmanage.typebreakage')" min-width="180">
+ <template #default="{ row }">
+ <el-select v-model="row.breakageType" filterable :placeholder="$t('reportmanage.pcausebreakage')" :disabled="selectedType"
+ clearable @input="handleInputChangea($event, row.id)">
+ <el-option v-for="item in selectOptionsa" :key="item.basicName" :label="item.basicName"
+ :value="item.basicName" />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="breakageReason" align="center" :label="$t('reportmanage.causebreakage')"
+ min-width="180">
+ <template #default="{ row }">
+ <el-select v-model="row.breakageReason" filterable :placeholder="$t('reportmanage.ptypebreakage')" :disabled="selectedType"
+ clearable @input="handleInputChangea($event, row.id)">
+ <el-option v-for="item in selectOptionsb" :key="item.basicName" :label="item.basicName"
+ :value="item.basicName" />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" :label="$t('reportmanage.responsibleprocess')" min-width="120">
+ <template #default="{ row }">
+ <el-select v-model="row.responsibleProcess" filterable :placeholder="$t('reportmanage.ptypebreakage')" :disabled="selectedType"
+ clearable @input="handleInputChangea($event, row.id)">
+ <el-option value="鍒囧壊" label="鍒囧壊"></el-option>
+ <el-option value="纾ㄨ竟" label="纾ㄨ竟"></el-option>
+ <el-option value="閽㈠寲" label="閽㈠寲"></el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="responsiblePersonnel" align="center" :label="$t('reportmanage.responsiblepersonnel')"
+ min-width="180">
+ <template #default="{ row }">
+ <el-input :placeholder="$t('reportmanage.presponsiblepersonnel')" v-model="row.responsiblePersonnel" :disabled="selectedType"
+ autocomplete="off" />
+ </template>
+ </el-table-column>
+ <el-table-column prop="responsibleTeam" align="center" :label="$t('reportmanage.responsibleteam')"
+ min-width="180">
+ <template #default="{ row }">
+ <el-select v-model="row.responsibleTeam" filterable :placeholder="$t('reportmanage.presponsibleteam')" :disabled="selectedType"
+ clearable @input="handleInputChangea($event, row.id)">
+ <el-option v-for="item in selectOptionsc" :key="item.basicName" :label="item.basicName"
+ :value="item.basicName" />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="responsibleEquipment" align="center" :label="$t('reportmanage.responsibleequipment')" :disabled="selectedType"
+ min-width="180">
+ <template #default="{ row }">
+ <el-select v-model="row.responsibleEquipment" filterable
+ :placeholder="$t('reportmanage.presponsibleequipment')" clearable :disabled="selectedType"
+ @input="handleInputChangea($event, row.id)">
+ <el-option v-for="item in selectOptionsd" :key="item.basicName" :label="item.basicName"
+ :value="item.basicName" />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="remark" align="center" :label="$t('reportmanage.remark')" min-width="180">
+ <template #default="{ row }">
+ <el-input :placeholder="$t('reportmanage.premark')" v-model="row.remark" autocomplete="off" :disabled="selectedType" />
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
</el-card>
</div>
</template>
@@ -64,70 +128,157 @@
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
const report = ref({
- type: '0',
- status: '0',
+ type: '8',
+ status: '1',
workingProcedure: '0',
});
const reportData = ref([])
-const timeRange = ref(["2022-01-01", "2022-01-01"])
+const endDate = new Date();
+const startDate = new Date();
+startDate.setDate(endDate.getDate() - 7); // 鑾峰彇涓�涓槦鏈熷墠鐨勬椂闂�
+// 鏍煎紡鍖栦负 "YYYY-MM-DD" 鏍煎紡
+const formatDate = (date) => {
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+ const day = String(date.getDate()).padStart(2, '0');
+ return `${year}-${month}-${day}`;
+};
+
+const timeRange = ref([formatDate(startDate), formatDate(endDate)]);
+const selectOptionsa = ref([]);
+const selectOptionsb = ref([]);
+const selectOptionsc = ref([]);
+const selectOptionsd = ref([]);
+const selectValuesa = reactive({});
+const selectValuesb = reactive({});
+const selectValuesc = reactive({});
+const selectValuesd = reactive({});
+const selectValuese = reactive({});
+const inputValuesa = reactive({});
+const inputValuesb = reactive({});
+
+const selectedType = ref(true);
+const selectedStatus = ref(false);
// 鏌ヨ鏁版嵁
const selectReportData = async () => {
const response = await request.post("/cacheVerticalGlass/damage/selectDamage", {
startTime: timeRange.value[0],
- endTime: timeRange.value[1],
+ endTime: timeRange.value[1]+" 23:59:59",
type: report.value.type,
status: report.value.status,
workingProcedure: report.value.workingProcedure
})
+ if (report.value.type == 8) {
+ selectedType.value = false;
+ }else{
+ selectedType.value = true;
+ }
+ if (report.value.status == 1&&(report.value.type == 8||report.value.type == 1)) {
+ selectedStatus.value = true;
+ }else{
+ selectedStatus.value = false;
+ }
if (response.code === 200) {
reportData.value = response.data;
ElMessage.success(response.message);
+
} else {
ElMessage.error(response.message);
}
- const responses = await request.post("/cacheVerticalGlass/damage/insertDamage", {
- glassId:"P24060403|3|6",
- line:"2001",
- workingProcedure:"鍐峰姞宸�",
- remark:"",
- status:"2"
- })
+ // const responses = await request.post("/cacheVerticalGlass/damage/insertDamage", {
+ // glassId:"P24081502|1|1",
+ // line:"1001",
+ // workingProcedure:"鍒囧壊",
+ // remark:"",
+ // status:"0"
+ // })
};
+// 鎶ュ伐
+const handleConfirm = async () => {
+ const hasEmptyOrNullBreakType = reportData.value.some(
+ item => item.breakageType === null || item.breakageType === ''
+ || item.breakageReason === null || item.breakageReason === ''
+ || item.responsibleProcess === null || item.responsibleProcess === ''
+ || item.responsibleTeam === null || item.responsibleTeam === ''
+ || item.responsibleEquipment === null || item.responsibleEquipment === ''
+ );
+ if (hasEmptyOrNullBreakType&&selectedType.value==false) {
+ // 濡傛灉鎵惧埌浜嗘湭閫夋嫨椤癸紝鏄剧ず閿欒淇℃伅
+ ElMessage.error('璇峰～鍐欐墍鏈夌幓鐠冪殑鐮存崯淇℃伅');
+ } else {
+ const response = await request.post("/cacheVerticalGlass/damage/submitDamage", reportData.value)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
-const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/screen`;
-const handleMessage = (data) => {
- // adjustedRects.value = data.device[0].map(rect => ({
- // ...rect,
- // completed: rect.completedQuantity,
- // breakage: rect.breakageQuantity,
- // thisProcess: rect.thisProcess,
- // }));
};
-let socket;
+const fetchTableData = async () => {
+ try {
+ const response = await request.post('/cacheVerticalGlass/basic_data_produce/selectBasicDataProduceGroup');
+ if (response.code == 200) {
+ selectOptionsa.value = response.data.breakagetype.filter(item => item !== null)
+ .map(item => ({ basicName: item.basicName }));
+ selectOptionsb.value = response.data.breakagereason.filter(item => item !== null)
+ .map(item => ({ basicName: item.basicName }));
+ selectOptionsc.value = response.data.teamsgroups.filter(item => item !== null)
+ .map(item => ({ basicName: item.basicName }));
+ selectOptionsd.value = response.data.device.filter(item => item !== null)
+ .map(item => ({ basicName: item.basicName }));
+ } else {
+ ElMessage.warning(response.data);
+ }
+ } catch (error) {
+ console.error('Error fetching options:', error);
+ }
+};
+const handleInputChangea = (value, rowId) => {
+ // 鏇存柊瀵瑰簲琛岀殑 select 鍊�
+ selectValuesa[rowId] = value;
+ selectValuesb[rowId] = value;
+ selectValuesc[rowId] = value;
+ selectValuesd[rowId] = value;
+ selectValuese[rowId] = value;
+ inputValuesa[rowId] = value;
+ inputValuesb[rowId] = value;
+};
+fetchTableData();
+let socket = null;
+// const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/screen`;
+// const handleMessage = (data) => {
+// adjustedRects.value = data.device[0].map(rect => ({
+// ...rect,
+// completed: rect.completedQuantity,
+// breakage: rect.breakageQuantity,
+// thisProcess: rect.thisProcess,
+// }));
+// };
+// let socket;
onMounted(() => {
- socket = new WebSocket(socketUrl);
- socket.onmessage = (event) => {
- const data = JSON.parse(event.data);
+ // socket = new WebSocket(socketUrl);
+ // socket.onmessage = (event) => {
+ // const data = JSON.parse(event.data);
- // updateCharts();
- };
+ // // updateCharts();
+ // };
// };
});
-
-
-
-
onUnmounted(() => {
socket.close();
});
-
onMounted(() => {
- // fetchFlowCardId();
- // fetchTableData(); // 鑾峰彇鏁版嵁
- initializeWebSocket(socketUrl, handleMessage);
+ fetchTableData();
+ // socket = initializeWebSocket(socketUrl, handleMessage);
+});
+onUnmounted(() => {
+ if (socket) {
+ closeWebSocket(socket);
+ }
});
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
--
Gitblit v1.8.0