From c7ecb255c9e685725095be2a6bd74b1696d4af22 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期四, 07 八月 2025 16:14:53 +0800
Subject: [PATCH] rgv界面优化
---
src/main/webapp/views/index.html | 322 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 276 insertions(+), 46 deletions(-)
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 9bdc716..b39d309 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -5,11 +5,12 @@
<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">
+<!-- <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>
<script type="text/javascript" src="../static/js/element.js"></script>
+ <script type="text/javascript" src="testPosition.js"></script>
<style>
body {
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
@@ -33,7 +34,7 @@
}
.map {
position: relative;
- width: 80vh;
+ width: 52vw;
height: 80vh;
border-radius: 50%;
display: flex;
@@ -58,30 +59,32 @@
}
.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;
background-color: #2196F3;
- border: 20px solid #ffffff;
+ border: 10px solid #ffffff;
position: absolute;
- width: 24px;
- height: 24px;
+ width: 15px;
+ height: 15px;
border-radius: 50%;
text-align: center;
- line-height: 24px;
+ line-height: 15px;
font-weight: bold;
transition: transform 0.3s ease;
}
.station:hover, .bus:hover {
transform: scale(1.4);
+ z-index: 999;
}
.task-bar-left {
@@ -133,6 +136,47 @@
.el-table .success-row {
background: #f0f9eb;
}
+ .container {
+ margin-left: 20vh;
+ width: 120vh;
+ height: 90vh;
+ position: absolute;
+ /*background: #8c939d;*/
+ }
+ .bus-station {
+ width: 100vh;
+ height: 72vh;
+ position: absolute;
+ display: flex;
+ /*background: #8c939d;*/
+ }
+ .bus-item-top {
+ background: red;
+ position: relative;
+ width: 40px;
+ height: 60px;
+ line-height: 60px;
+ top: 880px;
+ text-align: center;
+ }
+ .bus-item-left {
+ background: red;
+ position: relative;
+ width: 60px;
+ height: 40px;
+ line-height: 40px;
+ left: 1230px;
+ text-align: center;
+ }
+ .bus-item-left2 {
+ background: red;
+ position: relative;
+ width: 60px;
+ height: 40px;
+ line-height: 40px;
+ left: 1000px;
+ text-align: center;
+ }
</style>
</head>
<body>
@@ -141,26 +185,65 @@
<!--</header>-->
<div id="app">
<div class="map">
+ <div v-if="licenseDayI <=30 ">
+ <div style="color: red">{{licenseDay}}</div>
+ </div>
<!-- <div class="inner-ring"></div>-->
<!-- <div class="outer-ring"></div>-->
- <div v-for="track in energyGatheringRing" class="inner-ring" :style="{ borderColor: track.trackColor , boxShadow : 'inset 0 0 30px '+track.radiationColor+', 0 0 20px '+track.radiationColor}"></div>
- <div v-for="track in energyGatheringRing" class="outer-ring" :style="{ borderColor: track.trackColor , boxShadow : 'inset 0 0 30px '+track.radiationColor+', 0 0 20px '+track.radiationColor}"></div>
-
- <!-- Stations on outer ring -->
- <div v-for="station in tableDataDev" class="station" :style="{ top: station.valueX + '%', left: station.valueY + '%' }">{{ station.index }}</div>
- <div>
- <el-switch
- style="display: block"
- v-model="valueSystem"
- active-color="#13ce66"
- inactive-color="#A64036"
- active-text="绯荤粺杩愯涓�..."
- inactive-text="绯荤粺宸插仠姝�!"
- @change='upDateValueSystem'>
- </el-switch>
- </div>
+<!-- <div v-for="track in energyGatheringRing" class="inner-ring" :style="{ borderColor: track.trackColor , boxShadow : 'inset 0 0 30px '+track.radiationColor+', 0 0 20px '+track.radiationColor}"></div>-->
+<!-- <div v-for="track in energyGatheringRing" class="outer-ring" :style="{ borderColor: track.trackColor , boxShadow : 'inset 0 0 30px '+track.radiationColor+', 0 0 20px '+track.radiationColor}"></div>-->
+ <svg class="container">
+<!-- <path d="M 100,250-->
+<!-- L 100,800-->
+<!-- C 100,800 100,850 150,850-->
+<!-- C 150,850 200,850 200,800-->
+<!-- L 200,250-->
+<!-- C 200,250 200,200 250,200-->
+<!-- L 1100,200-->
+<!-- C 1100,200 1150,200 1150,150-->
+<!-- C 1150,150 1150,100 1100,100-->
+<!-- L 250,100-->
+<!-- C 250,100 90,90 100,250 z"-->
+ <!-- C 32,810 32,850 65,850-->
+ <!-- C 65,850 100,850 100,810-->
+<!-- style="fill:none; stroke:blue; stroke-width:4;" />-->
+ <path d="M 66,0
+ C 66,0 32,0 32,40
+ L 32,770
+ C 32,770 31,810 72,810
+ L 1000,810
+ C 1000,810 1020,810 1020,790
+ C 1020,790 1020,770 1000,770
+ L 120,770
+ C 120,770 100,770 100,750
+ L 100,40
+ C 100,40 100,0 66,0 z"
+ style="fill:none; stroke:blue; stroke-width:1;" />
+ </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.valueY + 'px', left: station.valueX + 'px' }">{{ station.index }}</div>
+<!-- <div>-->
+<!-- <el-switch-->
+<!-- style="display: block"-->
+<!-- v-model="valueSystem"-->
+<!-- active-color="#13ce66"-->
+<!-- inactive-color="#A64036"-->
+<!-- active-text="绯荤粺杩愯涓�..."-->
+<!-- inactive-text="绯荤粺宸插仠姝�!"-->
+<!-- @change='upDateValueSystem'>-->
+<!-- </el-switch>-->
+<!-- </div>-->
<!-- Buses -->
- <div v-for="bus in tableDataRgv" class="bus" :style="{ top: bus.valueX + '%', left: bus.valueY + '%' , borderColor: bus.modeColor, backgroundColor: bus.statusColor}">{{ bus.index }}</div>
+ <div v-for="bus in tableDataRgv" class="bus" :style="{ top: bus.valueY + 'px', left: bus.valueX + 'px' , borderColor: bus.modeColor, backgroundColor: bus.statusColor}">{{ bus.index }}</div>
</div>
<!-- Left Task Bar -->
@@ -194,12 +277,16 @@
label="宸ヤ綔鐘舵��">
</el-table-column>
<el-table-column
- prop="staNo"
- label="鐩爣绔�">
+ prop="sourceStaNo"
+ label="RGV婧愮珯">
</el-table-column>
<el-table-column
- prop="sourceStaNo"
- label="婧愮珯">
+ prop="rgvDstaNo"
+ label="RGV鐩爣绔�">
+ </el-table-column>
+ <el-table-column
+ prop="staNo"
+ label="鐩爣绔�">
</el-table-column>
<el-table-column
prop="modiTime"
@@ -214,9 +301,16 @@
label="RGV鐘舵��">
</el-table-column>
<!-- <el-table-column-->
-<!-- prop=""-->
-<!-- label="鎿嶄綔">-->
-<!-- <el-button type="primary" icon="el-icon-edit" circle></el-button>-->
+<!-- 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>
@@ -240,14 +334,18 @@
:data="tableDataRight"
style="width: 100%"
:row-class-name="tableRowClassName">
- <el-table-column
- prop="rgvId"
- label="缂栧彿"
- width="80">
- </el-table-column>
+<!-- <el-table-column-->
+<!-- prop="rgvId"-->
+<!-- label="缂栧彿"-->
+<!-- width="80">-->
+<!-- </el-table-column>-->
<el-table-column
prop="rgvNo"
label="灏忚溅鍙�">
+ </el-table-column>
+ <el-table-column
+ prop="taskNo"
+ label="浠诲姟鍙�">
</el-table-column>
<el-table-column
prop="position"
@@ -257,11 +355,18 @@
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-column
+ label="鎿嶄綔"
+ type="template">
+ <template slot-scope="scope">
+ <el-button
+ :type="scope.row.status === 0 ? 'primary' : 'danger'"
+ size="small"
+ @click="toggleStatus(scope.$index, scope.row)">
+ {{ scope.row.status === 0 ? '绂佺敤' : '瑙ｉ櫎绂佺敤' }}
+ </el-button>
+ </template>
+ </el-table-column>
</el-table>
</div>
</div>
@@ -274,15 +379,58 @@
activeNames: ['1'],
valueLeft: '0',
valueRight: '0',
+ licenseDay: ' ',
+ licenseDayI: 100,
valueSystem: false,
tableDataRgv: [],
tableDataDev: [],
energyGatheringRing: [],
tableDataLeft: [],
- tableDataRight: []
+ tableDataRight: [],
+ devpPos1:[
+ {dev_no: 116,pos:633980},
+ {dev_no: 117,pos:604043},
+ {dev_no: 118,pos:574323},
+ {dev_no: 119,pos:559534},
+ {dev_no: 120,pos:544682},
+ {dev_no: 121,pos:514912},
+ {dev_no: 122,pos:485227},
+ {dev_no: 123,pos:470367},
+ {dev_no: 124,pos:455514},
+ {dev_no: 125,pos:425768},
+ {dev_no: 126,pos:396268},
+ {dev_no: 127,pos:381106},
+ {dev_no: 128,pos:366311},
+ {dev_no: 129,pos:336638},
+ {dev_no: 130,pos:306820},
+ {dev_no: 131,pos:277067},
+ {dev_no: 132,pos:257418},
+ {dev_no: 133,pos:217730},
+ ],
+ devpPos2:[
+ {dev_no: 112,pos:891000},
+ {dev_no: 113,pos:865000},
+ {dev_no: 114,pos:800000},
+ {dev_no: 115,pos:780000},
+ ],
+ devpPos3:[
+ {dev_no: 101,pos:1269958},
+ {dev_no: 102,pos:1243454},
+ {dev_no: 103,pos:1229081},
+ {dev_no: 104,pos:1202099},
+ {dev_no: 105,pos:1187564},
+ {dev_no: 106,pos:1160630},
+ {dev_no: 107,pos:1146152},
+ {dev_no: 108,pos:1119463},
+ {dev_no: 109,pos:1105038},
+ {dev_no: 110,pos:1077961},
+ {dev_no: 111,pos:1063813},
+ ],
},
created(){
this.init();
+ this.devpPos1.reverse()
+ this.devpPos3.reverse()
},
watch: {
@@ -295,6 +443,7 @@
this.getTableDataLeft()
this.getTableDataRight()
this.getValueSystem()
+ this.getLicenseDays()
setInterval(() => {
this.getTableDataRgv()
@@ -303,6 +452,7 @@
this.getTableDataLeft()
this.getTableDataRight()
this.getValueSystem()
+ this.getLicenseDays()
}, 1000)
},
@@ -317,6 +467,61 @@
this.handleChangeValueRight(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;
+
+ that.$confirm(`纭瑕�${currentStatus === 0 ? '绂佺敤' : '鍚敤'}璇ヨ澶囧悧?`, '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ $.ajax({
+ url: baseUrl + "/rgv/disable/rgv/status",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ data: {
+ rgvNo: row.rgvNo,
+ status: targetStatus
+ },
+ success: function (res) {
+ if (res.code === 200) {
+ that.$message.success(`鐘舵�佹洿鏂版垚鍔焋);
+ row.status$ = targetStatus; // 鏇存柊鍓嶇鐘舵��
+ } else {
+ that.$message.error('鐘舵�佹洿鏂板け璐�');
+ }
+ }
+ });
+ });
},
handleChangeValueRight(val) {
console.log("33333"+val);
@@ -341,6 +546,29 @@
return 'success-row';
}
return '';
+ },
+ getLicenseDays(){
+ let that = this;
+ $.ajax({
+ url: baseUrl + "/license/getLicenseDays",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code == 200) {
+ if (res.data.day<0){
+ that.licenseDay = " "+res.data.day+"澶�";
+ that.licenseDayI = -1;
+ } else {
+ that.licenseDay = "璁稿彲璇佹湁鏁堟湡"+res.data.day+"澶�";
+ that.licenseDayI = res.data.day;
+ }
+ }else {
+ that.licenseDay = " ";
+ that.licenseDayI = -1;
+ }
+ }
+ });
+
},
getValueSystem() {
let that = this;
@@ -410,6 +638,8 @@
},
getTableDataRgv() {
let that = this;
+ // that.tableDataRgv = busPsto
+ // return
$.ajax({
url: baseUrl + "/rgv/ring/through/rgv/position/data",
headers: {
--
Gitblit v1.9.1