|
|
@ -115,7 +115,8 @@ import { getTxnRecord } from "@/services/txn"; |
|
|
|
import { useSettingStore } from "@/stores/setting"; |
|
|
|
import { useCraftStore } from "@/stores/craft"; |
|
|
|
import PhotoSvg from "@/assets/photo_icon.svg"; |
|
|
|
|
|
|
|
//设备的全局状态 |
|
|
|
const statusStore = useStatusStore(); |
|
|
|
const craftStore = useCraftStore(); |
|
|
|
const craftInfo = ref(craftStore.craftInfo); |
|
|
|
const settingStore = useSettingStore(); |
|
|
@ -143,8 +144,14 @@ watch( |
|
|
|
} |
|
|
|
} |
|
|
|
); |
|
|
|
//设备的全局状态 |
|
|
|
const statusStore = useStatusStore(); |
|
|
|
|
|
|
|
watch(()=>statusStore.status,(newVal)=>{ |
|
|
|
console.log('newVal---', newVal) |
|
|
|
if(newVal){ |
|
|
|
onUpateHeatAreaUI() |
|
|
|
} |
|
|
|
}) |
|
|
|
|
|
|
|
const heatAearStatusList = ref(statusStore.status?.heatArea || []); |
|
|
|
const heatList: any = ref([]); |
|
|
|
const craftVisible = ref(false); |
|
|
@ -152,7 +159,6 @@ let tubeList = reactive<any>([]); |
|
|
|
const selectedColor = "#4F85FB"; |
|
|
|
const emptyColor = "#FFFFFF"; |
|
|
|
const taskName = ref(""); |
|
|
|
let globeStatus: any = 0; |
|
|
|
onMounted(() => { |
|
|
|
//6个加热区数据 |
|
|
|
heatList.value = settingStore.heatAreaConfig.map((item:any) => { |
|
|
@ -173,11 +179,6 @@ onMounted(() => { |
|
|
|
//连接socket |
|
|
|
const wsClient = createWebSocket(sharedWsUrl); |
|
|
|
const subscription = wsClient.dataOb.subscribe((data) => { |
|
|
|
if(!globeStatus){//为了只输入一行,不想后台一直打印此处日志 TODO |
|
|
|
console.log('globeStatus====', data) |
|
|
|
} |
|
|
|
|
|
|
|
globeStatus = 1; |
|
|
|
if (data.type === "cmd") { |
|
|
|
const cmdInfo = getTxnRecord(data.data.commandId, "task"); |
|
|
|
if (cmdInfo) { |
|
|
@ -267,7 +268,6 @@ const onCraftStart = () => { |
|
|
|
//可能会选择多个加热区执行工艺, 批量发送指令 |
|
|
|
let hasCraft = true; |
|
|
|
let len = selectedTrayList.value.length; |
|
|
|
console.log('selectedTrayList---', selectedTrayList.value) |
|
|
|
for (let i = 0; i < len; i++) { |
|
|
|
let item = selectedTrayList.value[i]; |
|
|
|
if (!item.craftInfo) { |
|
|
@ -340,7 +340,6 @@ const onAddSolution = (data: any) => { |
|
|
|
ElMessage.error(res.msg); |
|
|
|
} |
|
|
|
}); |
|
|
|
globeStatus = 0; |
|
|
|
// tubeList.forEach((item: any) => { |
|
|
|
// if (ids.includes(item.id)) { |
|
|
|
// item.default = defaultColor; |
|
|
@ -453,6 +452,22 @@ const onMoveToHeat = () => { |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
//移至加热指令完成后更新加热区UI |
|
|
|
const onUpateHeatAreaUI = () => { |
|
|
|
//1、是否选择了加热区 |
|
|
|
if (!selectedTrayList.value.length) { |
|
|
|
ElMessage.error("请选择目标加热区"); |
|
|
|
return; |
|
|
|
} |
|
|
|
//2、只能选择一个加热区 |
|
|
|
if (selectedTrayList.value.length != 1) { |
|
|
|
ElMessage.error("只能选择一个加热区"); |
|
|
|
return; |
|
|
|
} |
|
|
|
let selectedDataItem = selectedTrayList.value[0]; |
|
|
|
//指令完成成更新UI |
|
|
|
let list = [...heatList.value]; |
|
|
|
list.forEach((item: any) => { |
|
|
@ -468,7 +483,8 @@ const onMoveToHeat = () => { |
|
|
|
item.default = ""; |
|
|
|
}); |
|
|
|
heatList.value = [...list]; |
|
|
|
}; |
|
|
|
console.log('heatList.value---', heatList.value) |
|
|
|
} |
|
|
|
|
|
|
|
//移至加液区(操作区) |
|
|
|
const currentSelectedTube = ref({}); |
|
|
@ -500,6 +516,7 @@ const onMoveToOperationArea = () => { |
|
|
|
heatList.value.forEach((item: any) => { |
|
|
|
if (item.id == selectedDataItem.id) { |
|
|
|
tubeList = [...item.tubeList]; |
|
|
|
item.isSelect = false; |
|
|
|
} |
|
|
|
}); |
|
|
|
onSelectedTray(selectedDataItem, "isMove"); |
|
|
|