From a6ddc35c9f177ec73abef648fed0ac6de16d856f Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期六, 26 七月 2025 16:18:07 +0800
Subject: [PATCH] rgv调动分配优化：判断当前任务取货站点后续小车任务放货完后能不能取当前任务
---
src/main/webapp/views/index.html | 92 +++++++++++++++++++++++++---------------------
1 files changed, 50 insertions(+), 42 deletions(-)
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 9a152eb..da21376 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>
@@ -226,17 +226,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>
@@ -273,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"
@@ -291,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>
@@ -325,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"
@@ -342,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