From d9eeceed86c1ce43c73dda00a108595a078a8f3d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 29 五月 2025 18:44:53 +0800
Subject: [PATCH] *
---
src/main/webapp/views/deviceOperate/jarOperate.html | 59 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/jarOperate.html b/src/main/webapp/views/deviceOperate/jarOperate.html
index 5e6ab82..2733b32 100644
--- a/src/main/webapp/views/deviceOperate/jarOperate.html
+++ b/src/main/webapp/views/deviceOperate/jarOperate.html
@@ -79,7 +79,7 @@
<div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
<div style="width: 100%;">
<el-table border ref="singleTable" :data="tableData" highlight-current-row @row-click="handleRowClick"
- max-height="420" style="width: 100%">
+ max-height="350" style="width: 100%">
<el-table-column property="jarNo" label="纭寲缃�">
</el-table-column>
<!-- <el-table-column property="workNo" label="宸ヤ綔鍙�">-->
@@ -106,7 +106,7 @@
@cancel="cancelEvent"
>
<template #reference>
- <el-button>淇敼</el-button>
+ <el-button>淇敼鏈�澶у偍閲�</el-button>
</template>
</el-popconfirm>
</template>
@@ -146,8 +146,8 @@
<el-empty description="璇烽�夋嫨璁惧"></el-empty>
</div>
<div v-else>
- <el-table border :data="item" highlight-current-row max-height="350" style="width: 100%">
- <el-table-column property="jarId" label="纭寲缃�">
+ <el-table border :data="itemMast" highlight-current-row max-height="400" style="width: 100%">
+ <el-table-column property="id" label="搴忓彿">
</el-table-column>
<el-table-column property="jarWrkNo" label="宸ヤ綔鍙�">
</el-table-column>
@@ -177,23 +177,44 @@
<el-descriptions :title="currentTitle" direction="vertical" :column="4" border>
<!-- <el-descriptions-item label="纭寲缃�">{{ tableData[currentIndex].jarNo }}-->
<!-- </el-descriptions-item>-->
- <el-descriptions-item label="妯″紡">
- <el-tag>{{ tableData[currentIndex].jarMode }}</el-tag>
- </el-descriptions-item>
- <el-descriptions-item label="璁惧鐘舵��">
- <el-tag>{{ tableData[currentIndex].jarStatus }}</el-tag>
- </el-descriptions-item>
<el-descriptions-item label="鍖哄煙">{{ tableData[currentIndex].region }}
</el-descriptions-item>
<el-descriptions-item label="浠ｅ彿">{{ tableData[currentIndex].jarCode }}
</el-descriptions-item>
- <el-descriptions-item label="娓╁害">{{ tableData[currentIndex].jarTemperature$ }}
+<!-- <el-descriptions-item label="妯″紡">-->
+<!-- <el-tag>{{ tableData[currentIndex].jarMode }}</el-tag>-->
+<!-- </el-descriptions-item>-->
+<!-- <el-descriptions-item label="璁惧鐘舵��">-->
+<!-- <el-tag>{{ tableData[currentIndex].jarStatus }}</el-tag>-->
+<!-- </el-descriptions-item>-->
+ <el-descriptions-item label="宸﹂棬">{{ tableData[currentIndex].leftDoor }}
</el-descriptions-item>
- <el-descriptions-item label="鍘嬪姏">{{ tableData[currentIndex].jarPressure$ }}
+ <el-descriptions-item label="鍙抽棬">{{ tableData[currentIndex].rightDoor }}
</el-descriptions-item>
- <el-descriptions-item label="鏈�澶у偍閲�">{{ tableData[currentIndex].jarCount$ }}
+ <el-descriptions-item label="宸﹂棬鍙紑">{{ tableData[currentIndex].leftInEnable }}
</el-descriptions-item>
- <el-descriptions-item label="鏁呴殰浠ｇ爜">{{ tableData[currentIndex].jarErr }}
+ <el-descriptions-item label="鍙抽棬鍙紑">{{ tableData[currentIndex].leftOutEnable }}
+ </el-descriptions-item>
+ <el-descriptions-item label="宸﹂棬鍙叧">{{ tableData[currentIndex].rightInEnable }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍙抽棬鍙叧">{{ tableData[currentIndex].rightOutEnable }}
+ </el-descriptions-item>
+
+<!-- <el-descriptions-item label="娓╁害">{{ tableData[currentIndex].jarTemperature$ }}-->
+<!-- </el-descriptions-item>-->
+<!-- <el-descriptions-item label="鍘嬪姏">{{ tableData[currentIndex].jarPressure$ }}-->
+<!-- </el-descriptions-item>-->
+<!-- <el-descriptions-item label="鏈�澶у偍閲�">{{ tableData[currentIndex].jarCount$ }}-->
+<!-- </el-descriptions-item>-->
+<!-- <el-descriptions-item label="鏁呴殰浠ｇ爜">{{ tableData[currentIndex].jarErr }}-->
+<!-- </el-descriptions-item>-->
+ <el-descriptions-item label="宸﹂棬寮�闂ㄧ姸鎬�">{{ tableData[currentIndex].leftDoorOpen }}
+ </el-descriptions-item>
+ <el-descriptions-item label="宸﹂棬鍏抽棬鐘舵��">{{ tableData[currentIndex].leftDoorClose }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍙抽棬寮�闂ㄧ姸鎬�">{{ tableData[currentIndex].rightDoorOpen }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍙抽棬鍏抽棬鐘舵��">{{ tableData[currentIndex].rightDoorClose }}
</el-descriptions-item>
<el-descriptions-item label="鏈�杩戜竴娆′繚娓╂椂闂�">{{ tableData[currentIndex].holdingTime }}
</el-descriptions-item>
@@ -274,7 +295,7 @@
],
demo: 'X',
rgvMode: 0,
- item: []
+ itemMast: []
},
created() {
this.init()
@@ -302,8 +323,8 @@
id: that.tableData[that.currentIndex].jarNo
},
success: function (res) {
- that.item = res.data
- console.log(that.item)
+ that.itemMast = res.data
+ // console.log(that.itemMast)
}
});
}
@@ -418,8 +439,8 @@
id: row.jarNo
},
success: function (res) {
- that.item = res.data
- console.log(that.item)
+ that.itemMast = res.data
+ // console.log(that.itemMast)
}
});
},
--
Gitblit v1.9.1