From 0d21b36b1179a77c86f8fdcce12566be7f3fc8fa Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 03 十一月 2023 09:21:06 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/data.json | 362 ---------------------------------------------------
Monitor-APP/pages/home/home.css | 5
Monitor-APP/pages/home/home.vue | 42 ++++-
3 files changed, 37 insertions(+), 372 deletions(-)
diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
index 48b4fd0..37ebedf 100644
--- a/Monitor-APP/pages/home/home.css
+++ b/Monitor-APP/pages/home/home.css
@@ -1,8 +1,11 @@
.text-content {
width: 100%;
height: 100%;
- font-size: 16px;
+ font-size: 3vw;
/* background-color: aliceblue; */
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
}
.swiper-head {
width: 100%;
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 92ce788..974c350 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -212,22 +212,30 @@
<view class="info-box">
<y-box>
<!-- 鏂囨湰瀹瑰櫒 -->
- <view class="text-content">
+ <view class="text-content" v-for="item in swiperList">
+ <view>鐩爣绔欙細{{infoText.staNo}}</view>
+ <view>鍟嗗搧鍚嶇О锛歿{item.matnr}}</view>
+ <view>鍟嗗搧鍚嶇О锛歿{item.maknx}}</view>
+ <view>瑙勬牸锛歿{item.specs}}</view>
+ <view>鏁伴噺锛歿{item.count}} / {{item.total ? item.total : '--'}}</view>
+
+
+
<!-- head -->
- <view class="swiper-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>
+ </view> -->
<!-- body -->
- <view class="swiper-body">
+ <!-- <view class="swiper-body"> -->
<!-- swiper 涓�浜涜鏄�
circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
- <swiper class="swiper-body-main" vertical="true"
+ <!-- <swiper class="swiper-body-main" vertical="true"
display-multiple-items="8"
circular="true" :autoplay="true" :interval="3000" :duration="1000">
<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
@@ -238,7 +246,7 @@
<view style="width: 10%;">{{item.count}}</view>
</swiper-item>
</swiper>
- </view>
+ </view> -->
</view>
</y-box>
</view>
@@ -418,18 +426,25 @@
},
onLoad() {
setInterval(()=>{
+ // this.getInfo()
+ // this.getError()
+ this.getInfo2()
+ this.getError2()
+ this.controller()
+ },1000)
+ setInterval(()=>{
this.getServerData()
this.initlineChart()
this.initPieChart()
this.getOther()
this.getDate2()
- // this.getInfo()
- // this.getError()
- this.getInfo2()
- this.getError2()
- this.getUrl()
- this.controller()
- },1000)
+ },3600000)
+ this.getUrl()
+ this.getServerData()
+ this.initlineChart()
+ this.initPieChart()
+ this.getOther()
+ this.getDate2()
},
methods: {
timeOuts() {
@@ -447,6 +462,7 @@
let that = this
var result = ycqdata.dataInfo2
var res = result.data
+ console.log(res);
that.infoModel(res)
},
getError2 () {
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 6cb808b..b848837 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -2,374 +2,20 @@
"dataInfo2":
{"data":{"msg": "鎿嶄綔鎴愬姛","code": 200,"data": [{
"title":"鍏ㄦ澘鍑哄簱",
- "workNo":8046,
- "staNo":4,
+ "workNo":7083,
+ "staNo":217,
"sourceStaNo":null,
"locNo":null,
"sourceLocNo":"1500502",
"barcode": "80009901",
"matDtos":[
{
- "matnr":"LPJ.SLJ.XG.037",
+ "matnr":"00841LH-10",
"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
"batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
- "specs":"gcslxwt"
- },
- {
- "matnr":"LPJ.SLJ.XG.037",
- "maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0,
+ "total": null,
"specs":"gcslxwt"
}
-
],
"emptyMk":false,
"ioType":101
--
Gitblit v1.9.1