From 04908371e0955028fadedfa73d94cbe270474344 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 31 七月 2025 15:19:13 +0800
Subject: [PATCH] #
---
src/main/webapp/views/deviceOperate/errorTaskOperate.html | 427 +++--------------------------------------------------
1 files changed, 26 insertions(+), 401 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/errorTaskOperate.html b/src/main/webapp/views/deviceOperate/errorTaskOperate.html
index faf33d4..638f1cb 100644
--- a/src/main/webapp/views/deviceOperate/errorTaskOperate.html
+++ b/src/main/webapp/views/deviceOperate/errorTaskOperate.html
@@ -19,8 +19,8 @@
<body>
<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%">
+ <el-table border ref="singleTable" :data="tableData" highlight-current-row
+ max-height="350" style="width: 100%">
<el-table-column property="category" label="绫诲埆">
</el-table-column>
<el-table-column property="equipmentNo" label="璁惧鍙�">
@@ -33,220 +33,49 @@
</el-table-column>
</el-table>
</div>
+ <div style="width: 100%;">
+ <el-table border ref="singleTable" :data="adjacentLocMast" highlight-current-row
+ max-height="350" style="width: 100%">
+ <el-table-column property="category" label="褰撳墠搴撲綅">
+ </el-table-column>
+ <el-table-column property="equipmentNo" label="褰撳墠搴撲綅鐘舵��">
+ </el-table-column>
+ <el-table-column property="categoryOther" label="鐩搁偦搴撲綅">
+ </el-table-column>
+ <el-table-column property="equipmentNoOther" label="鐩搁偦搴撲綅鐘舵��">
+ </el-table-column>
+ <el-table-column property="errorM" label="寮傚父鎻忚堪">
+ </el-table-column>
+ </el-table>
+ </div>
</div>
<script>
var app = new Vue({
el: '#app',
data: {
- showLayer: false,
- valueUpdate: false,
- selectedOption: null,
- updateJarNo: null,
- optionsUpdate: [
- { id: '1', value: '1', text: '1鎵�' },
- { id: '2', value: '2', text: '2鎵�' },
- { id: '3', value: '3', text: '3鎵�' },
- { id: '4', value: '4', text: '4鎵�' },
- { id: '5', value: '5', text: '5鎵�' },
- { id: '6', value: '6', text: '6鎵�' },
- { id: '7', value: '7', text: '7鎵�' },
- { id: '999', value: '999', text: '鍙栨秷' },
- ],
tableData: [],
- currentRow: null,
- currentTitle: "鏈�夋嫨璁惧",
- currentIndex: null,
- formParam: {
- rgvNo: null,
- sourceStaNo: null,
- sourceRow: 1,
- sourceBay: 0,
- sourceLev: 1,
- staNo: null,
- row: 1,
- bay: 0,
- lev: 1,
- barcode:null,
- barcodeType:null,
- emptyContainer:null
- },
- formParamD: {
- rgvNo: null,
- sourceStaNo: null,
- sourceRow: 1,
- sourceBay: 0,
- sourceLev: 1,
- staNo: null,
- row: 1,
- bay: 0,
- lev: 1,
- barcode:null,
- barcodeType:null,
- emptyContainer:null
- },
- enableIn: false,
- enableOut: false,
- options:[
- {
- value:'1',
- label:'鏄�'
- },
- {
- value:'0',
- label:'鍚�'
- }
- ],
- demo: 'X',
- rgvMode: 0,
- itemMast: []
+ adjacentLocMast: []
},
created() {
this.init()
},
watch: {
- valueUpdate(newVal) {
- if (newVal) {
- this.showLayer = true;
- // 鍙互鍦ㄨ繖閲屾坊鍔犲欢鏃跺叧闂眰鎴栧叾浠栭�昏緫
- }
- },
},
methods: {
- historicalTasks(){
- let that = this
- that.selectedOption = 0;
- that.valueUpdate = false;
- 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.itemMast = res.data
- // console.log(that.itemMast)
- }
- });
- }
-
- },
- staTova(sta,end){
- let that = this
- that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(()=>{
- $.ajax({
- url: baseUrl + "/rgv/rgvDemoTask",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data:{
- rgvNo : this.formParam.rgvNo,
- sta : sta,
- end : end
- },
- method: 'Get',
- success: function (res) {
- if (res.code == 200) {
- that.$message({
- message: res.msg,
- type: 'success'
- });
- } else {
- that.$message({
- message: res.msg,
- type: 'error'
- });
- }
- }
- });
- })
- },
init() {
this.getTableData()
+ this.getAdjacentLocMast()
setInterval(() => {
this.getTableData()
+ this.getAdjacentLocMast()
// this.demoStatus()
}, 1000)
},
confirmEvent() {
- var that = this
- that.valueUpdate = true;
},
cancelEvent() {
- var that = this
- that.valueUpdate = false;
- },
- handleSubmit() {
- if ( this.selectedOption > 998 ){
- this.selectedOption = 0;
- this.valueUpdate = false;
- } else if ( this.selectedOption > 0 ){
- var that = this
- if (that.updateJarNo == null){
- console.log("this.updateJarNo;null;null;null;null;null")
- } else {
- $.ajax({
- url: baseUrl + "/basJar/update/uodate/jar/count/auth",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- jarCount: that.selectedOption,
- jarNo: that.updateJarNo
- },
- success: function (res) {
- if (res.code == 200) {
- that.$message({
- message: res.msg,
- type: 'success'
- });
- } else {
- that.$message({
- message: res.msg,
- type: 'error'
- });
- }
- }
- });
- }
- this.selectedOption = 0;
- this.valueUpdate = false;
- }
- },
- handleRowClick(row, col, event) {
- var that = this
- const index = that.tableData.indexOf(row)
- that.currentRow = row;
- that.currentIndex = index
- this.updateJarNo = row.jarNo
- that.currentTitle = row.jarNo + "鍙风～鍖栫綈"
- that.formParam.rgvNo = row.rgvNo
- that.enableIn = row.inEnable == "Y" ? true : false
- that.enableOut = row.outEnable == "Y" ? true : false
- this.selectedOption = 0;
- this.valueUpdate = false;
-
- $.ajax({
- url: baseUrl + "/basJarMast/JatId/auth",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- id: row.jarNo
- },
- success: function (res) {
- that.itemMast = res.data
- // console.log(that.itemMast)
- }
- });
},
getTableData() {
let that = this;
@@ -264,223 +93,19 @@
}
});
},
- demoStatus() {
+ getAdjacentLocMast() {
let that = this;
$.ajax({
- url: baseUrl + "/rgv/demo/status",
- data:{
- rgvNo : this.formParam.rgvNo
- },
+ url: baseUrl + "/error/device/locSts/adjacentLocMast",
headers: {
'token': localStorage.getItem('token')
},
+ data: {},
+ dataType: 'json',
contentType: 'application/json;charset=UTF-8',
- method: 'get',
+ method: 'post',
success: function (res) {
- // console.log(res)
- that.demo = res.data.demo
- that.rgvMode = res.data.rgvMode
- }
- });
- },
- initiate(){
- let that = this
- that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(()=>{
- $.ajax({
- url: baseUrl + "/rgv/operator/put",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: this.formParam,
- method: 'POST',
- success: function (res) {
- if (res.code == 200) {
- that.$message({
- message: res.msg,
- type: 'success'
- });
- } else {
- that.$message({
- message: res.msg,
- type: 'error'
- });
- }
- }
- });
- })
- },
- initiateD(method){
- let urlS = "/rgv/operator/single/step/three/put";
- if (method===1){
- urlS = "/rgv/operator/single/step/one/put";
- }else if (method === 2){
- urlS = "/rgv/operator/single/step/two/put";
- }else if (method === 3){
- urlS = "/rgv/operator/single/step/three/put";
- }
- let that = this
- that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(()=>{
- $.ajax({
- url: baseUrl + urlS,
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: this.formParam,
- method: 'POST',
- success: function (res) {
- if (res.code == 200) {
- that.$message({
- message: res.msg,
- type: 'success'
- });
- } else {
- that.$message({
- message: res.msg,
- type: 'error'
- });
- }
- }
- });
- })
- },
- demos(method){
- let that = this
- that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(()=>{
- $.ajax({
- url: baseUrl + "/rgv/demo/status/" + method,
- headers: {
- 'token': localStorage.getItem('token')
- },
- data:{
- rgvNo : this.formParam.rgvNo
- },
- method: 'Get',
- success: function (res) {
- if (res.code == 200) {
- that.$message({
- message: res.msg,
- type: 'success'
- });
- } else {
- that.$message({
- message: res.msg,
- type: 'error'
- });
- }
- }
- });
- })
- },
- rgvStatus(method){
- let that = this
- that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(()=>{
- $.ajax({
- url: baseUrl + "/rgv/demo/status/rgvStatus",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data:{
- rgvNo : this.formParam.rgvNo,
- status : Number(method)
- },
- method: 'Get',
- success: function (res) {
- if (res.code == 200) {
- that.$message({
- message: res.msg,
- type: 'success'
- });
- } else {
- that.$message({
- message: res.msg,
- type: 'error'
- });
- }
- }
- });
- })
- },
- requestOperate(method) {
- let that = this
- that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(()=>{
- $.ajax({
- url: baseUrl + "/rgv/operator/" + method,
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: this.formParam,
- method: 'POST',
- success: function (res) {
- if (res.code == 200) {
- that.$message({
- message: res.msg,
- type: 'success'
- });
- } else {
- that.$message({
- message: res.msg,
- type: 'error'
- });
- }
- }
- });
- })
-
- },
- updateEnableInOut(type) {
- let that = this
- let param = {}
- if (type == "in") {
- param = {
- inEnable: this.enableIn ? "Y" : "N",
- rgvNo: this.formParam.rgvNo
- }
- } else {
- param = {
- outEnable: this.enableOut ? "Y" : "N",
- rgvNo: this.formParam.rgvNo
- }
- }
-
- $.ajax({
- url: baseUrl + "/basCrnp/update/auth",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: param,
- method: 'POST',
- success: function (res) {
- if (res.code == 200) {
- that.$message({
- message: res.msg,
- type: 'success'
- });
- } else {
- that.$message({
- message: res.msg,
- type: 'error'
- });
- }
+ that.adjacentLocMast = res.data
}
});
}
--
Gitblit v1.9.1