From c3aa506aedf391136db49450dc5cc75990ba238f Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 06 六月 2025 17:33:38 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/controller/RgvController.java |   15 +++++++
 src/main/webapp/views/index.html                        |   77 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 2e64a3d..0b889d3 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -57,6 +57,8 @@
     @Autowired
     private BasRgvErrLogService basRgvErrLogService;
     @Autowired
+    private BasRgvOptService basRgvOptService;
+    @Autowired
     private BasRgvService basRgvService;
     @Autowired
     private MainServiceImpl mainService;
@@ -451,6 +453,19 @@
         return R.ok().add(result);
     }
 
+    @PostMapping("/ring/through/task/wrk/mast/position/data/v1")
+//    @ManagerAuth(memo = "浣滀笟淇℃伅")
+    public R ringThroughTaskWrkMastV1(){
+        List<BasRgvOpt> result = new ArrayList<>();
+        for (int i = 1 ; i<11; i ++){
+            BasRgvOpt basRgvOpt = basRgvOptService.selectOne(new EntityWrapper<BasRgvOpt>().eq("rgv_no", i).orderBy("id", false));
+            if (basRgvOpt!=null){
+                result.add(basRgvOpt);
+            }
+        }
+        return R.ok().add(result);
+    }
+
     @PostMapping("/task/rgv/circular/shuttle/mast/position/data")
 //    @ManagerAuth(memo = "浣滀笟淇℃伅")
     public R rgvCircularShuttle(){
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 72ad13c..1204dde 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -100,6 +100,19 @@
             z-index: 1000; /* 纭繚鍦ㄥ叾浠栧厓绱犱箣涓� */
         }
 
+        .task-bar-left1 {
+            position: fixed;
+            top: 5%;
+            /*transform: translateY(-50%);*/
+            width: 25%; /* 璁剧疆瀹藉害 */
+            background-color: rgba(255, 255, 255, 0); /* 鍗婇�忔槑鑳屾櫙 */
+
+            border-radius: 5px;
+            padding: 10px;
+            box-shadow: 0 0 10px rgba(0, 0, 0, 0);
+            z-index: 1000; /* 纭繚鍦ㄥ叾浠栧厓绱犱箣涓� */
+        }
+
         .task-bar-right {
             position: fixed;
             top: 1%;
@@ -330,6 +343,50 @@
                 </el-table>
             </div>
         </div>
+        <div class="task-bar-left1 left-task-bar" >
+            <div>
+                <el-tooltip :content="'Switch value: ' + valueLeft1" placement="top">
+                    <el-switch
+                            v-model="valueLeft1"
+                            active-color="#13ce66"
+                            inactive-color="#ff4949"
+                            active-value="100"
+                            inactive-value="0">
+                    </el-switch>
+                </el-tooltip>
+            </div>
+            <div v-if="valueLeft1 === '100' " class="task-bar-div1">
+                <el-table
+                        :data="tableDataLeft1"
+                        style="width: 100%"
+                        :row-class-name="tableRowClassName">
+                    <el-table-column
+                            prop="wrkNo1"
+                            label="宸ヤ綔鍙�">
+                    </el-table-column>
+                    <el-table-column
+                            prop="rgvNo"
+                            label="RGV鍙�">
+                    </el-table-column>
+                    <el-table-column
+                            prop="sendTime"
+                            label="涓嬪彂鏃堕棿">
+                    </el-table-column>
+                    <el-table-column
+                            prop="mode"
+                            label="绫诲瀷">
+                    </el-table-column>
+                    <el-table-column
+                            prop="sourceSta"
+                            label="璧风偣">
+                    </el-table-column>
+                    <el-table-column
+                            prop="posSta"
+                            label="缁堢偣">
+                    </el-table-column>
+                </el-table>
+            </div>
+        </div>
 
         <!-- Right Task Bar -->
         <div class="task-bar-right right-task-bar">
@@ -425,6 +482,7 @@
             data: {
                 activeNames: ['1'],
                 valueLeft: '0',
+                valueLeft1: '0',
                 valueRight: '0',
                 valueRight1: '0',
                 licenseDay: '宸茶繃鏈�',
@@ -434,6 +492,7 @@
                 tableDataDev: [],
                 energyGatheringRing: [],
                 tableDataLeft: [],
+                tableDataLeft1: [],
                 tableDataRight: [],
                 tableDataRight1: [],
                 devpPos1:[
@@ -490,6 +549,7 @@
                     this.getTableDataDev()
                     this.getTableDataTrack()
                     this.getTableDataLeft()
+                    this.getTableDataLeft1()
                     this.getTableDataRight()
                     this.getTableDataRight1()
                     this.getValueSystem()
@@ -500,6 +560,7 @@
                         this.getTableDataDev()
                         this.getTableDataTrack()
                         this.getTableDataLeft()
+                        this.getTableDataLeft1()
                         this.getTableDataRight()
                         this.getTableDataRight1()
                         this.getValueSystem()
@@ -717,6 +778,22 @@
                         }
                     });
                 },
+                getTableDataLeft1() {
+                    let that = this;
+                    $.ajax({
+                        url: baseUrl + "/rgv/ring/through/task/wrk/mast/position/data/v1",
+                        headers: {
+                            'token': localStorage.getItem('token')
+                        },
+                        data: {},
+                        dataType: 'json',
+                        contentType: 'application/json;charset=UTF-8',
+                        method: 'post',
+                        success: function (res) {
+                            that.tableDataLeft1 = res.data
+                        }
+                    });
+                },
                 getTableDataRight() {
                     let that = this;
                     $.ajax({

--
Gitblit v1.9.1