From da8323a2468e2a3dcfab461f459008da8c6139a5 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 23 十一月 2024 17:32:24 +0800
Subject: [PATCH] #
---
src/main/webapp/views/deviceOperate/jarOperate.html | 124 +++++++++++++++++++++++++++++++----------
1 files changed, 93 insertions(+), 31 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/jarOperate.html b/src/main/webapp/views/deviceOperate/jarOperate.html
index c56105b..fbbaf9d 100644
--- a/src/main/webapp/views/deviceOperate/jarOperate.html
+++ b/src/main/webapp/views/deviceOperate/jarOperate.html
@@ -15,7 +15,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="350" style="width: 100%">
+ max-height="420" style="width: 100%">
<el-table-column property="jarNo" label="纭寲缃�">
</el-table-column>
<!-- <el-table-column property="workNo" label="宸ヤ綔鍙�">-->
@@ -24,11 +24,16 @@
</el-table-column>
<el-table-column property="jarMode" label="妯″紡">
</el-table-column>
- <el-table-column property="region" label="鍖哄煙">
+ <el-table-column property="jarTemperature$" label="娓╁害">
</el-table-column>
- <el-table-column property="jarCode" label="浠ｅ彿">
+ <el-table-column property="jarPressure$" label="鍘嬪姏">
+ </el-table-column>
+ <el-table-column property="jarCount$" label="鏈�澶у偍閲�">
</el-table-column>
<el-table-column property="jarErr" label="寮傚父浠ｇ爜">
+ </el-table-column>
+ <el-table-column label="鎿嶄綔">
+ <el-button style="" type="primary" plain size="medium" @click="updateJarCount()">淇敼</el-button>
</el-table-column>
</el-table>
</div>
@@ -36,8 +41,28 @@
<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-column property="weight" label="閲嶉噺">
+ </el-table-column>
+ </el-table>
</div>
</el-card>
@@ -53,30 +78,32 @@
</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>
+<!-- <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 label="鍖哄煙">{{ tableData[currentIndex].region }}
</el-descriptions-item>
- <el-descriptions-item label="鏁呴殰鎻忚堪">{{ tableData[currentIndex].alarm }}
+ <el-descriptions-item label="浠ｅ彿">{{ tableData[currentIndex].jarCode }}
</el-descriptions-item>
-<!-- <el-descriptions-item label="婧愮珯">{{ tableData[currentIndex].staNo }}-->
-<!-- </el-descriptions-item>-->
-<!-- <el-descriptions-item label="鐩爣绔�">{{ tableData[currentIndex].sourceStaNo }}-->
-<!-- </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].holdingTime }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鏈�杩戜竴娆″紑闂ㄦ椂闂�">{{ tableData[currentIndex].openTime }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鏈�杩戜竴娆″叧闂ㄦ椂闂�">{{ tableData[currentIndex].closeTime }}
+ </el-descriptions-item>
</el-descriptions>
</div>
@@ -134,7 +161,8 @@
}
],
demo: 'X',
- rgvMode: 0
+ rgvMode: 0,
+ item: []
},
created() {
this.init()
@@ -143,6 +171,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 +229,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