From b0afecbe6abdd77a0cda7311c3212fc8ecec3312 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 14 七月 2024 20:16:51 +0800
Subject: [PATCH] #
---
src/main/webapp/views/deviceOperate/jarOperate.html | 91 +++++++++++++++++++++++++++++++++------------
1 files changed, 67 insertions(+), 24 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/jarOperate.html b/src/main/webapp/views/deviceOperate/jarOperate.html
index c56105b..bc23edb 100644
--- a/src/main/webapp/views/deviceOperate/jarOperate.html
+++ b/src/main/webapp/views/deviceOperate/jarOperate.html
@@ -36,8 +36,26 @@
<div style="width: 100%;display: flex;justify-content: center;margin-top: 10px;">
<div style="width: 55%;margin-right: 10px;">
<el-card class="box-card">
- <div slot="header" class="clearfix">
+ <div slot="header" class="clearfix" style="display: flex;justify-content: space-between;align-items: center">
<span>纭寲搴撲綅</span>
+ <el-button style="" type="primary" plain size="medium" @click="historicalTasks()">鍘嗗彶浠诲姟</el-button>
+ </div>
+ <div v-if="currentIndex == null">
+ <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-column>
+ <el-table-column property="jarWrkNo" label="宸ヤ綔鍙�">
+ </el-table-column>
+ <el-table-column property="status" label="鐘舵��">
+ </el-table-column>
+ <el-table-column property="matnr" label="鐗╂枡鐮�">
+ </el-table-column>
+ <el-table-column property="maktx" label="鐗╂枡鍚嶇О">
+ </el-table-column>
+ </el-table>
</div>
</el-card>
@@ -53,25 +71,15 @@
</div>
<div v-else>
<el-descriptions :title="currentTitle" direction="vertical" :column="4" border>
- <el-descriptions-item label="RGV">{{ tableData[currentIndex].rgvNo }}
- </el-descriptions-item>
- <el-descriptions-item label="宸ヤ綔鍙�">
- {{ tableData[currentIndex].workNo1 }}
+ <el-descriptions-item label="纭寲缃�">{{ tableData[currentIndex].jarNo }}
</el-descriptions-item>
<el-descriptions-item label="妯″紡">
- <el-tag>{{ tableData[currentIndex].statusType }}</el-tag>
- </el-descriptions-item>
- <el-descriptions-item label="浠诲姟鐘舵��">
-
- <el-tag>{{ tableData[currentIndex].status}}</el-tag>
-
+ <el-tag>{{ tableData[currentIndex].jarMode }}</el-tag>
</el-descriptions-item>
<el-descriptions-item label="璁惧鐘舵��">
- <el-tag>{{ tableData[currentIndex].walkPos }}</el-tag>
+ <el-tag>{{ tableData[currentIndex].jarStatus }}</el-tag>
</el-descriptions-item>
- <el-descriptions-item label="鏁呴殰浠ｇ爜">{{ tableData[currentIndex].warnCode }}
- </el-descriptions-item>
- <el-descriptions-item label="鏁呴殰鎻忚堪">{{ tableData[currentIndex].alarm }}
+ <el-descriptions-item label="鏁呴殰浠ｇ爜">{{ tableData[currentIndex].jarErr }}
</el-descriptions-item>
<!-- <el-descriptions-item label="婧愮珯">{{ tableData[currentIndex].staNo }}-->
<!-- </el-descriptions-item>-->
@@ -134,7 +142,8 @@
}
],
demo: 'X',
- rgvMode: 0
+ rgvMode: 0,
+ item: []
},
created() {
this.init()
@@ -143,6 +152,25 @@
},
methods: {
+ historicalTasks(){
+ let that = this
+ if (that.currentIndex != null){
+ $.ajax({
+ url: baseUrl + "/basJarMastLog/historicalTasks/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data:{
+ id: that.tableData[that.currentIndex].jarNo
+ },
+ success: function (res) {
+ that.item = res.data
+ console.log(that.item)
+ }
+ });
+ }
+
+ },
staTova(sta,end){
let that = this
that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
@@ -182,17 +210,32 @@
setInterval(() => {
this.getTableData()
- this.demoStatus()
+ // this.demoStatus()
}, 1000)
},
handleRowClick(row, col, event) {
- const index = this.tableData.indexOf(row)
- this.currentRow = row;
- this.currentIndex = index
- this.currentTitle = row.jarNo + "鍙风～鍖栫綈"
- this.formParam.rgvNo = row.rgvNo
- this.enableIn = row.inEnable == "Y" ? true : false
- this.enableOut = row.outEnable == "Y" ? true : false
+ var that = this
+ const index = that.tableData.indexOf(row)
+ that.currentRow = row;
+ that.currentIndex = index
+ that.currentTitle = row.jarNo + "鍙风～鍖栫綈"
+ that.formParam.rgvNo = row.rgvNo
+ that.enableIn = row.inEnable == "Y" ? true : false
+ that.enableOut = row.outEnable == "Y" ? true : false
+
+ $.ajax({
+ url: baseUrl + "/basJarMast/JatId/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ id: row.jarNo
+ },
+ success: function (res) {
+ that.item = res.data
+ console.log(that.item)
+ }
+ });
},
getTableData() {
let that = this;
--
Gitblit v1.9.1