From 1bc0b18a88ed90fa19e0c050d7befecb2a16bb8a Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期五, 10 十月 2025 12:38:27 +0800
Subject: [PATCH] *
---
src/main/webapp/views/index.html | 256 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 245 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 55f2291..a3bd79f 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -100,9 +100,35 @@
z-index: 1000; /* 纭繚鍦ㄥ叾浠栧厓绱犱箣涓� */
}
+ .task-bar-left1 {
+ position: fixed;
+ top: 8%;
+ /*transform: translateY(-50%);*/
+ width: 25%; /* 璁剧疆瀹藉害 */
+ background-color: rgba(255, 255, 255, 0); /* 鍗婇�忔槑鑳屾櫙 */
+
+ border-radius: 5px;
+ padding: 10px;
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0);
+ z-index: 1000; /* 纭繚鍦ㄥ叾浠栧厓绱犱箣涓� */
+ }
+
.task-bar-right {
position: fixed;
top: 1%;
+ /*transform: translateY(-50%);*/
+ width: 25%; /* 璁剧疆瀹藉害 */
+ background-color: rgba(255, 255, 255, 0); /* 鍗婇�忔槑鑳屾櫙 */
+
+ border-radius: 5px;
+ padding: 10px;
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0);
+ z-index: 1000; /* 纭繚鍦ㄥ叾浠栧厓绱犱箣涓� */
+ }
+
+ .task-bar-right1 {
+ position: fixed;
+ top: 5%;
/*transform: translateY(-50%);*/
width: 25%; /* 璁剧疆瀹藉害 */
background-color: rgba(255, 255, 255, 0); /* 鍗婇�忔槑鑳屾櫙 */
@@ -286,6 +312,14 @@
prop="modiTime"
label="涓嬪彂鏃堕棿">
</el-table-column>
+ <el-table-column
+ prop="crnStrTime"
+ label="寮�濮嬫墽琛屾椂闂�">
+ </el-table-column>
+ <el-table-column
+ prop="crnEndTime"
+ label="鎵ц缁撴潫鏃堕棿">
+ </el-table-column>
<!-- <el-table-column-->
<!-- prop="modiTime"-->
<!-- label="鏇存柊鏃堕棿">-->
@@ -301,10 +335,60 @@
<el-button
type="danger"
size="small"
+ @click="taskDelete1(scope.row)">
+ 鍒濆鍖�
+ </el-button>
+ <el-button
+ type="danger"
+ size="small"
@click="taskDelete(scope.row)">
鍒犻櫎
</el-button>
</template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+ <div class="task-bar-left1 left-task-bar" >
+ <div>
+ <el-tooltip :content="'Switch value: ' + valueLeft1" placement="top">
+ <el-switch
+ v-model="valueLeft1"
+ active-color="#13ce66"
+ inactive-color="#ff4949"
+ active-value="100"
+ inactive-value="0">
+ </el-switch>
+ </el-tooltip>
+ </div>
+ <div v-if="valueLeft1 === '100' " class="task-bar-div1">
+ <el-table
+ :data="tableDataLeft1"
+ style="width: 100%"
+ :row-class-name="tableRowClassName">
+ <el-table-column
+ prop="wrkNo1"
+ label="宸ヤ綔鍙�">
+ </el-table-column>
+ <el-table-column
+ prop="rgvNo"
+ label="RGV鍙�">
+ </el-table-column>
+ <el-table-column
+ prop="sendTime"
+ label="涓嬪彂鏃堕棿">
+ </el-table-column>
+ <el-table-column
+ prop="mode"
+ label="绫诲瀷">
+ </el-table-column>
+ <el-table-column
+ prop="sourceSta"
+ label="璧风偣">
+ </el-table-column>
+ <el-table-column
+ prop="posSta"
+ label="缁堢偣">
</el-table-column>
</el-table>
</div>
@@ -346,6 +430,10 @@
label="鐘舵��">
</el-table-column>
<el-table-column
+ prop="error$"
+ label="寮傚父">
+ </el-table-column>
+ <el-table-column
label="鎿嶄綔"
type="template">
<template slot-scope="scope">
@@ -360,6 +448,38 @@
</el-table>
</div>
</div>
+ <div class="task-bar-right1 right-task-bar">
+ <div>
+ <el-tooltip :content="'Switch value: ' + valueRight1" placement="top">
+ <el-switch
+ v-model="valueRight1"
+ active-color="#13ce66"
+ inactive-color="#ff4949"
+ active-value="100"
+ inactive-value="0">
+ </el-switch>
+ </el-tooltip>
+ </div>
+ <div v-if="valueRight1 === '100' " class="task-bar-div1">
+ <el-table
+ :data="tableDataRight1"
+ style="width: 100%"
+ :row-class-name="tableRowClassName">
+ <el-table-column
+ prop="rgvNo"
+ label="灏忚溅鍙�">
+ </el-table-column>
+ <el-table-column
+ prop="error"
+ label="寮傚父">
+ </el-table-column>
+ <el-table-column
+ prop="createTime$"
+ label="璁板綍鏃ユ湡">
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
</div>
<script>
@@ -368,7 +488,9 @@
data: {
activeNames: ['1'],
valueLeft: '0',
+ valueLeft1: '0',
valueRight: '0',
+ valueRight1: '0',
licenseDay: '宸茶繃鏈�',
licenseDayI: 100,
valueSystem: false,
@@ -376,7 +498,9 @@
tableDataDev: [],
energyGatheringRing: [],
tableDataLeft: [],
+ tableDataLeft1: [],
tableDataRight: [],
+ tableDataRight1: [],
devpPos1:[
{dev_no: 116,pos:633980},
{dev_no: 117,pos:604043},
@@ -431,7 +555,9 @@
this.getTableDataDev()
this.getTableDataTrack()
this.getTableDataLeft()
+ this.getTableDataLeft1()
this.getTableDataRight()
+ this.getTableDataRight1()
this.getValueSystem()
this.getLicenseDays()
@@ -440,11 +566,29 @@
this.getTableDataDev()
this.getTableDataTrack()
this.getTableDataLeft()
+ this.getTableDataLeft1()
this.getTableDataRight()
+ this.getTableDataRight1()
this.getValueSystem()
this.getLicenseDays()
}, 1000)
+ },
+
+ verifyPassword(callback) {
+ this.$prompt('璇疯緭鍏ョ鐞嗗憳瀵嗙爜: root', '楠岃瘉', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ inputType: 'password',
+ inputPattern: /^root$/,
+ inputErrorMessage: '瀵嗙爜閿欒'
+ }).then(({ value }) => {
+ if (value === 'root') {
+ callback();
+ }
+ }).catch(() => {
+ this.$message.info('宸插彇娑堟搷浣�');
+ });
},
handleChange(val) {
console.log(val);
@@ -458,9 +602,21 @@
}
}
},
+ handleChange1(val) {
+ console.log(val);
+ if (val.length === 0){
+ valueRight1 = '0';
+ } else {
+ console.log("2222"+val);
+
+ if (val.length >= 1){
+ this.handleChangeValueRight1(1)
+ }
+ }
+ },
taskDelete(row) {
let that = this;
- that.$confirm('纭瑕佸垹闄よ璁惧鍚�?', '鎻愮ず', {
+ that.$confirm('纭瑕佸垹闄よ浠诲姟鍚�?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
@@ -479,6 +635,32 @@
that.tableDataRight.splice(that.tableDataRight.indexOf(row), 1);
} else {
that.$message.error('鍒犻櫎澶辫触');
+ }
+ }
+ });
+ });
+ },
+ taskDelete1(row) {
+ let that = this;
+ that.$confirm('纭瑕佸垵濮嬪寲璇ヤ换鍔″悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ $.ajax({
+ url: baseUrl + "/rgv/disable/task/delete1",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ data: {
+ wrkNo: row.wrkNo
+ },
+ success: function (res) {
+ if (res.code === 200) {
+ that.$message.success('鍒濆鍖栨垚鍔�');
+ // 鍒犻櫎褰撳墠琛�
+ // that.tableDataRight.splice(that.tableDataRight.indexOf(row), 1);
+ } else {
+ that.$message.error('鍒濆鍖栧け璐�');
}
}
});
@@ -529,6 +711,22 @@
valueRight = '0';
}
},
+ handleChangeValueRight1(val) {
+ console.log("33333"+val);
+
+ switch (val){
+ case 1:
+ valueRight1 = '100';
+ case 2:
+ valueRight1 = '100';
+ case 3:
+ valueRight1 = '100';
+ case 4:
+ valueRight1 = '100';
+ default:
+ valueRight1 = '0';
+ }
+ },
tableRowClassName({row, rowIndex}) {
if (rowIndex === 1) {
return 'warning-row';
@@ -558,7 +756,9 @@
}
}
});
-
+ // setTimeout(function() {
+ //
+ // }, 1000);
},
getValueSystem() {
let that = this;
@@ -582,16 +782,18 @@
if (that.valueSystem){
operatorTypeI = 1;
}
- $.ajax({
- url: baseUrl + "/console/system/switch",
- headers: {'token': localStorage.getItem('token')},
- data: {operatorType : operatorTypeI},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- that.valueSystem = res.data.status;
+ this.verifyPassword(() => {
+ $.ajax({
+ url: baseUrl + "/console/system/switch",
+ headers: {'token': localStorage.getItem('token')},
+ data: {operatorType : operatorTypeI},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ that.valueSystem = res.data.status;
+ }
}
- }
+ });
});
},
getTableDataLeft() {
@@ -610,6 +812,22 @@
}
});
},
+ getTableDataLeft1() {
+ let that = this;
+ $.ajax({
+ url: baseUrl + "/rgv/ring/through/task/wrk/mast/position/data/v1",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {},
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'post',
+ success: function (res) {
+ that.tableDataLeft1 = res.data
+ }
+ });
+ },
getTableDataRight() {
let that = this;
$.ajax({
@@ -626,6 +844,22 @@
}
});
},
+ getTableDataRight1() {
+ let that = this;
+ $.ajax({
+ url: baseUrl + "/rgv/task/rgv/circular/shuttle/mast/position/data/v1",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {},
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'post',
+ success: function (res) {
+ that.tableDataRight1 = res.data
+ }
+ });
+ },
getTableDataRgv() {
let that = this;
// that.tableDataRgv = busPsto
--
Gitblit v1.9.1