From 6db2bdd2972a7ee971baa88207457b33be4350cf Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 17 Jan 2025 10:48:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Setup.vue          |  2 +-
 src/pages/modules/index2.vue | 16 ++++++++--------
 src/vuex/modules/com.js      |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue
index ab928cf..21a03ad 100644
--- a/src/pages/Setup.vue
+++ b/src/pages/Setup.vue
@@ -46,7 +46,7 @@ export default {
       baseUrl: this.$store.getters.baseUrl,
       setJxtTime: this.$store.getters.setJxtTime / 1000,
       setTime: this.$store.getters.setTime / 1000,
-      options: [{value: 1, label: '拣选台'}, {value: 2, label: '仓储监控'}],
+      options: [{value: '1', label: '拣选台'}, {value: '2', label: '仓储监控'}],
       value: this.$store.getters.pageNo
     }
   },
diff --git a/src/pages/modules/index2.vue b/src/pages/modules/index2.vue
index 8804848..c4f2a1d 100644
--- a/src/pages/modules/index2.vue
+++ b/src/pages/modules/index2.vue
@@ -43,27 +43,27 @@
             <div v-if="lx_task.length > 1" class="wraper_4 zd-row flexcol jccenter">
               <div class="zd-row flexstart mgb8">
                 <div class="zd-col-3 item_label">入库</div>
-                <div class="zd-col-20">
+                <div class="zd-col-21">
                   <div class="percent_line">
                     <div class="percent_i" :style="{'width': getPercentage(lx_task[0].box, lx_task[0].total)}"></div>
                   </div>
                   <div class="zd-row">
                     <p class="item_label font_2">总数量:<span class="c_y">{{ lx_task[0].total }}</span></p>
                     <p class="item_label font_2">箱数:<span class="c_y">{{ lx_task[0].box }}</span>箱</p>
-                    <p class="item_label font_2">耗时:<span class="c_y">{{ lx_task[0].time }}</span></p>
+                    <p class="item_label font_2">时间评估:<span class="c_y">{{ lx_task[0].time }}</span></p>
                   </div>
                 </div>
               </div>
               <div class="zd-row flexstart">
                 <div class="zd-col-3 item_label">出库</div>
-                <div class="zd-col-20">
+                <div class="zd-col-21">
                   <div class="percent_line percent_line_c">
                     <div class="percent_i percent_i_c" :style="{'width': getPercentage(lx_task[1].box, lx_task[1].total)}"></div>
                   </div>
                   <div class="zd-row">
                     <p class="item_label font_2">总数量:<span class="c_y">{{ lx_task[1].total }}</span></p>
                     <p class="item_label font_2">箱数:<span class="c_y">{{ lx_task[1].box }}</span>箱</p>
-                    <p class="item_label font_2">耗时:<span class="c_y">{{ lx_task[1].time }}</span></p>
+                    <p class="item_label font_2">时间评估:<span class="c_y">{{ lx_task[1].time }}</span></p>
                   </div>
                 </div>
               </div>
@@ -150,27 +150,27 @@
             <div v-if="tp_task.length > 1" class="wraper_4 zd-row flexcol jccenter">
               <div class="zd-row flexstart mgb8">
                 <div class="zd-col-3 item_label">入库</div>
-                <div class="zd-col-20">
+                <div class="zd-col-21">
                   <div class="percent_line">
                     <div class="percent_i" :style="{'width': getPercentage(tp_task[0].box, tp_task[0].total)}"></div>
                   </div>
                   <div class="zd-row">
                     <p class="item_label font_2">总数量:<span class="c_y">{{ tp_task[0].total }}</span></p>
                     <p class="item_label font_2">箱数:<span class="c_y">{{ tp_task[0].box }}</span>箱</p>
-                    <p class="item_label font_2">耗时:<span class="c_y">{{ tp_task[0].time }}</span></p>
+                    <p class="item_label font_2">时间评估:<span class="c_y">{{ tp_task[0].time }}</span></p>
                   </div>
                 </div>
               </div>
               <div class="zd-row flexstart">
                 <div class="zd-col-3 item_label">出库</div>
-                <div class="zd-col-20">
+                <div class="zd-col-21">
                   <div class="percent_line percent_line_c">
                     <div class="percent_i percent_i_c" :style="{'width': getPercentage(tp_task[1].box, tp_task[1].total)}"></div>
                   </div>
                   <div class="zd-row">
                     <p class="item_label font_2">总数量:<span class="c_y">{{ tp_task[1].total }}</span></p>
                     <p class="item_label font_2">箱数:<span class="c_y">{{ tp_task[1].box }}</span>箱</p>
-                    <p class="item_label font_2">耗时:<span class="c_y">{{ tp_task[1].time }}</span></p>
+                    <p class="item_label font_2">时间评估:<span class="c_y">{{ tp_task[1].time }}</span></p>
                   </div>
                 </div>
               </div>
diff --git a/src/vuex/modules/com.js b/src/vuex/modules/com.js
index 925fefc..46a3f32 100644
--- a/src/vuex/modules/com.js
+++ b/src/vuex/modules/com.js
@@ -9,7 +9,7 @@ const state = {
   baseUrl: getStore('baseUrl') || baseUrl,
   setTime: getStore('setTime') || 15000,
   setJxtTime: getStore('setJxtTime') || 3000,
-  pageNo: getStore('pageNo') || 1
+  pageNo: getStore('pageNo') || '1'
 }
 
 const actions = {