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 | 177 +++++++++++++++++++++++-----------------------------------
1 files changed, 70 insertions(+), 107 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/jarOperate.html b/src/main/webapp/views/deviceOperate/jarOperate.html
index 60d1fa0..bc23edb 100644
--- a/src/main/webapp/views/deviceOperate/jarOperate.html
+++ b/src/main/webapp/views/deviceOperate/jarOperate.html
@@ -18,8 +18,8 @@
max-height="350" style="width: 100%">
<el-table-column property="jarNo" label="纭寲缃�">
</el-table-column>
- <el-table-column property="workNo" label="宸ヤ綔鍙�">
- </el-table-column>
+<!-- <el-table-column property="workNo" label="宸ヤ綔鍙�">-->
+<!-- </el-table-column>-->
<el-table-column property="jarStatus" label="鐘舵��">
</el-table-column>
<el-table-column property="jarMode" label="妯″紡">
@@ -36,90 +36,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">
- <span>璁惧璋冭瘯</span>
+ <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>
- <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline" v-if="rgvMode !== 2 && rgvMode !== 1 ">
-<!-- <el-form-item label="婧愮珯/婧愬簱浣�">-->
-<!-- <el-input v-model="formParam.sourceStaNo" placeholder="婧愮珯/婧愬簱浣�"></el-input>-->
-<!-- </el-form-item>-->
- <el-form-item label="璧峰绔�">
- <el-input v-model="formParam.sourceRow" placeholder="璧峰绔�"></el-input>
- </el-form-item>
- <el-form-item label="鐩爣绔�">
- <el-input v-model="formParam.sourceBay" placeholder="鐩爣绔�"></el-input>
- </el-form-item>
- <el-form-item label="鍚姩">
- <el-button @click="initiate" type="warning">鎵ц浠诲姟</el-button>
- </el-form-item>
- </el-form>
+ <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>
- <div v-if="rgvMode === 2 ">
- <el-form :model="formParamD" label-position="top" :inline="true" class="demo-form-inline">
- <el-form-item label="璧峰绔�">
- <el-input v-model="formParamD.sourceRow" placeholder="璧峰绔�"></el-input>
- </el-form-item>
- <el-form-item label="鐩爣绔�">
- <el-input v-model="formParamD.sourceBay" placeholder="鐩爣绔�"></el-input>
- </el-form-item>
- <el-form-item label="鍚姩">
- <el-button @click="initiateD(1)" type="warning">鍙栬揣</el-button>
- <el-button @click="initiateD(2)" type="warning">鏀捐揣</el-button>
- <el-button @click="initiateD(3)" type="warning">XY绉诲姩</el-button>
- </el-form-item>
- </el-form>
- </div>
- <div v-if="demo === 'N' ">
- <el-button v-if="rgvMode === 0 " type="danger">鏈煡</el-button>
- <el-button v-if="rgvMode === -1 " type="danger">鏈煡</el-button>
- <el-button v-if="rgvMode === 3 " type="primary">鑱旀満</el-button>
- <el-button v-if="rgvMode === 2 " type="primary">鍗曟満</el-button>
- <el-button v-if="rgvMode === 1 " type="warning">鎵嬪姩</el-button>
- </div>
- <div v-if="rgvMode !== 0 ">
- <div style="margin: 10px auto 10px auto">
- <el-button v-if="demo === 'N' " @click="demos('true')" type="info">婕旂ず</el-button>
- <el-button v-if="demo === 'Y' " @click="demos('false')" type="info">鍙栨秷婕旂ず</el-button>
- </div>
- <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
- <el-button v-if="rgvMode !== 3 " @click="rgvStatus(15)" type="primary">鑱旀満</el-button>
- <el-button v-if="rgvMode !== 2 " @click="rgvStatus(14)" type="primary">鍗曟満</el-button>
- <el-button v-if="rgvMode !== 1 " @click="rgvStatus(12)" type="warning">鎵嬪姩</el-button>
- </div>
- <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
- <el-button @click="rgvStatus(8)" type="primary">鍚姩</el-button>
- <el-button @click="rgvStatus(9)" type="primary">鍋滄</el-button>
- <el-button @click="rgvStatus(11)" type="primary">澶嶄綅鎸夐挳</el-button>
- </div>
- <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
- <el-button @click="rgvStatus(7)" type="warning">鎶ヨ娑堥煶</el-button>
- <el-button v-if="rgvMode === 1 " @click="rgvStatus(13)" type="warning">鎵嬪姩瀹氫綅</el-button>
- </div>
- <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
- <el-button :style="" @click="rgvStatus(5)" type="danger">寮哄埗鍚姩</el-button>
- <el-button @click="rgvStatus(10)" type="danger">鎬ュ仠</el-button>
- <el-button @click="rgvStatus(16)" type="danger">璐у弶瀹氫綅鍥炰腑</el-button>
- </div>
- <div style="margin-top: 5px" v-if="demo === 'Y'">
- <el-button @click="staTova(2,1)" type="warning">杈撻��-缃崲1</el-button>
- <el-button @click="staTova(2,3)" type="warning">杈撻��-缃崲2</el-button>
- <el-button @click="staTova(2,5)" type="warning">杈撻��-缃崲3</el-button>
- <el-button @click="staTova(2,7)" type="warning">杈撻��-缃崲4</el-button>
- </div>
- <div style="margin-top: 5px" v-if="demo === 'Y'">
- <el-button @click="staTova(2,4)" type="warning">杈撻��-鐏岃1</el-button>
- <el-button @click="staTova(2,6)" type="warning">杈撻��-鐏岃2</el-button>
- <el-button @click="staTova(2,8)" type="warning">杈撻��-鐏岃3</el-button>
- </div>
- <div style="margin-top: 5px" v-if="demo === 'Y'">
- <el-button @click="staTova(1,10)" type="warning">缃崲1-鏀捐揣</el-button>
- <el-button @click="staTova(2,10)" type="warning">缃崲2-鏀捐揣</el-button>
- <el-button @click="staTova(3,10)" type="warning">缃崲3-鏀捐揣</el-button>
- <el-button @click="staTova(4,10)" type="warning">缃崲4-鏀捐揣</el-button>
- </div>
- </div>
- </div>
</el-card>
</div>
<div style="width: 45%;">
@@ -133,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>-->
@@ -214,7 +142,8 @@
}
],
demo: 'X',
- rgvMode: 0
+ rgvMode: 0,
+ item: []
},
created() {
this.init()
@@ -223,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('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
@@ -262,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