From f4d696baffce9c3bd8653a3598eb69f0962a5e92 Mon Sep 17 00:00:00 2001
From: zy <zy@123>
Date: 星期四, 17 七月 2025 13:56:42 +0800
Subject: [PATCH] #
---
src/main/webapp/views/index.html | 149 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 143 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 24726ec..6402c85 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -18,19 +18,20 @@
<body>
<div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
- <div style="width: 50%;">
+ <div style="width: 40%;">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>妯℃嫙璁惧 - {{ systemInfo.gatewayId }}鍙风綉鍏�</span>
- <el-button style="float: right; padding: 3px 0" type="text" @click="addDeviceVisible = true">娣诲姞璁惧</el-button>
+<!-- <el-button style="float: right; padding: 3px 0" type="text" @click="addDeviceVisible = true">娣诲姞璁惧</el-button>-->
</div>
<div style="display: flex;flex-wrap: wrap;justify-content: space-between;">
<div v-for="item in deviceList" style="width: 49%;margin-top: 20px">
- <el-card class="box-card">
+ <el-card class="box-card" >
<div slot="header" class="clearfix">
<span>{{ item.deviceType }} - {{ item.deviceNo }}</span>
- <el-button style="float: right; padding: 3px 0" type="text" @click="delDevice(item)">鍒犻櫎璁惧</el-button>
+<!-- <el-button style="float: right; padding: 3px 0" type="text" @click="delDevice(item)">鍒犻櫎璁惧</el-button>-->
+ <el-button style="float: right; padding: 3px 0" type="text" @click="setCurrentDeviceConfig(item)">鐘舵��</el-button>
</div>
<div>
@@ -45,6 +46,58 @@
</el-card>
</div>
+ <div v-if="currentDeviceConfig != null" style="width: 30%;margin-left: 30px;">
+ <el-card class="box-card">
+ <div slot="header" class="clearfix">
+ <span>妯℃嫙璁惧鐘舵��</span>
+ </div>
+
+ <div style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+ <div v-if="currentDeviceData != null" style="width: 100%;margin-top: 20px">
+ <el-card class="box-card" >
+ <div slot="header" class="clearfix">
+ <span>{{ currentDeviceData.deviceType }} - {{ currentDeviceData.deviceNo }}</span>
+ <el-button v-if="currentDeviceDataForm == null" style="float: right; padding: 3px 0" type="text" @click="updateCurrentDeviceStatus(currentDeviceData)">鏇存柊鐘舵��</el-button>
+ <el-button v-else style="float: right; padding: 3px 0" type="text" @click="submitUpdateCurrentDeviceStatus(currentDeviceDataForm)">鎻愪氦鏇存柊</el-button>
+ </div>
+
+ <div v-if="currentDeviceDataForm == null">
+ <div>妯″紡: {{ currentDeviceData.data.mode }}</div>
+ <div>鐘舵��: {{ currentDeviceData.data.deviceStatus }}</div>
+ <div>椤跺崌: {{ currentDeviceData.data.hasLift }}</div>
+ <div>鎵樼洏: {{ currentDeviceData.data.hasPallet }}</div>
+ <div>鍧愭爣: {{ currentDeviceData.data.currentCode }}</div>
+ <div>寮傚父: {{ currentDeviceData.data.errorCode }}</div>
+ <div>鍏呯數: {{ currentDeviceData.data.hasCharge }}</div>
+ <div>鐢甸噺: {{ currentDeviceData.data.batteryPower }}</div>
+ <div>鐢靛帇: {{ currentDeviceData.data.batteryVoltage }}</div>
+ <div>杩愯鏂瑰悜: {{ currentDeviceData.data.runDirection }}</div>
+ <div>閫熷害: {{ currentDeviceData.data.speed }}</div>
+ </div>
+
+ <div v-else>
+ <div>妯″紡: <el-input v-model="currentDeviceDataForm.data.mode"></el-input></div>
+ <div>鐘舵��: <el-input v-model="currentDeviceDataForm.data.deviceStatus"></el-input></div>
+ <div>椤跺崌: <el-input v-model="currentDeviceDataForm.data.hasLift"></el-input></div>
+ <div>鎵樼洏: <el-input v-model="currentDeviceDataForm.data.hasPallet"></el-input></div>
+ <div>鍧愭爣: <el-input v-model="currentDeviceDataForm.data.currentCode"></el-input></div>
+ <div>寮傚父: <el-input v-model="currentDeviceDataForm.data.errorCode"></el-input></div>
+ <div>鍏呯數: <el-input v-model="currentDeviceDataForm.data.hasCharge"></el-input></div>
+ <div>鐢甸噺: <el-input v-model="currentDeviceDataForm.data.batteryPower"></el-input></div>
+ <div>鐢靛帇: <el-input v-model="currentDeviceDataForm.data.batteryVoltage"></el-input></div>
+ <div>杩愯鏂瑰悜: <el-input v-model="currentDeviceDataForm.data.runDirection"></el-input></div>
+ <div>閫熷害: <el-input v-model="currentDeviceDataForm.data.speed"></el-input></div>
+ </div>
+
+ <div>
+ 鍘熷鏁版嵁锛�
+ {{ currentDeviceData }}
+ </div>
+ </el-card>
+ </div>
+ </div>
+ </el-card>
+ </div>
<el-dialog title="娣诲姞妯℃嫙璁惧" :visible.sync="addDeviceVisible">
<el-form :model="addDeviceParam">
@@ -88,7 +141,10 @@
gatewayPort: 0
},
formLabelWidth: '120px',
- deviceList: []
+ deviceList: [],
+ currentDeviceConfig: null,
+ currentDeviceData: null,
+ currentDeviceDataForm: null
},
created() {
this.init()
@@ -99,7 +155,8 @@
setInterval(() => {
this.getDeviceList()
- }, 100);
+ this.getFakeThreadStatus()
+ }, 1000);
},
getSystemInfo() {
let that = this;
@@ -125,6 +182,86 @@
}
});
},
+ setCurrentDeviceConfig(deviceConfig) {
+ this.currentDeviceConfig = deviceConfig
+ this.currentDeviceDataForm = null;
+ },
+ updateCurrentDeviceStatus(currentDeviceData) {
+ if (this.currentDeviceDataForm == null) {
+ this.currentDeviceDataForm = currentDeviceData;
+ }else {
+ this.currentDeviceDataForm = null;
+ }
+ },
+ submitUpdateCurrentDeviceStatus(currentDeviceDataForm) {
+ let that = this;
+ $.ajax({
+ url: baseUrl + "/open/updateFakeThreadStatus",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: JSON.stringify({
+ deviceType: currentDeviceDataForm.deviceType,
+ deviceNo: currentDeviceDataForm.deviceNo,
+ data: JSON.stringify(currentDeviceDataForm.data)
+ }),
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code == 200) {
+ that.currentDeviceDataForm = null;
+ that.$message({
+ message: res.msg,
+ type: 'success'
+ });
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ },
+ getFakeThreadStatus() {
+ let that = this;
+ if (this.currentDeviceConfig == null) {
+ return;
+ }
+
+ $.ajax({
+ url: baseUrl + "/open/getFakeThreadStatus",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: JSON.stringify({
+ deviceType: this.currentDeviceConfig.deviceType,
+ deviceNo: this.currentDeviceConfig.deviceNo
+ }),
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code == 200) {
+ let data = res.data;
+ let result = {
+ deviceType: that.currentDeviceConfig.deviceType,
+ deviceNo: that.currentDeviceConfig.deviceNo,
+ data: data
+ }
+
+ that.currentDeviceData = result
+ } else {
+ that.currentDeviceConfig = null;
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ },
addDevice() {
//娣诲姞璁惧
let that = this;
--
Gitblit v1.9.1