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 | 101 +++++++++++++++++++++++++++++---------------------
1 files changed, 58 insertions(+), 43 deletions(-)
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index b8dbdfd..b39d309 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -5,7 +5,7 @@
<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>
@@ -137,8 +137,9 @@
background: #f0f9eb;
}
.container {
- width: 100vh;
- height: 72vh;
+ margin-left: 20vh;
+ width: 120vh;
+ height: 90vh;
position: absolute;
/*background: #8c939d;*/
}
@@ -203,15 +204,21 @@
<!-- 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 0 0
- L 80 0
- L 80 600
- L 800 600
- L 800 650
- L 0 650
- Z"
- 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>-->
@@ -224,17 +231,17 @@
<!-- </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>
+<!-- <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.valueY + 'px', left: bus.valueX + 'px' , borderColor: bus.modeColor, backgroundColor: bus.statusColor}">{{ bus.index }}</div>
</div>
@@ -271,7 +278,11 @@
</el-table-column>
<el-table-column
prop="sourceStaNo"
- label="婧愮珯">
+ label="RGV婧愮珯">
+ </el-table-column>
+ <el-table-column
+ prop="rgvDstaNo"
+ label="RGV鐩爣绔�">
</el-table-column>
<el-table-column
prop="staNo"
@@ -289,18 +300,18 @@
prop="rgvSts"
label="RGV鐘舵��">
</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-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>
@@ -323,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"
@@ -364,7 +379,7 @@
activeNames: ['1'],
valueLeft: '0',
valueRight: '0',
- licenseDay: '宸茶繃鏈�',
+ licenseDay: ' ',
licenseDayI: 100,
valueSystem: false,
tableDataRgv: [],
@@ -541,14 +556,14 @@
success: function (res) {
if (res.code == 200) {
if (res.data.day<0){
- that.licenseDay = "宸茶繃鏈�"+res.data.day+"澶�";
+ that.licenseDay = " "+res.data.day+"澶�";
that.licenseDayI = -1;
} else {
that.licenseDay = "璁稿彲璇佹湁鏁堟湡"+res.data.day+"澶�";
that.licenseDayI = res.data.day;
}
}else {
- that.licenseDay = "宸茶繃鏈�";
+ that.licenseDay = " ";
that.licenseDayI = -1;
}
}
--
Gitblit v1.9.1