From 0f23bd234becce8bcb280a11513992a96c8ad734 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期五, 25 七月 2025 15:02:07 +0800
Subject: [PATCH] rgv取空托调度优化
---
src/main/webapp/views/index.html | 86 ++++++++++++++++++++++++-------------------
1 files changed, 48 insertions(+), 38 deletions(-)
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index b8dbdfd..7548540 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>
@@ -138,7 +138,7 @@
}
.container {
width: 100vh;
- height: 72vh;
+ height: 90vh;
position: absolute;
/*background: #8c939d;*/
}
@@ -205,13 +205,15 @@
<!-- C 250,100 90,90 100,250 z"-->
<!-- 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
+ L 32 -40
+ L 32 810
+ L 1100 810
+ L 1100 770
+ L 100 770
+ L 100 -40
+<!-- L 40 40-->
Z"
- style="fill:none; stroke:blue; stroke-width:4;" />
+ 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>-->
@@ -271,7 +273,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 +295,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 +329,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"
@@ -340,18 +350,18 @@
prop="status$"
label="鐘舵��">
</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-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>
--
Gitblit v1.9.1