From a19d10e17b289c35ed08203fd63735bcec96cae8 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 23 七月 2024 18:50:07 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 70 +++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 24 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index e7d7992..de5d0d0 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>
@@ -236,12 +234,12 @@
<view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view>
<!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
<view style="width: 40%;">鍚嶇О: {{item.maknx}}</view>
- <view style="width: 30%;">瀹㈡埛: {{item.manu}}</view>
+ <view style="width: 30%;">璁㈠崟: {{item.orderNo}}</view>
<view style="width: 30%;">鍑哄簱: {{item.count}} / 鎬绘暟: {{item.total}}</view>
<view style="width: 40%;">瑙勬牸: {{item.specs}}</view>
- <view style="width: 30%;">澶囨敞: {{item.memo}}</view>
+ <view style="width: 30%;">鎵瑰彿: {{item.batch}}</view>
</swiper-item>
@@ -282,7 +280,7 @@
<!-- 寮瑰嚭title -->
<view class="eject-title">淇敼 / 閰嶇疆</view>
<!-- input -->
- <view class="eject-input">
+ <scroll-view scroll-y class="eject-input">
<view class="item">
<view class="desc">ip锛�</view>
<view class="input">
@@ -313,7 +311,7 @@
<input type="text" v-model="baseUrl">
</view>
</view>
- </view>
+ </scroll-view>
<!-- button -->
<view class="eject-button">
<view class="button-item" @click="ejectClose">鍙� 娑�</view>
@@ -393,7 +391,8 @@
swiperList: [],
timeOut: false,
times: 0,
- currDate: ''
+ currDate: '',
+ socketInfo2: ''
}
},
onShow() {
@@ -417,25 +416,44 @@
// this.getUrl()
},
onLoad() {
+ this.ws()
setInterval(()=>{
- this.getServerData()
- this.initlineChart()
- this.initPieChart()
- this.getOther()
+ // this.getServerData()
+ // this.initlineChart()
+ // this.initPieChart()
+ // this.getOther()
// this.getDate()
- this.getDate2()
- // this.getInfo()
+ // this.getDate2()
+ this.getInfo()
// this.getError()
- this.getInfo2()
- this.getError2()
- this.getUrl()
- this.controller()
+ // this.getInfo2()
+ // this.getError2()
+ // this.getUrl()
+ // this.controller()
+
// 娴嬭瘯鐢�
},1000)
+
},
methods: {
- timeOut() {
+ ws() {
+ let _this = this
+ _this.connectWS()
+ uni.onSocketOpen(function (res) {
+ console.log("Open");
+ })
+ uni.onSocketClose(function (res) {
+ console.log("Close");
+ setInterval(()=>{
+ _this.connectWS()
+ },1000)
+ })
+ },
+ connectWS() {
+ uni.connectSocket({ url: `http://127.0.0.1:9090/pswcs/console/websocket`, })
+ },
+ timeOut1() {
console.log(this.times);
},
getUrl() {
@@ -556,7 +574,7 @@
},
fail(err) {
that.timeOut = true
- that.times = that.times+3
+ that.times = that.times+1
that.infoType = 0
}
})
@@ -809,6 +827,7 @@
ledId: that.baseLedId,
},
success(result) {
+ console.log(result);
var res = result.data
if (res.code === 200) {
that.baseInfo.xDistance = res.data.xDistance
@@ -1060,12 +1079,15 @@
text-align: center;
}
.eject-input {
-
+ margin-top: 2vh;
+ height: 25vh;
+ /* background-color: #00163E; */
+ ::-webkit-scrollbar{display:none}
}
.item {
display: flex;
align-items: center;
- margin: 2vh 0 0 0;
+ margin: 1vh 0 0 0;
font-size: 1.5vw;
color: #363636;
}
--
Gitblit v1.9.1