From 50f6cb0f96f04f505b9493f7621d8e49ad5add9d Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期一, 04 十一月 2024 08:13:32 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6
---
Web/src/views/device/deviceInfo/index.vue | 189 ++++++++++++++++++++++++++++++++--------------
1 files changed, 131 insertions(+), 58 deletions(-)
diff --git a/Web/src/views/device/deviceInfo/index.vue b/Web/src/views/device/deviceInfo/index.vue
index d422c71..4965b80 100644
--- a/Web/src/views/device/deviceInfo/index.vue
+++ b/Web/src/views/device/deviceInfo/index.vue
@@ -89,34 +89,35 @@
<div >
<el-form label-position="right" label-width="40px" style="">
<el-form-item label="宸ヤ綅">
- <el-input v-model="stationValue.LocatNo" style="width: 200px; margin-right: 10px;"></el-input>
+ <el-input id="locaText" :disabled="lockInputStatus" v-model="stationValue.locatNo" style="width: 200px; margin-right: 10px;"></el-input>
+ <el-button @click="textLock(stationValue)">{{lockText}}</el-button>
<el-button @click="write('zidong',stationValue)">鑷姩</el-button>
<el-button @click="write('shoudong',stationValue)">鎵嬪姩</el-button>
- <el-button @click="write('huifu',stationValue)">鎶ヨ鎭㈠</el-button>
+ <el-button @mousedown="writeDown('huifu',stationValue)" @mouseup="writeUp('huifu',stationValue)">鎶ヨ鎭㈠</el-button>
</el-form-item>
<el-form-item>
- <el-button size="large" @mousedown="writeDown('1diandong',stationValue)" @mouseup="writeUp('1diandong',stationValue)">1鐐瑰姩</el-button>
- <el-button size="large" @mousedown="writeDown('2diandong',stationValue)" @mouseup="writeUp('2diandong',stationValue)">2鐐瑰姩</el-button>
- <el-button size="large" @mousedown="writeDown('3diandong',stationValue)" @mouseup="writeUp('3diandong',stationValue)">3鐐瑰姩</el-button>
- <el-button size="large" @mousedown="writeDown('4diandong',stationValue)" @mouseup="writeUp('4diandong',stationValue)">4鐐瑰姩</el-button>
+ <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('1diandong',stationValue)" @mouseup="writeUp('1diandong',stationValue)">1鐐瑰姩</el-button>
+ <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('2diandong',stationValue)" @mouseup="writeUp('2diandong',stationValue)">2鐐瑰姩</el-button>
+ <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('3diandong',stationValue)" @mouseup="writeUp('3diandong',stationValue)">3鐐瑰姩</el-button>
+ <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('4diandong',stationValue)" @mouseup="writeUp('4diandong',stationValue)">4鐐瑰姩</el-button>
</el-form-item>
<el-form-item>
- <el-button size="large" @mousedown="writeDown('1liandong',stationValue)" @mouseup="writeUp('1liandong',stationValue)">1鑱斿姩</el-button>
- <el-button size="large" @mousedown="writeDown('2liandong',stationValue)" @mouseup="writeUp('2liandong',stationValue)">2鑱斿姩</el-button>
- <el-button size="large" @mousedown="writeDown('3liandong',stationValue)" @mouseup="writeUp('3liandong',stationValue)">3鑱斿姩</el-button>
- <el-button size="large" @mousedown="writeDown('4liandong',stationValue)" @mouseup="writeUp('4liandong',stationValue)">4鑱斿姩</el-button>
+ <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('1liandong',stationValue)" @mouseup="writeUp('1liandong',stationValue)">1鑱斿姩</el-button>
+ <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('2liandong',stationValue)" @mouseup="writeUp('2liandong',stationValue)">2鑱斿姩</el-button>
+ <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('3liandong',stationValue)" @mouseup="writeUp('3liandong',stationValue)">3鑱斿姩</el-button>
+ <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('4liandong',stationValue)" @mouseup="writeUp('4liandong',stationValue)">4鑱斿姩</el-button>
</el-form-item>
<el-form-item>
- <el-button size="large" @mousedown="writeDown('yizaisheng',stationValue)" @mouseup="writeUp('yizaisheng',stationValue)">绉绘牻涓婂崌</el-button>
- <el-button size="large" @mousedown="writeDown('fanzhuansheng',stationValue)" @mouseup="writeUp('fanzhuansheng',stationValue)">缈昏浆鏈轰笂鍗�</el-button>
+ <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('yizaisheng',stationValue)" @mouseup="writeUp('yizaisheng',stationValue)">绉绘牻涓婂崌</el-button>
+ <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('fanzhuansheng',stationValue)" @mouseup="writeUp('fanzhuansheng',stationValue)">缈昏浆鏈轰笂鍗�</el-button>
</el-form-item>
<el-form-item>
- <el-button size="large" @mousedown="writeDown('yizaijiang',stationValue)" @mouseup="writeUp('yizaijiang',stationValue)">绉绘牻涓嬮檷</el-button>
- <el-button size="large" @mousedown="writeDown('fanzhuanjiang',stationValue)" @mouseup="writeUp('fanzhuanjiang',stationValue)">缈昏浆鏈轰笅闄�</el-button>
+ <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('yizaijiang',stationValue)" @mouseup="writeUp('yizaijiang',stationValue)">绉绘牻涓嬮檷</el-button>
+ <el-button size="large" :disabled="lockStatus" @mousedown="writeDown('fanzhuanjiang',stationValue)" @mouseup="writeUp('fanzhuanjiang',stationValue)">缈昏浆鏈轰笅闄�</el-button>
</el-form-item>
</el-form>
@@ -135,52 +136,52 @@
</el-col>
<el-col :span="6">
<el-form-item label="浠诲姟鍙�" >
- <el-input v-model="stationValue.TaskNo" style="width: 200px; "></el-input>
+ <el-input v-model="stationValue.taskNo" style="width: 200px; "></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎵樼洏鍙�">
- <el-input v-model="stationValue.PalletNo" style="width: 200px; margin-right: 10px;"></el-input>
+ <el-input v-model="stationValue.palletNo" style="width: 200px; margin-right: 10px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="璧峰宸ヤ綅">
- <el-input v-model="stationValue.StartLoction" style="width: 200px; margin-right: 10px;"></el-input>
+ <el-input v-model="stationValue.startLoction" style="width: 200px; margin-right: 10px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鐩爣宸ヤ綅">
- <el-input v-model="stationValue.EndLoction" style="width: 200px; margin-right: 10px;"></el-input>
+ <el-input v-model="stationValue.endLoction" style="width: 200px; margin-right: 10px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="璧峰鎺�">
- <el-input v-model="stationValue.StartPai" style="width: 200px; margin-right: 10px;"></el-input>
+ <el-input v-model="stationValue.startPai" style="width: 200px; margin-right: 10px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="璧峰鍒�">
- <el-input v-model="stationValue.StartLie" style="width: 200px; margin-right: 10px;"></el-input>
+ <el-input v-model="stationValue.startLie" style="width: 200px; margin-right: 10px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="璧峰灞�">
- <el-input v-model="stationValue.StartCeng" style="width: 200px; margin-right: 10px;"></el-input>
+ <el-input v-model="stationValue.startCeng" style="width: 200px; margin-right: 10px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鐩爣鎺�">
- <el-input v-model="stationValue.EndPai" style="width: 200px; margin-right: 10px;"></el-input>
+ <el-input v-model="stationValue.endPai" style="width: 200px; margin-right: 10px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鐩爣鍒�">
- <el-input v-model="stationValue.EndLie" style="width: 200px; margin-right: 10px;"></el-input>
+ <el-input v-model="stationValue.endLie" style="width: 200px; margin-right: 10px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鐩爣灞�">
- <el-input v-model="stationValue.EndCeng" style="width: 200px; margin-right: 10px;"></el-input>
+ <el-input v-model="stationValue.endCeng" style="width: 200px; margin-right: 10px;"></el-input>
</el-form-item>
</el-col>
@@ -198,32 +199,41 @@
<script lang="ts" setup>
import { ref, reactive, onMounted } from 'vue';
import { listStatus, listPosition } from '/@/api/wcs/wcsPlc';
-import { WriteInfo,WriteTaskInfo } from '/@/api/wcs/wcsDevice';
+import { GetLocationInfo,WriteLocationInfo,WriteInfo,WriteTaskInfo } from '/@/api/wcs/wcsDevice';
import { signalR } from './signalR';
import { cellsDataLine, cellsDataOne, cellsDataTwo, cellsDataThree } from './data';
import { ElMessage } from "element-plus";
+// export default{
+
+// }
const state = ref<any>({});
const stackers = ref<any>({});
const conveyors = ref<any>({});
+
+
+const lockText = ref("閿佸畾");
+const lockStatus = ref(true);
+const lockInputStatus = ref(false);
+
const stationValue = ref<any>({
- LocatNo: '',//宸ヤ綅
- Layer:'',//妤煎眰
- TypeName:'',//鎿嶄綔绫诲瀷鍚嶇О
- FuncName:'',//浜嬩欢缁撴灉 true/false
+ locatNo: '',//宸ヤ綅
+ layer:'',//妤煎眰
+ typeName:'',//鎿嶄綔绫诲瀷鍚嶇О
+ funcName:'',//浜嬩欢缁撴灉 true/false
- TaskNo:'',
- PalletNo:'',
- StartLoction:'',
- EndLoction:'',
- StartPai:'',
- StartLie:'',
- StartCeng:'',
- EndPai:'',
- EndLie:'',
- EndCeng:'',
+ taskNo:'',
+ palletNo:'',
+ startLoction:'',
+ endLoction:'',
+ startPai:'',
+ startLie:'',
+ startCeng:'',
+ endPai:'',
+ endLie:'',
+ endCeng:'',
});
-
+
// 鏌ヨ鐘舵��
const handleQuery = async () => {
@@ -376,16 +386,71 @@
}
}
+
+const textLock = async (row: any) => {
+ if(lockText.value == "閿佸畾"){
+ lockStatus.value=false;
+ lockInputStatus.value=true;
+ lockText.value ="瑙ｉ攣";
+ if (floorStates.value.isPlain1 == false) {
+ row.layer = 1;
+ }else if(floorStates.value.isPlain2 == false){
+ row.layer = 2;
+ }
+ else if(floorStates.value.isPlain3 == false){
+ row.layer = 3;
+ }
+ row.typeName = "suoding";
+
+ console.log(row);
+ var res = await WriteLocationInfo(row);
+ var res2 = await GetLocationInfo(row);
+ let rowData = JSON.parse(JSON.stringify(res2.data.result));
+ stationValue.value = res2.data.result;
+// stationValue.value = {
+// locatNo: '',//宸ヤ綅
+// layer:'',//妤煎眰
+// typeName:'',//鎿嶄綔绫诲瀷鍚嶇О
+// funcName:null,//浜嬩欢缁撴灉 true/false
+
+// taskNo:'',
+// palletNo:'',
+// startLoction:'',
+// endLoction:'',
+// startPai:'',
+// startLie:'',
+// startCeng:'',
+// endPai:'',
+// endLie:'',
+// endCeng:'',
+// }
+
+
+ console.log(res2.data.result);
+ console.log(rowData);
+
+ }else{
+ lockStatus.value=true;
+ lockInputStatus.value=false;
+ lockText.value ="閿佸畾";
+ }
+
+}
+
const write = async (type: string,row: any) => {
+ if (lockStatus.value == false) {
+ ElMessage.success("璇峰厛閿佸畾");
+ return;
+ }
if (floorStates.value.isPlain1 == false) {
- row.Layer = 1;
+ row.layer = 1;
}else if(floorStates.value.isPlain2 == false){
- row.Layer = 2;
+ row.layer = 2;
}
else if(floorStates.value.isPlain3 == false){
- row.Layer = 3;
+ row.layer = 3;
}
- row.TypeName = type;
+ row.typeName = type;
console.log(row);
var res = await WriteInfo(row);
@@ -394,32 +459,40 @@
}
const writeDown = async (type: string,row: any) => {
+ if (lockStatus.value == false) {
+ ElMessage.success("璇峰厛閿佸畾");
+ return;
+ }
if (floorStates.value.isPlain1 == false) {
- row.Layer = 1;
+ row.layer = 1;
}else if(floorStates.value.isPlain2 == false){
- row.Layer = 2;
+ row.layer = 2;
}
else if(floorStates.value.isPlain3 == false){
- row.Layer = 3;
+ row.layer = 3;
}
- row.TypeName = type;
- row.FuncName = "true";
+ row.typeName = type;
+ row.funcName = "true";
var res = await WriteInfo(row);
console.log(type+"鎸変笅浜嬩欢");
// ElMessage.success(res.data.result);
}
const writeUp = async (type: string,row: any) => {
+ if (lockStatus.value == false) {
+ ElMessage.success("璇峰厛閿佸畾");
+ return;
+ }
if (floorStates.value.isPlain1 == false) {
- row.Layer = 1;
+ row.layer = 1;
}else if(floorStates.value.isPlain2 == false){
- row.Layer = 2;
+ row.layer = 2;
}
else if(floorStates.value.isPlain3 == false){
- row.Layer = 3;
+ row.layer = 3;
}
- row.TypeName = type;
- row.FuncName = "false";
+ row.typeName = type;
+ row.funcName = "false";
var res = await WriteInfo(row);
console.log(type+"鎶捣浜嬩欢");
@@ -428,14 +501,14 @@
const writeTaskInfo = async (type: string,row: any) => {
if (floorStates.value.isPlain1 == false) {
- row.Layer = 1;
+ row.layer = 1;
}else if(floorStates.value.isPlain2 == false){
- row.Layer = 2;
+ row.layer = 2;
}
else if(floorStates.value.isPlain3 == false){
- row.Layer = 3;
+ row.layer = 3;
}
- row.TypeName = type;
+ row.typeName = type;
var res = await WriteTaskInfo(row);
console.log(type+"鎶捣浜嬩欢");
--
Gitblit v1.8.0