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 | 151 +++++++++++++++++++++++++++++++------------------
1 files changed, 95 insertions(+), 56 deletions(-)
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 78ab26d..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>
@@ -59,15 +59,15 @@
}
.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;
@@ -138,7 +138,7 @@
}
.container {
width: 100vh;
- height: 72vh;
+ height: 90vh;
position: absolute;
/*background: #8c939d;*/
}
@@ -204,31 +204,28 @@
<!-- L 250,100-->
<!-- C 250,100 90,90 100,250 z"-->
<!-- style="fill:none; stroke:blue; stroke-width:4;" />-->
- <path d="M 1200,750
- L 1200,100
- C 1200,100 1200,50 1150,50
- C 1150,50 1100,50 1100,100
- L 1100,700
- C 1100,700 1100,750 1050,750
- L 60,750
- C 60,750 10,750 10,800
- C 10,800 10,850 60,850
- L 1100,850
- C 1100,850 1200,850 1200,750
-"
- style="fill:none; stroke:blue; stroke-width:4;" />
+ <path d="M 0 0
+ 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: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.valueX + '%', left: station.valueY + '%' }">{{ station.index }}</div>-->
+<!-- <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"
@@ -276,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"
@@ -295,9 +296,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>
@@ -321,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"
@@ -338,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>
@@ -451,11 +463,38 @@
}
}
},
+ 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;
- this.$confirm(`纭瑕�${currentStatus === 0 ? '绂佺敤' : '鍚敤'}璇ヨ澶囧悧?`, '鎻愮ず', {
+ that.$confirm(`纭瑕�${currentStatus === 0 ? '绂佺敤' : '鍚敤'}璇ヨ澶囧悧?`, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
@@ -465,15 +504,15 @@
headers: {'token': localStorage.getItem('token')},
method: 'POST',
data: {
- rgvId: row.rgvNo,
+ rgvNo: row.rgvNo,
status: targetStatus
},
success: function (res) {
if (res.code === 200) {
- this.$message.success(`鐘舵�佹洿鏂版垚鍔焋);
+ that.$message.success(`鐘舵�佹洿鏂版垚鍔焋);
row.status$ = targetStatus; // 鏇存柊鍓嶇鐘舵��
} else {
- this.$message.error('鐘舵�佹洿鏂板け璐�');
+ that.$message.error('鐘舵�佹洿鏂板け璐�');
}
}
});
--
Gitblit v1.9.1