From f23352f53b2c06313ac9808c62399c7de0d44e3a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 06 六月 2025 17:40:03 +0800
Subject: [PATCH] *
---
src/main/webapp/views/index.html | 310 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 272 insertions(+), 38 deletions(-)
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 78ab26d..088a6f8 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -59,15 +59,15 @@
}
.station {
position: absolute;
- width: 40px;
- height: 24px;
- /*border-radius: 50%;*/
+ width: 20px;
+ height: 14px;
text-align: center;
- line-height: 24px;
+ line-height: 1.5; /* 璋冩暣琛岄珮涓庡瓧浣撳ぇ灏忕殑姣斿�� */
+ font-size: 10px; /* 璁剧疆鏇村皬鐨勫瓧浣� */
font-weight: bold;
transition: transform 0.3s ease;
background-color: #ab1839;
- transform: scale(1.2);
+ transform: scale(1); /* 鍙�夛細濡傛灉涓嶉渶瑕佹斁澶ф晥鏋� */
}
.bus {
font-size: 10px;
@@ -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); /* 鍗婇�忔槑鑳屾櫙 */
@@ -218,17 +244,17 @@
"
style="fill:none; stroke:blue; stroke-width:4;" />
</svg>
- <div class="bus-station">
- <div v-for="(item,i) in devpPos1" class="bus-item-top" :style="'left:' + (75 + i * 15) + 'px'">{{item.dev_no}}</div>
- </div>
- <div class="bus-station" style="flex-direction: column">
- <div v-for="(item,i) in devpPos2" class="bus-item-left" :style="'top:' + (200 + i * 50) + 'px'">{{item.dev_no}}</div>
- </div>
- <div class="bus-station" style="flex-direction: column">
- <div v-for="(item,i) in devpPos3" class="bus-item-left2" :style="'top:' + (100 + i * 10) + 'px'">{{item.dev_no}}</div>
- </div>
- <!-- Stations on outer ring -->
-<!-- <div v-for="station in tableDataDev" class="station" :style="{ top: station.valueX + '%', left: station.valueY + '%' }">{{ station.index }}</div>-->
+<!-- <div class="bus-station">-->
+<!-- <div v-for="(item,i) in devpPos1" class="bus-item-top" :style="'left:' + (75 + i * 15) + 'px'">{{item.dev_no}}</div>-->
+<!-- </div>-->
+<!-- <div class="bus-station" style="flex-direction: column">-->
+<!-- <div v-for="(item,i) in devpPos2" class="bus-item-left" :style="'top:' + (200 + i * 50) + 'px'">{{item.dev_no}}</div>-->
+<!-- </div>-->
+<!-- <div class="bus-station" style="flex-direction: column">-->
+<!-- <div v-for="(item,i) in devpPos3" class="bus-item-left2" :style="'top:' + (100 + i * 10) + 'px'">{{item.dev_no}}</div>-->
+<!-- </div>-->
+<!-- Stations on outer ring-->
+ <div v-for="station in tableDataDev" class="station" :style="{ top: station.valueY + 'px', left: station.valueX + 'px' }">{{ station.index }}</div>
<div>
<el-switch
style="display: block"
@@ -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="鏇存柊鏃堕棿">-->
@@ -294,11 +328,62 @@
prop="rgvSts"
label="RGV鐘舵��">
</el-table-column>
-<!-- <el-table-column-->
-<!-- prop=""-->
-<!-- label="鎿嶄綔">-->
-<!-- <el-button type="primary" icon="el-icon-edit" circle></el-button>-->
-<!-- </el-table-column>-->
+ <el-table-column
+ label="鎿嶄綔"
+ type="template">
+ <template slot-scope="scope">
+ <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>
</div>
@@ -339,6 +424,10 @@
label="鐘舵��">
</el-table-column>
<el-table-column
+ prop="error$"
+ label="寮傚父">
+ </el-table-column>
+ <el-table-column
label="鎿嶄綔"
type="template">
<template slot-scope="scope">
@@ -353,6 +442,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>
@@ -361,7 +482,9 @@
data: {
activeNames: ['1'],
valueLeft: '0',
+ valueLeft1: '0',
valueRight: '0',
+ valueRight1: '0',
licenseDay: '宸茶繃鏈�',
licenseDayI: 100,
valueSystem: false,
@@ -369,7 +492,9 @@
tableDataDev: [],
energyGatheringRing: [],
tableDataLeft: [],
+ tableDataLeft1: [],
tableDataRight: [],
+ tableDataRight1: [],
devpPos1:[
{dev_no: 116,pos:633980},
{dev_no: 117,pos:604043},
@@ -424,7 +549,9 @@
this.getTableDataDev()
this.getTableDataTrack()
this.getTableDataLeft()
+ this.getTableDataLeft1()
this.getTableDataRight()
+ this.getTableDataRight1()
this.getValueSystem()
this.getLicenseDays()
@@ -433,11 +560,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);
@@ -451,11 +596,50 @@
}
}
},
+ 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('纭瑕佸垹闄よ璁惧鍚�?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ $.ajax({
+ url: baseUrl + "/rgv/disable/task/delete",
+ 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('鍒犻櫎澶辫触');
+ }
+ }
+ });
+ });
+ },
toggleStatus(index, row) {
+ let that = this;
const currentStatus = row.status;
const targetStatus = currentStatus === 0 ? 1 : 0;
- this.$confirm(`纭瑕�${currentStatus === 0 ? '绂佺敤' : '鍚敤'}璇ヨ澶囧悧?`, '鎻愮ず', {
+ that.$confirm(`纭瑕�${currentStatus === 0 ? '绂佺敤' : '鍚敤'}璇ヨ澶囧悧?`, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
@@ -465,15 +649,15 @@
headers: {'token': localStorage.getItem('token')},
method: 'POST',
data: {
- rgvId: row.rgvNo,
+ rgvNo: row.rgvNo,
status: targetStatus
},
success: function (res) {
if (res.code === 200) {
- this.$message.success(`鐘舵�佹洿鏂版垚鍔焋);
+ that.$message.success(`鐘舵�佹洿鏂版垚鍔焋);
row.status$ = targetStatus; // 鏇存柊鍓嶇鐘舵��
} else {
- this.$message.error('鐘舵�佹洿鏂板け璐�');
+ that.$message.error('鐘舵�佹洿鏂板け璐�');
}
}
});
@@ -493,6 +677,22 @@
valueRight = '100';
default:
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}) {
@@ -544,20 +744,22 @@
},
upDateValueSystem(){
let that = this;
- let operatorTypeI = 0;
- 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(() => {
+ let operatorTypeI = 0;
+ 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;
+ }
+ }
+ });
});
},
getTableDataLeft() {
@@ -576,6 +778,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({
@@ -592,6 +810,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