YiWuProject.git

			@@ -2,16 +2,11 @@
			<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-date-picker v-model="timeRange" type="datetimerange" range-separator="至" :start-placeholder="$t('reportmanage.starttime')"
			style="margin-left: 15px;" value-format = "YYYY-MM-DD hh:mm:ss"
			:end-placeholder="$t('reportmanage.endtime')">
			</el-date-picker>
			<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>
			@@ -156,6 +151,7 @@
			function parseAndSetTime() {
			const backendTime = new Date(globalDate);
			const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 减去7天
			oneWeekAgo.setHours(0, 0, 0, 0);
			console.log(formatTimestamp(oneWeekAgo));
			console.log(oneWeekAgo);
			timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];

			@@ -73,11 +73,17 @@
			let socket = null;
			const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
			const handleMessage = (data: any) => {
			tableDataa.value = data.list[0].slice(2, 4);
			if (data.list!=null) {
			tableDataa.value = data.list[0].slice(2, 4);
			const processedData = [...data.list[0].slice(2, 4)];
			if (processedData.length > 0) {
			processedData[0] = { ...processedData[0], workstationId: 1 };
			}
			if (processedData.length > 1) {
			processedData[1] = { ...processedData[1], workstationId: 2 };
			}
			tableDataa.value = processedData;
			}else {
			tableDataa.value = ''
			tableDataa.value = []
			}
			if (data.LoadTwoervice != null) {
			cuttingMachineStatusColor.value = data.LoadTwoervice[0] == 1 ? 'green' : '#911005';

	UI-Project/src/views/ReportWork/reportWork.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UI-Project/src/views/Returns/upreturns2.vue	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史