From 8b860862a8df2c6e727738dda181822fdbc492d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Wed, 5 Jun 2024 10:10:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8D=E5=AD=97=E4=B8=8E?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=AF=B9=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/checkManage/Subsection.vue     | 27 ++++++++++++++++--
 src/views/checkManage/checkOperation.vue | 35 ++++++++++++++----------
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue
index e708aaf..a75000d 100644
--- a/src/views/checkManage/Subsection.vue
+++ b/src/views/checkManage/Subsection.vue
@@ -3,7 +3,7 @@
         <a-layout style="width: 1500px">
             <a-layout style="width: 100%;height: 310px">
                 <a-layout-sider width="110px">
-                    <a-tabs default-active-key="1" tab-position="left" @change="changeTabLeft" v-if="total.row > nums.row">
+                    <a-tabs :activeKey="this.select.row" tab-position="left" @change="changeTabLeft" v-if="total.row > nums.row">
                         <a-tab-pane 
                             v-for="index in latticeRow"
                             :key="index"
@@ -39,10 +39,11 @@
             </a-layout>
             <a-layout-footer>
                 <!-- <a-tabs default-active-key="1" tab-position="bottom" @change="value => select.row = value" v-if="total.row > nums.row"> -->
-                <a-tabs default-active-key="1" tab-position="bottom" @change="changeTab" v-if="total.column > nums.column">
+                <a-tabs :activeKey="this.select.column" tab-position="bottom" @change="changeTab" v-if="total.column > nums.column">
                     <a-tab-pane
                         v-for="index in latticeColumn"
                         :key="index"
+
                     >
                             <span slot="tab">
                                 {{  getRandom(index, latticeColumn, nums.column, total.column) }}
@@ -156,7 +157,7 @@ export default {
                 row: {},
                 column: {}
             },
-            timer: null
+            timer: null,
         }
     },
     mounted() {
@@ -180,7 +181,21 @@ export default {
         this.timer = null;
     },
     created() {
+        var nameEQC = "s"+this.streetId+"d"+this.direction+"e"+this.side + "c" + "=";
+        var nameEQR = "s"+this.streetId+"d"+this.direction+"e"+this.side + "r" + "=";
+        var ca = document.cookie.split(';');
         
+        for(var i=0;i < ca.length;i++) {
+            var c = ca[i];
+            while (c.charAt(0)==' ') c = c.substring(1,c.length);
+            if (c.indexOf(nameEQC) == 0) {
+                this.select.column = Number(c.substring(nameEQC.length,c.length));
+            }
+            if (c.indexOf(nameEQR) == 0) {
+                this.select.row = Number(c.substring(nameEQR.length,c.length));
+            }
+                
+        }
     },
     destroyed() {
         window.clearInterval(this.timer);        
@@ -189,10 +204,15 @@ export default {
     
     methods: {
         changeTab(value){
+            document.cookie = "s"+this.streetId+"d"+this.direction+"e"+this.side + "c"+ "=" +value;
+
             this.select.column = value
             this.getStatus()
         },
         changeTabLeft(value){
+            
+            document.cookie = "s"+this.streetId+"d"+this.direction+"e"+this.side + "r" + "=" +value;
+            
             this.select.row = value
             this.getStatus()
 
@@ -207,6 +227,7 @@ export default {
         },
         // 获取行和列的范围数组
         getRandomRow(val) {
+            console.log(" "+this.latticeRow);
             console.log(this.latticeRow + 1 - val, this.latticeRow, this.nums.row, this.total.row)
             return this.getRandom(this.latticeRow + 1 - val, this.latticeRow, this.nums.row, this.total.row).split(' - ').map(item => Number(item));
         },
diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index a342df9..2d7d0b5 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -35,16 +35,16 @@
                                         ref="select"
                                         style="width: 100%"
                                         show-search
-                                        :placeholder="checkObj.category"
-                                        :defaultValue="checkObj.category"
+                                       
+                                        :value="checkObj.category"
                                         @change="handleChangeVlue"
                                     >
                                         <a-select-option
-                                            v-for="i in categorys"
-                                            :key="i"
-                                            :value="i"
+                                            v-for="(value, key) in categorys"
+                                            :key="value"
+                                            :value="key"
                                         >
-                                            {{ i}}
+                                            {{ value}}
                                         </a-select-option>
                                     </a-select>
                                 </span>
@@ -143,16 +143,17 @@
                         style="top: 20px;"
                         @ok="overoperationPicStop"
                     >
-                    <div style="height: 700px;"  class="parent">
-
-
-                        <img
-                        
-                            style="width:700px ;"
-                            :src="checkObj.overoperationPic"
+                        <div
+                            style="height: 700px;"
+                            class="parent"
                         >
 
-                    </div>
+                            <img
+                                style="width:700px ;"
+                                :src="checkObj.overoperationPic"
+                            >
+
+                        </div>
                     </a-modal>
 
                     随行图像
@@ -194,7 +195,7 @@ export default {
             modelData: {},
             index: 0,
             imgUrl: "",
-            categorys: ["3", "2"],
+            categorys: {},
             params: [
                 {
                     label: "上位个数",
@@ -204,6 +205,10 @@ export default {
                     label: "上位品规",
                     key: "wmsCategory",
                 },
+                {
+                    label: "上位品规名",
+                    key: "wmsCategoryName",
+                },
                 {
                     label: "盘点任务号",
                     key: "checkNum",