From 6ef61d813f82276c832db30cdc9ab0cea24bcbe1 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 10 一月 2024 15:35:11 +0800
Subject: [PATCH] Merge branch 'bfMonitor' of http://47.97.1.152:5880/r/private into bfMonitor
---
Monitor-APP/pages/index/data.json | 2 +-
Monitor-APP/pages.json | 10 ++++++++++
Monitor-APP/pages/home/home.vue | 8 +++-----
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/Monitor-APP/pages.json b/Monitor-APP/pages.json
index 654e330..54a5551 100644
--- a/Monitor-APP/pages.json
+++ b/Monitor-APP/pages.json
@@ -45,6 +45,16 @@
"style": {
"navigationStyle": "custom"
}
+ },
+ {
+ "path": "pages/test/test",
+ "style": {
+ "navigationStyle": "custom",
+ // 鍘绘帀椤堕儴瀵艰埅鏍�
+ "app-plus": {
+ "titleNView": false
+ }
+ }
}
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index e9ab206..6146452 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -3,7 +3,7 @@
<uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
<view class="home-view">
<view class="head">
- <text>鑷姩浠撳簱WCS鐩戞帶骞冲彴</text>
+ <text>涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺</text>
</view>
<!-- 鏃ュ巻 -->
<view class="time-tools">{{calendar}}</view>
@@ -15,7 +15,7 @@
<view class="mian-item-box">
<y-box>
<view class="box-item">
- <text class="item-title">鑷姩鍖栫珛浣撲粨搴�</text>
+ <text class="item-title">涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺</text>
<text class="item-subTitle">Automatic Storageand Retrieval System</text>
<text class="item-text" style="text-align: left;">鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涜嚜鍔ㄥ寲绔嬩綋浠撳簱鏄綋鍓嶆妧鏈按骞宠緝楂樼殑褰㈠紡銆傝嚜鍔ㄥ寲绔嬩綋浠撳簱鐨勪富浣撶敱璐ф灦銆佸贩閬撳紡鍫嗗灈璧烽噸鏈恒�佸叆锛堝嚭锛夊簱宸ヤ綔鍙板拰鑷姩杩愯繘锛堝嚭锛夊強鎿嶄綔鎺у埗绯荤粺缁勬垚銆傝揣鏋舵槸閽㈢粨鏋勬垨閽㈢瓔娣峰嚌鍦熺粨鏋勭殑寤虹瓚鐗╂垨缁撴瀯浣擄紝璐ф灦鍐呮槸鏍囧噯灏哄鐨勮揣浣嶇┖闂达紝宸烽亾鍫嗗灈璧烽噸鏈虹┛琛屼簬璐ф灦涔嬮棿鐨勫贩閬撲腑锛屽畬鎴愬瓨銆佸彇璐х殑宸ヤ綔銆傜鐞嗕笂閲囩敤璁＄畻鏈哄強鏉″舰鐮佹妧鏈��</text>
</view>
@@ -186,9 +186,7 @@
<view style="height: 18%;">
<y-box>
<view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
- <!-- 鍢夊杽杈归攱鏈烘鑲′唤鏈夐檺鍏徃 -->
- 鑷姩浠撳簱WCS鐩戞帶骞冲彴
- <!-- <image src="../../static/vietnam.jpg" mode="" style="width: 100%;"></image> -->
+ 涓壃鏅鸿兘澶у睆鏄剧ず绯荤粺
</view>
</y-box>
</view>
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 6a4f283..d8a5284 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -91,7 +91,7 @@
"data": {
"msg": "鎿嶄綔鎴愬姛",
"code": 200,
- "data": ""
+ "data": ""
}
},
"lineData": {
--
Gitblit v1.9.1