~admin/HangZhouMes.git

			@@ -14,18 +14,17 @@
			import { useI18n } from 'vue-i18n'
			const { t } = useI18n()
			let language = ref(localStorage.getItem('lang') \|\| 'zh')


			const tableData = ref([])
			const slot = ref('')
			const requestData = {
			line: 2001
			};
			const now = new Date();
			const timeRange = ref([new Date(now.setHours(0, 0, 0, 0)), new Date(now.setHours(23, 59, 59, 999))])
			const timeRange = ref([])
			const selectValuesa = reactive([]);
			// request.post("/cacheGlass/taskCache/selectEdgTask",{
			// ...requestData,


			// }).then((res) => {
			// if (res.code == 200) {

			@@ -37,7 +36,7 @@

			// }
			// });


			// 磨边任务查询
			const setEdgGlassInfoRequest = async () => {
			let celllist=[]
			@@ -52,8 +51,7 @@
			stateList=[selectValuesa[1]];
			}
			}


			console.log(timeRange.value[0],timeRange.value[1]);
			const response = await request.post("/cacheGlass/edgGlassTaskInfo/setEdgGlassInfoRequest", {
			cellList: celllist,
			stateList: stateList,
			@@ -65,9 +63,9 @@
			} else {
			ElMessage.error(response.message);
			}


			}


			// 破损
			const open = async(row) => {
			try {
			@@ -83,10 +81,10 @@
			if (confirmResult === 'confirm') {
			// 用户点击了“是”，现在调用删除接口
			const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
			glassId: row.glass_id,
			controlsId: 8,
			line: 2001,
			machine: '冷加工',
			glassId: row.glassId,
			state: 8,
			line: row.line,
			workingProcedure: '磨边',
			})
			if (response.code === 200) {
			ElMessage.success(response.message);
			@@ -96,9 +94,9 @@
			// alert('删除失败：' + deleteResponse.message);
			}
			}
			} catch (error) {
			// 处理可能出现的错误，比如 ElMessageBox 抛出的异常等
			console.error('发生错误:', error);
			} catch (error) {
			// 处理可能出现的错误，比如 ElMessageBox 抛出的异常等
			console.error('发生错误:', error);
			}
			};
			// 拿走
			@@ -116,10 +114,10 @@
			if (confirmResult === 'confirm') {
			// 用户点击了“是”，现在调用删除接口
			const response = await request.post("/cacheGlass/edgStorageCage/edgReportStatus", {
			glassId: row.glass_id,
			controlsId: 9,
			line: 2001,
			machine: '冷加工',
			glassId: row.glassId,
			state: 9,
			line: row.line,
			workingProcedure: '磨边',
			})
			if (response.code === 200) {
			ElMessage.success(response.message);
			@@ -135,7 +133,7 @@
			}
			};
			let socket = null;
			const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlass`;
			const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/edgTasks`;
			// 定义消息处理函数，更新 receivedData 变量
			const handleMessage = (data) => {
			// 更新 tableData 的数据
			@@ -157,26 +155,27 @@
			<template>
			<div>
			<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
			<el-select v-model="selectValuesa[0]" filterable :placeholder="$t('请选择线路')" clearable>
			<el-option label="磨边一线" value="2001"></el-option>
			<el-option label="磨边二线" value="2002"></el-option>
			<el-select v-model="selectValuesa[0]" filterable :placeholder="$t('workOrder.cway')" clearable style="margin-left: 20px;margin-bottom: 10px;">
			<el-option :label="$t('workOrder.edgingone')" value="2001"></el-option>
			<el-option :label="$t('workOrder.edgingtwo')" value="2002"></el-option>
			</el-select>

			<el-select v-model="selectValuesa[1]" filterable :placeholder="$t('请选择状态')" clearable >
			<el-option label="未磨边" value="0"></el-option>
			<el-option label="磨边中" value="1"></el-option>
			<el-option label="已磨边" value="2"></el-option>

			<el-select v-model="selectValuesa[1]" filterable :placeholder="$t('workOrder.cstate')" clearable style="margin-left: 20px;margin-bottom: 10px;" >
			<el-option :label="$t('workOrder.nedging')" value="0"></el-option>
			<el-option :label="$t('workOrder.edging')" value="1"></el-option>
			<el-option :label="$t('workOrder.finedging')" value="2"></el-option>
			</el-select>
			<span class="demonstration">时间段</span>
			<el-date-picker v-model="timeRange" type="datetimerange" range-separator="至" start-placeholder="开始日期"
			end-placeholder="结束日期">
			<span class="demonstration" style="margin-left: 20px;margin-bottom: 10px;">{{ $t('workOrder.time') }}</span>
			<el-date-picker v-model="timeRange" type="datetimerange" range-separator="至" :start-placeholder="$t('reportmanage.starttime')" style="margin-left: 20px;margin-bottom: 10px;" value-format = "YYYY-MM-DD hh:mm:ss"

			:end-placeholder="$t('reportmanage.endtime')">
			</el-date-picker>
			<el-button type="primary" style="margin-left: 10px;" @click="setEdgGlassInfoRequest()">{{
			<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="setEdgGlassInfoRequest()">{{
			$t('reportmanage.inquire')
			}}</el-button>


			<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
			<el-table height="240" ref="table"
			<el-table height="750" ref="table"
			@selection-change="handleSelectionChange"
			:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
			<el-table-column prop="glassId" align="center" :label="$t('workOrder.glassID')" min-width="180" />
			@@ -190,8 +189,8 @@
			{{ scope.row.status==0?"未磨边":scope.row.status==1?"磨边中":"已磨边" }}
			</template>
			</el-table-column>




			<el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200">
			<template #default="scope">
			<el-button size="mini" type="text" plain @click="open(scope.row)">{{ $t('workOrder.breakage') }}</el-button>
			@@ -203,7 +202,7 @@
			</el-card>
			</div>
			</template>


			<style scoped>
			#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
			#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}