From 3133f82f550ed4f278932b539682b950d7b72828 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 28 五月 2025 14:54:48 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index a2ad04d..1b7bfd3 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -120,8 +120,8 @@
                                                     <!-- 鐧惧垎姣� -->
                                                     <view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
                                                         <!-- style="justify-content: flex-end;position: absolute;top: 0;right: 1vw;text-align: right;" -->
-                                                        <text class="item-title">31</text>
-                                                        <text class="item-subTitle">浠婃棩璁㈠崟鏁�</text>
+                                                       <!-- <text class="item-title">31</text>
+                                                        <text class="item-subTitle">浠婃棩璁㈠崟鏁�</text> -->
                                                     </view>
                                                 </view>
                                             </view>
@@ -201,7 +201,7 @@
             </view>
         </uni-transition>
         <!-- 鍏ㄦ澘/鎷f枡淇℃伅 -->
-        <uni-transition :duration="duration" :mode-class="infoMode" :show="infoViewShow">
+        <uni-transition :duration="duration" :mode-class="infoMode" v-if="infoViewShow">
             <view class="home-view">
                 <view class="head">
                     <text>{{infoText.title}}</text>
@@ -218,11 +218,11 @@
                             <view class="text-content">
                                 <!-- head -->
                                 <view class="swiper-head">
-                                    <view style="width: 20%;">鐩爣绔欙細{{infoText.staNo}}</view>
-                                    <view style="width: 30%;">鍟嗗搧缂栧彿</view>
-                                    <view style="width: 20%;">鍟嗗搧鍚嶇О</view>
-                                    <view style="width: 20%;">瑙勬牸</view>
-                                    <view style="width: 10%;">鏁伴噺</view>
+                                    <view style="flex:1">鐩爣绔欙細{{infoText.staNo}}</view>                                    
+                                    <view style="flex:2">鍟嗗搧鍚嶇О</view>
+                                    <view style="flex:1">鎵瑰彿</view>
+									<view style="flex:1">瑙勬牸</view>
+                                    <view style="flex:1">鏁伴噺</view>
                                 </view>
                                 <!-- body -->
                                 <view class="swiper-body">
@@ -231,14 +231,14 @@
                                     vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
                                     display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
                                     <swiper class="swiper-body-main" vertical="true" 
-                                    display-multiple-items="8"
+                                    display-multiple-items="7"
                                     circular="true" :autoplay="true" :interval="3000" :duration="1000">
                                         <swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
-                                            <view style="width: 20%;">No:{{i+1}}</view>
-                                            <view style="width: 30%;">{{item.matNo}}</view>
-                                            <view style="width: 20%;">{{item.maknx}}</view>
-                                            <view style="width: 20%;">{{item.specs}}</view>
-                                            <view style="width: 10%;">{{item.count}}</view>
+                                            <view style="flex:1">No:{{i+1}}</view>                                            
+                                            <view style="flex:2">{{item.maknx}}</view>
+                                            <view style="flex:1">{{item.batch}}</view>
+											<view style="flex:1">{{item.space}}</view>
+                                            <view style="flex:1">{{item.count}}</view>
                                         </swiper-item>
                                     </swiper>
                                 </view>
@@ -249,7 +249,7 @@
             </view>
         </uni-transition>
         <!-- 寮傚父淇℃伅 -->
-        <uni-transition :duration="duration" :mode-class="errorInfoMode" :show="errorInfoViewShow">
+        <uni-transition :duration="duration" :mode-class="errorInfoMode" v-if="errorInfoViewShow">
             <view class="error-info-view">
                 <view class="head">
                     <text>{{infoText.title}}</text>
@@ -433,7 +433,7 @@
                 // this.getError2()
                 this.controller()
             },1000)
-            
+						
             // setInterval(()=>{
             //     this.changeErrorShow()
             // },5000)
@@ -446,6 +446,13 @@
             },600000)
         },
         methods: {
+			triggerRestart() {
+			      if (window.Android) {
+			        window.Android.requestRestart();
+			      } else {
+			        console.error("Native 鎺ュ彛鏈氨缁�");
+			      }
+			    },
             // 鏃ュ巻 鏈嶅姟鍣�
             getDate2() {
                 let that = this
@@ -1097,4 +1104,4 @@
         height: 20%;font-size: 8vh;
         justify-content: center;
     }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.1