diff --git a/src/views/coalFeeding.vue b/src/views/coalFeeding.vue index 3ccaa8c..f672444 100644 --- a/src/views/coalFeeding.vue +++ b/src/views/coalFeeding.vue @@ -108,7 +108,9 @@ {{ item.team }} -
+
{{ item.tempera2 }} °C @@ -201,12 +201,15 @@ :id="getTempDropId('tempera1', item, index)" class="control-panel__cell control-panel__cell--temp" @dragover="onDjDragOver" - @drop="onDjDrop($event, item, getTempDropId('tempera1', item, index))" + @drop="onDjDrop($event, item, getTempDropId('tempera1', item, index),index)" > {{ item.tempera1 }} °C
-
+
([ @@ -427,7 +428,7 @@ const dataList = reactive([ statusAuto: true, team_top: { run_time_sec: 3, - top_time_sec: 55, + stop_time_sec: 55, acc_time_sec: 55, bl_time_sec: 3, dianji: [ @@ -459,7 +460,7 @@ const dataList = reactive([ }, team_bottom: { run_time_sec: 3, - top_time_sec: 55, + stop_time_sec: 55, acc_time_sec: 58, bl_time_sec: 3, dianji2: [ @@ -501,7 +502,7 @@ const dataList = reactive([ statusAuto: true, team_top: { run_time_sec: 2, - top_time_sec: 120, + stop_time_sec: 120, acc_time_sec: 57, bl_time_sec: 40, dianji: [ @@ -533,7 +534,7 @@ const dataList = reactive([ }, team_bottom: { run_time_sec: 3, - top_time_sec: 120, + stop_time_sec: 120, acc_time_sec: 57, bl_time_sec: 40, dianji2: [ @@ -575,7 +576,7 @@ const dataList = reactive([ statusAuto: true, team_top: { run_time_sec: 2, - top_time_sec: 480, + stop_time_sec: 480, acc_time_sec: 58, bl_time_sec: 40, dianji: [ @@ -607,7 +608,7 @@ const dataList = reactive([ }, team_bottom: { run_time_sec: 2, - top_time_sec: 480, + stop_time_sec: 480, acc_time_sec: 58, bl_time_sec: 40, dianji2: [ @@ -649,7 +650,7 @@ const dataList = reactive([ statusAuto: true, team_top: { run_time_sec: 2, - top_time_sec: 240, + stop_time_sec: 240, acc_time_sec: 59, bl_time_sec: 38, dianji: [ @@ -681,7 +682,7 @@ const dataList = reactive([ }, team_bottom: { run_time_sec: 2, - top_time_sec: 240, + stop_time_sec: 240, acc_time_sec: 59, bl_time_sec: 38, dianji2: [ @@ -723,7 +724,7 @@ const dataList = reactive([ statusAuto: true, team_top: { run_time_sec: 3, - top_time_sec: 120, + stop_time_sec: 120, acc_time_sec: 60, bl_time_sec: 38, dianji: [ @@ -755,7 +756,7 @@ const dataList = reactive([ }, team_bottom: { run_time_sec: 3, - top_time_sec: 120, + stop_time_sec: 120, acc_time_sec: 60, bl_time_sec: 38, dianji2: [ @@ -797,7 +798,7 @@ const dataList = reactive([ statusAuto: true, team_top: { run_time_sec: 2, - top_time_sec: 240, + stop_time_sec: 240, acc_time_sec: 57, bl_time_sec: 36, dianji: [ @@ -829,7 +830,7 @@ const dataList = reactive([ }, team_bottom: { run_time_sec: 2, - top_time_sec: 240, + stop_time_sec: 240, acc_time_sec: 57, bl_time_sec: 36, dianji2: [ @@ -871,7 +872,7 @@ const dataList = reactive([ statusAuto: true, team_top: { run_time_sec: 2, - top_time_sec: 180, + stop_time_sec: 180, acc_time_sec: 60, bl_time_sec: 36, dianji: [ @@ -903,7 +904,7 @@ const dataList = reactive([ }, team_bottom: { run_time_sec: 2, - top_time_sec: 180, + stop_time_sec: 180, acc_time_sec: 60, bl_time_sec: 36, dianji2: [ @@ -945,7 +946,7 @@ const dataList = reactive([ statusAuto: true, team_top: { run_time_sec: 2, - top_time_sec: 90, + stop_time_sec: 90, acc_time_sec: 60, bl_time_sec: 36, dianji: [ @@ -977,7 +978,7 @@ const dataList = reactive([ }, team_bottom: { run_time_sec: 2, - top_time_sec: 90, + stop_time_sec: 90, acc_time_sec: 60, bl_time_sec: 36, dianji2: [ @@ -1019,7 +1020,7 @@ const dataList = reactive([ statusAuto: true, team_top: { run_time_sec: 3, - top_time_sec: 90, + stop_time_sec: 90, acc_time_sec: 60, bl_time_sec: 36, dianji: [ @@ -1051,7 +1052,7 @@ const dataList = reactive([ }, team_bottom: { run_time_sec: 3, - top_time_sec: 90, + stop_time_sec: 90, acc_time_sec: 60, bl_time_sec: 36, dianji2: [ @@ -1093,7 +1094,7 @@ const dataList = reactive([ statusAuto: true, team_top: { run_time_sec: 2, - top_time_sec: 180, + stop_time_sec: 180, acc_time_sec: 60, bl_time_sec: 36, dianji: [ @@ -1125,7 +1126,7 @@ const dataList = reactive([ }, team_bottom: { run_time_sec: 2, - top_time_sec: 180, + stop_time_sec: 180, acc_time_sec: 60, bl_time_sec: 36, dianji2: [ @@ -1167,7 +1168,7 @@ const dataList = reactive([ statusAuto: true, team_top: { run_time_sec: 2, - top_time_sec: 480, + stop_time_sec: 480, acc_time_sec: 60, bl_time_sec: 36, dianji: [ @@ -1199,7 +1200,7 @@ const dataList = reactive([ }, team_bottom: { run_time_sec: 2, - top_time_sec: 480, + stop_time_sec: 480, acc_time_sec: 60, bl_time_sec: 36, dianji2: [ @@ -1241,7 +1242,7 @@ const dataList = reactive([ statusAuto: true, team_top: { run_time_sec: 3, - top_time_sec: 90, + stop_time_sec: 90, acc_time_sec: 59, bl_time_sec: 36, dianji: [ @@ -1273,7 +1274,7 @@ const dataList = reactive([ }, team_bottom: { run_time_sec: 3, - top_time_sec: 90, + stop_time_sec: 90, acc_time_sec: 59, bl_time_sec: 36, dianji2: [ @@ -1315,7 +1316,7 @@ const dataList = reactive([ statusAuto: true, team_top: { run_time_sec: 2, - top_time_sec: 60, + stop_time_sec: 60, acc_time_sec: 63, bl_time_sec: 36, dianji: [ @@ -1347,7 +1348,7 @@ const dataList = reactive([ }, team_bottom: { run_time_sec: 2, - top_time_sec: 60, + stop_time_sec: 60, acc_time_sec: 63, bl_time_sec: 36, dianji2: [ @@ -1389,7 +1390,7 @@ const dataList = reactive([ statusAuto: true, team_top: { run_time_sec: 2, - top_time_sec: 90, + stop_time_sec: 90, acc_time_sec: 65, bl_time_sec: 36, dianji: [ @@ -1409,7 +1410,7 @@ const dataList = reactive([ }, team_bottom: { run_time_sec: 2, - top_time_sec: 90, + stop_time_sec: 90, acc_time_sec: 65, bl_time_sec: 36, dianji2: [ @@ -1478,22 +1479,30 @@ const updateCellValue = (item: CoalUnit, row: BlockRowConfig, event: Event) => { const onPointDragStart = (event: DragEvent, point: PointItem) => { if (event.dataTransfer) { event.dataTransfer.setData('text/plain', JSON.stringify(point)); + console.log('start000000000'); + console.log('event.dataTransfer.getData("text/plain"):', JSON.parse(event.dataTransfer.getData("text/plain"))); } }; const onDjDragOver = (event: DragEvent) => { + console.log('over1111111111111'); event.preventDefault(); if (event.dataTransfer) { event.dataTransfer.dropEffect = "copy"; } }; const pendingPointUpdates = ref>([]); -const onDjDrop = (event: DragEvent, dropItem: any, temp: string) => { + +const onDjDrop = (event: DragEvent, dropItem: any, temp: string,index?:number) => { event.preventDefault(); if (!event.dataTransfer) return; const rawJson = event.dataTransfer.getData("text/plain"); if (!rawJson) return; const raw = JSON.parse(rawJson); const key = temp; + console.log('raw:', raw); + console.log('key:', key); + console.log('index:', index); + console.log('dropItem:', dropItem); const existing = pendingPointUpdates.value.find((item) => item.key === key); if (existing) { existing.value = String(raw.id); @@ -1501,6 +1510,7 @@ const onDjDrop = (event: DragEvent, dropItem: any, temp: string) => { pendingPointUpdates.value.push({ key, value: String(raw.id) }); } }; + const isUnitLocal = (unitName: string, _unitState?: boolean) => { return dataList .filter((item) => item.team.indexOf(unitName) > -1) @@ -1565,7 +1575,8 @@ const commitPointUpdates = () => { }; // 初始化WebSocket连接 const initWebSocket = () => { - ws.value = new WebSocket(`ws://10.0.11.74:60309/ws/public`); + // ws.value = new WebSocket(`ws://10.0.11.74:60309/ws/public`); + ws.value = new WebSocket(`ws://127.0.0.1:60309/ws/public`); ws.value.onmessage = (event) => { const data = JSON.parse(event.data); console.log('WebSocketdata:', data);