From ef7c01de9d4fdc7229cc2a92b8e48d9f60cad44a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 22 十月 2024 16:47:02 +0800
Subject: [PATCH] *
---
src/main/webapp/views/index.html | 147 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 129 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index befcbfe..f302c07 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -4,6 +4,8 @@
<meta charset="utf-8">
<title>鐜舰绌挎杞︽櫤鑳界郴缁�</title>
<link rel="stylesheet" href="../static/css/element.css">
+ <link rel="stylesheet" href="../static/css/element-ui.css">
+ <link rel="icon" href="../static/images/favicon.ico" type="image/x-icon">
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
<script type="text/javascript" src="../static/js/vue.min.js"></script>
@@ -82,9 +84,22 @@
transform: scale(1.4);
}
- .task-bar {
+ .task-bar-left {
position: fixed;
top: 10%;
+ 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: 20%;
transform: translateY(-50%);
width: 25%; /* 璁剧疆瀹藉害 */
background-color: rgba(255, 255, 255, 0); /* 鍗婇�忔槑鑳屾櫙 */
@@ -137,11 +152,11 @@
</div>
<!-- Left Task Bar -->
- <div class="task-bar left-task-bar" >
+ <div class="task-bar-left left-task-bar" >
<div>
- <el-tooltip :content="'Switch value: ' + value" placement="top">
+ <el-tooltip :content="'Switch value: ' + valueLeft" placement="top">
<el-switch
- v-model="value"
+ v-model="valueLeft"
active-color="#13ce66"
inactive-color="#ff4949"
active-value="100"
@@ -149,15 +164,18 @@
</el-switch>
</el-tooltip>
</div>
- <div v-if="value === '100' ">
+ <div v-if="valueLeft === '100' " class="task-bar-div1">
<el-table
:data="tableDataLeft"
style="width: 100%"
:row-class-name="tableRowClassName">
<el-table-column
prop="wrkNo"
- label="宸ヤ綔鍙�"
- width="80">
+ label="宸ヤ綔鍙�">
+ </el-table-column>
+ <el-table-column
+ prop="rgvNo"
+ label="RGV鍙�">
</el-table-column>
<el-table-column
prop="wrkSts$"
@@ -175,24 +193,68 @@
prop="modiTime"
label="涓嬪彂鏃堕棿">
</el-table-column>
- <el-table-column
- prop="modiTime"
- label="鏇存柊鏃堕棿">
- </el-table-column>
+<!-- <el-table-column-->
+<!-- prop="modiTime"-->
+<!-- label="鏇存柊鏃堕棿">-->
+<!-- </el-table-column>-->
<el-table-column
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>
</div>
</div>
<!-- Right Task Bar -->
- <div id = "app3" class="task-bar right-task-bar">
- <h3>浠诲姟淇℃伅</h3>
- <p>浠诲姟3: 鎻忚堪3</p>
- <p>浠诲姟4: 鎻忚堪4</p>
- <!-- 杩欓噷鍙互鍔ㄦ�佺敓鎴愪换鍔′俊鎭� -->
+ <div class="task-bar-right right-task-bar">
+
+ <div style="top: 20%;margin-top: 10px">
+ </div>
+ <div v-if="valueRight === '100' " class="task-bar-div1" style="margin-top: 200px">
+ <el-table
+ :data="tableDataRight"
+ style="width: 100%"
+ :row-class-name="tableRowClassName">
+ <el-table-column
+ prop="rgvId"
+ label="缂栧彿"
+ width="80">
+ </el-table-column>
+ <el-table-column
+ prop="rgvNo"
+ label="灏忚溅鍙�">
+ </el-table-column>
+ <el-table-column
+ prop="position"
+ label="浣嶇疆">
+ </el-table-column>
+ <el-table-column
+ prop="status$"
+ label="鐘舵��">
+ </el-table-column>
+ <el-table-column
+ prop=""
+ label="鎿嶄綔">
+ <el-button type="primary" icon="el-icon-edit" circle></el-button>
+ </el-table-column>
+ </el-table>
+ </div>
+ <div>
+ <el-tooltip :content="'Switch value: ' + valueRight" placement="top">
+ <el-switch
+ v-model="valueRight"
+ active-color="#13ce66"
+ inactive-color="#ff4949"
+ active-value="100"
+ inactive-value="0">
+ </el-switch>
+ </el-tooltip>
+ </div>
</div>
</div>
@@ -200,11 +262,14 @@
var app = new Vue({
el: '#app',
data: {
- value: '100',
+ activeNames: ['1'],
+ valueLeft: '0',
+ valueRight: '0',
tableDataRgv: [],
tableDataDev: [],
energyGatheringRing: [],
- tableDataLeft: []
+ tableDataLeft: [],
+ tableDataRight: []
},
created(){
this.init();
@@ -218,13 +283,43 @@
this.getTableDataDev()
this.getTableDataTrack()
this.getTableDataLeft()
+ this.getTableDataRight()
setInterval(() => {
this.getTableDataRgv()
this.getTableDataDev()
this.getTableDataTrack()
this.getTableDataLeft()
+ this.getTableDataRight()
}, 1000)
+ },
+ handleChange(val) {
+ console.log(val);
+ if (val.length === 0){
+ valueRight = '0';
+ } else {
+ console.log("2222"+val);
+
+ if (val.length >= 1){
+ this.handleChangeValueRight(1)
+ }
+ }
+ },
+ handleChangeValueRight(val) {
+ console.log("33333"+val);
+
+ switch (val){
+ case 1:
+ valueRight = '100';
+ case 2:
+ valueRight = '100';
+ case 3:
+ valueRight = '100';
+ case 4:
+ valueRight = '100';
+ default:
+ valueRight = '0';
+ }
},
tableRowClassName({row, rowIndex}) {
if (rowIndex === 1) {
@@ -250,6 +345,22 @@
}
});
},
+ getTableDataRight() {
+ let that = this;
+ $.ajax({
+ url: baseUrl + "/rgv/task/rgv/circular/shuttle/mast/position/data",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {},
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'post',
+ success: function (res) {
+ that.tableDataRight = res.data
+ }
+ });
+ },
getTableDataRgv() {
let that = this;
$.ajax({
--
Gitblit v1.9.1