From dd973f741617e3bbf5ecf11747ff71960991549c Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期二, 15 十月 2024 10:21:19 +0800
Subject: [PATCH] Merge branch 'master' into liudl
---
Web/src/views/device/sortPallet/index.vue | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/Web/src/views/device/sortPallet/index.vue b/Web/src/views/device/sortPallet/index.vue
index f88de32..698c6a7 100644
--- a/Web/src/views/device/sortPallet/index.vue
+++ b/Web/src/views/device/sortPallet/index.vue
@@ -18,13 +18,12 @@
<div class="card-container">
<el-card class="other-box-card" v-for="deviceInfo in devicePointData" :key="deviceInfo.id">
<div slot="header" class="linefix">
- <span>{{ deviceInfo.text }}</span>
- <div :class="['lineStatus', 'device-status-0']"></div>
- <!-- <div :class="['lineStatus', { 'device-status-0': deviceInfo.status === 0 }, { 'device-status-1': deviceInfo.status === 1 }]"></div> -->
+ <span>{{ deviceInfo.text }}</span>
+ <div :class="['lineStatus', { 'device-status-0': deviceInfo.plcStatus === true }, { 'device-status-1': deviceInfo.plcStatus === false }]"></div>
</div>
<div class="otherValuefix" >
<el-form label-position="left" label-width="90px">
- <el-form-item label="WMS鏄庣粏鍗曞彿">
+ <el-form-item label="WMS鏄庣粏鍗曞彿" v-if="deviceInfo.type==5">
<el-input v-model="deviceInfo.orderNo" readonly></el-input>
</el-form-item>
<el-form-item label="浠诲姟鍙�">
@@ -39,7 +38,7 @@
<el-form-item label="鐗╂枡鍚嶇О">
<el-input v-model="deviceInfo.skuName" readonly></el-input>
</el-form-item>
- <el-form-item label="鍒嗘嫞绾跨紪鍙�">
+ <el-form-item label="鍒嗘嫞绾跨紪鍙�" v-if="deviceInfo.type==5">
<el-input v-model="deviceInfo.lineNo" readonly></el-input>
</el-form-item>
<el-form-item label="缁戝畾鐘舵��">
@@ -51,18 +50,28 @@
<el-form-item label="鎵樼洏鍙�">
<el-input readonly></el-input>
</el-form-item>
- <el-form-item label="鎻掔爜鏁伴噺">
+ <el-form-item label="鎻掔爜绠辨暟" v-if="deviceInfo.type==5">
<el-input readonly></el-input>
- </el-form-item>
- <el-form-item label="鎵樼洏涓婄鏁伴噺">
+ </el-form-item>
+ <el-form-item label="鎷嗗灈绠辨暟" v-if="deviceInfo.type==6">
+ <el-input readonly></el-input>
+ </el-form-item>
+ <el-form-item label="鏁磋泛绠辨暟">
<el-input readonly></el-input>
</el-form-item>
- <el-form-item label="WMS涓嬪彂鏁伴噺">
+ <el-form-item label="瀹屾垚绠辨暟">
+ <el-input readonly></el-input>
+ </el-form-item>
+ <!-- <el-form-item label="WMS涓嬪彂鏁伴噺">
<el-input v-model="deviceInfo.qty" readonly></el-input>
- </el-form-item>
+ </el-form-item> -->
+ <el-form-item label="鐘舵��">
+ <el-input :value="deviceInfo.plcStatus ? '鍦ㄧ嚎' : '绂荤嚎'" readonly></el-input>
+ </el-form-item>
</el-form>
</div>
- <div v-if="!deviceInfo.text.includes('鎷嗗灈')" class="otherButtonfix">
+ <!-- 璁惧绫诲瀷涓虹爜鍨涙満鍣ㄤ汉 -->
+ <div v-if="deviceInfo.type==5" class="otherButtonfix">
<el-form label-position="left">
<el-form-item>
<el-button type="primary" @click="openBindDialog(deviceInfo.id)">缁戝畾</el-button>
@@ -99,10 +108,25 @@
</template>
<script lang="ts" setup>
-import { ref } from 'vue';
+import { ref, onMounted } from 'vue';
import { GetWcsPackPlcList,GetWcsPackStationPlcList,BindTaskForPLC,CloseTaskForPLC } from '/@/api/wcs/wcsDevice';
import { pageWcsOderTask } from '/@/api/device/wcsOderTask';
import { ElMessageBox,ElMessage } from 'element-plus';
+import { signalR,stopConnection } from './signalR';
+//杩炴帴signalR 鐩戝惉鍙樻洿
+onMounted(async () => {
+ signalR.off('PublicCheckTask');
+ signalR.on('PublicCheckTask', (data: any) => {
+ //todo 闇�瑕佹祴璇�
+ // if (data.type == 0) {
+
+ // }
+ var index = devicePointData.value.findIndex(s => s.id == data.id);
+ if (index !== -1) {
+ devicePointData.value.splice(index, 1, data);
+ }
+ });
+});
//璁惧鏁版嵁
const deviceList=ref<any>([]);
--
Gitblit v1.8.0