From e5f08a919372efd49247ba3e6f339519ef32767b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 03 十一月 2023 16:22:12 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 508 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 358 insertions(+), 150 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 2056396..70e0285 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -1,6 +1,5 @@
<template>
<view class="container">
-
<uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
<view class="home-view">
<view class="head">
@@ -29,10 +28,10 @@
<image src="../../static/a1.png" mode="aspectFit"></image>
<view class="flex-col" style="width: calc(100% - 5vw);">
<view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 5vw;;font-size: 2vw;">{{baseInfo.xDistance}}</view>
- <view style="position: absolute;bottom: 0;left: 7vw;">m</view>
+ <view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDistance}}</view>
+ <view style="position: absolute;bottom: 0;left: 10vw;">KM</view>
</view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌璺濈(绫�)</view>
+ <view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌璺濈(鍗冪背)</view>
</view>
</view>
@@ -40,10 +39,10 @@
<image src="../../static/b1.png" mode="aspectFit"></image>
<view class="flex-col" style="width: calc(100% - 5vw);">
<view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 5vw;;font-size: 2vw;">{{baseInfo.yDistance}}</view>
- <view style="position: absolute;bottom: 0;left: 7vw;">m</view>
+ <view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDistance}}</view>
+ <view style="position: absolute;bottom: 0;left: 10vw;">KM</view>
</view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷璺濈(绫�)</view>
+ <view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷璺濈(鍗冪背)</view>
</view>
</view>
@@ -51,10 +50,10 @@
<image src="../../static/c1.png" mode="aspectFit"></image>
<view class="flex-col" style="width: calc(100% - 5vw);">
<view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 5vw;;font-size: 2vw;">{{baseInfo.xDuration}}</view>
- <view style="position: absolute;bottom: 0;left: 7vw;">s</view>
+ <view style="-width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDuration}}</view>
+ <view style="position: absolute;bottom: 0;left: 10vw;">H</view>
</view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌鏃堕暱(绉�)</view>
+ <view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌鏃堕暱(灏忔椂)</view>
</view>
</view>
@@ -62,10 +61,10 @@
<image src="../../static/d1.png" mode="aspectFit"></image>
<view class="flex-col" style="width: calc(100% - 5vw);">
<view class="flex-row" style="position: relative;" >
- <view style="width: 2vw;padding-left: 5vw;;font-size: 2vw;">{{baseInfo.yDuration}}</view>
- <view style="position: absolute;bottom: 0;left: 7vw;">s</view>
+ <view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDuration}}</view>
+ <view style="position: absolute;bottom: 0;left: 10vw;">H</view>
</view>
- <view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷鏃堕暱(绉�)</view>
+ <view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷鏃堕暱(灏忔椂)</view>
</view>
</view>
@@ -165,17 +164,17 @@
<view class="flex-row sub-info">
<image src="../../static/g1.png" mode="aspectFit"></image>
<view style="width: 8vw;height: 4vw;line-height: 4vw;">鍦ㄥ簱</view>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">10000</view>
+ <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.stockCount}}</view>
</view>
<view class="flex-row sub-info" style="margin-top: 2vh;">
- <image src="../../static/g1.png" mode="aspectFit"></image>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;">鍦ㄥ簱</view>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">10000</view>
+ <image src="../../static/f1.png" mode="aspectFit"></image>
+ <view style="width: 8vw;height: 4vw;line-height: 4vw;">绌哄簱</view>
+ <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.emptyCount}}</view>
</view>
<view class="flex-row sub-info" style="margin-top: 2vh;">
- <image src="../../static/g1.png" mode="aspectFit"></image>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;">鍦ㄥ簱</view>
- <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">10000</view>
+ <image src="../../static/e1.png" mode="aspectFit"></image>
+ <view style="width: 8vw;height: 4vw;line-height: 4vw;">閿佸畾</view>
+ <view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.noneCount}}</view>
</view>
</view>
</view>
@@ -187,7 +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鐩戞帶骞冲彴
</view>
</y-box>
</view>
@@ -202,7 +201,7 @@
<uni-transition :duration="duration" :mode-class="infoMode" :show="infoViewShow">
<view class="home-view">
<view class="head">
- <text>鍏ㄦ澘 / 鎷ｆ枡</text>
+ <text>{{infoText.title}}</text>
</view>
<!-- 鏃ュ巻 -->
<view class="time-tools">{{calendar}}</view>
@@ -211,7 +210,45 @@
<!-- 涓讳綋 -->
<view class="info-main">
<view class="info-box">
- <y-box>{{text}}</y-box>
+ <y-box>
+ <!-- 鏂囨湰瀹瑰櫒 -->
+ <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 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> -->
+ <!-- body -->
+ <!-- <view class="swiper-body"> -->
+ <!-- swiper 涓�浜涜鏄�
+ circular 鏄惁閲囩敤琛旀帴婊戝姩锛屽嵆鎾斁鍒版湯灏惧悗閲嶆柊鍥炲埌寮�澶�
+ vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚�
+ display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
+ <!-- <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">
+ <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>
+ </swiper-item>
+ </swiper>
+ </view> -->
+ </view>
+ </y-box>
</view>
</view>
</view>
@@ -220,7 +257,7 @@
<uni-transition :duration="duration" :mode-class="errorInfoMode" :show="errorInfoViewShow">
<view class="error-info-view">
<view class="head">
- <text>寮傚父</text>
+ <text>{{infoText.title}}</text>
</view>
<!-- 鏃ュ巻 -->
<view class="time-tools">{{calendar}}</view>
@@ -229,7 +266,11 @@
<!-- 涓讳綋 -->
<view class="info-main" >
<view class="info-box">
- <y-box>{{text1}}</y-box>
+ <y-box>
+ <view class="info-box-text">
+ <view class="flex-col info-box-text-item">{{infoText.error}}</view>
+ </view>
+ </y-box>
</view>
</view>
</view>
@@ -241,7 +282,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">
@@ -266,7 +307,13 @@
<input type="text" v-model="baseCrnId">
</view>
</view>
- </view>
+ <view class="item">
+ <view class="desc">Url锛�</view>
+ <view class="input">
+ <input type="text" v-model="baseUrl">
+ </view>
+ </view>
+ </scroll-view>
<!-- button -->
<view class="eject-button">
<view class="button-item" @click="ejectClose">鍙� 娑�</view>
@@ -274,9 +321,12 @@
</view>
</view>
</view>
+ <view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
+ 杩炴帴瓒呮椂: {{times}} s
+ </view>
</view>
</template>
-
+<!-- {"msg":"鎿嶄綔鎴愬姛","code":200,"data":[{"title":"鍏ㄦ澘鍑哄簱","workNo":7460,"staNo":110,"sourceStaNo":null,"locNo":null,"sourceLocNo":"0807102","matDtos":[{"matNo":"50460834","maknx":"200x60妗岄潰","count":26.0}],"emptyMk":false,"ioType":101}]} -->
<script>
import demodata from '@/mockdata/demodata.json';
import ycqdata from '@/pages/index/data.json';
@@ -285,7 +335,7 @@
return {
series: [],
homeViewShow: true,
- infoViewShow: false,
+ infoViewShow: false ,
errorInfoViewShow: false,
homeMode: [],
infoMode: [],
@@ -296,7 +346,10 @@
xDuration: 3,
yDuration: 4,
usedPr: 50,
- used: 3537
+ used: 3537,
+ stockCount: '',
+ emptyCount: '',
+ noneCount: '',
},
chartsData: {
"Line": {
@@ -322,15 +375,33 @@
basePort: '',
baseLedId: '',
baseCrnId: '',
+ baseUrl: '',
info: null,
error: null,
infoType: 0,
text: '',
- text1: '',
-
-
-
-
+ infoText: {
+ title: '',
+ staNo: "",
+ matnr: "",
+ maknx: "",
+ specs: "",
+ count: "",
+ error: "",
+ barcode: "",
+ orderNo: '',
+ batch: '',
+ doneOfTray: '',
+ totalOfTray: '',
+ doneOfUnit: '',
+ totalOfUnit: '',
+ ctnNo: '1'
+ },
+ swiperList: [],
+ timeOut: false,
+ times: 0,
+ currDate: '',
+ textred: 'textred'
}
},
onShow() {
@@ -339,46 +410,92 @@
plus.navigator.setFullscreen(true)
// #endif
},
+ mounted() {
+ let that = this
+ const BaseIP = uni.getStorageSync('BaseIp');
+ const BaseLedId = uni.getStorageSync('BaseLedId');
+ const BasePort = uni.getStorageSync('BasePort');
+ const BaseCrnId = uni.getStorageSync('BaseCrnId');
+ const PROJ = uni.getStorageSync('UPROJ');
+ that.baseUrl = PROJ
+ that.baseIP = BaseIP
+ that.baseLedId = BaseLedId
+ that.basePort = BasePort
+ that.baseCrnId = BaseCrnId
+ // this.getUrl()
+ },
onLoad() {
- this.getServerData()
- this.getDate()
setInterval(()=>{
- this.getDate()
- this.getInfo()
- this.getError()
+ // this.getInfo()
+ // this.getError()
+ this.getInfo2()
+ this.getError2()
this.controller()
},1000)
setInterval(()=>{
- // this.controller()
- },2000)
+ this.getServerData()
+ this.initlineChart()
+ this.initPieChart()
+ this.getOther()
+ this.getDate2()
+ },3600000)
+ this.getUrl()
+ this.getServerData()
+ this.initlineChart()
+ this.initPieChart()
+ this.getOther()
+ this.getDate2()
},
methods: {
+ timeOuts() {
+ console.log(this.times);
+ },
getUrl() {
- this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + this.baseUrl
+ this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
},
getServerData() {
- this.chartsDataLine1=JSON.parse(JSON.stringify(demodata.Line))
- this.chartsDataPie2=JSON.parse(JSON.stringify(demodata.PieA))
+ this.chartsDataLine1=JSON.parse(JSON.stringify(this.chartsData.Line))
+ this.chartsDataPie2=JSON.parse(JSON.stringify(this.chartsData.Pie))
+ },
+ // 鑾峰彇閿欒淇℃伅
+ getInfo2() {
+ let that = this
+ var result = ycqdata.dataInfo2
+ var res = result.data
+ console.log(res);
+ that.infoModel(res)
+ },
+ getError2 () {
+ let that = this
+ let result = ycqdata.dataError2
+ var res = result.data
+ if (res.data && res.data !== "") {
+ var errorInfo = res.data
+ if (that.infoType == 1) {
+ that.infoType = 3
+ that.infoText.title = "寮傚父"
+ that.infoText.error = errorInfo
+ return
+ }
+ that.infoType = 2
+ that.infoText.title = "寮傚父"
+ that.infoText.error = errorInfo
+ } else {
+ if (that.infoType == 1) {
+ return
+ }
+ that.infoType = 0
+ }
},
getInfo() {
let that = this
uni.request({
- url: "http://192.168.1.111:8088/sxjzwms/system/error",
+ url: that.commonUrl + "/monitor/led",
method:"GET",
+ data: {ledId:that.baseLedId},
success(result) {
var res = result.data
- if (res.data && res.data !== "") {
- if (that.infoType == 2 || that.infoType == 3) {
- return;
- }
- that.infoType = 1
- that.text = res
- } else {
- if (that.infoType == 2 || that.infoType == 3) {
- return;
- }
- that.infoType = 0
- }
+ that.infoModel(res)
}
})
@@ -386,18 +503,24 @@
getError() {
let that = this
uni.request({
- url:"http://192.168.1.111:8088/sxjzwms/mat/info",
+ url: that.commonUrl + "/monitor/led/error",
+ data: {ledId:that.baseLedId},
method:"GET",
success(result) {
var res = result.data
if (res.data && res.data !== "") {
+ var errorInfo = res.data
if (that.infoType == 1) {
that.infoType = 3
- that.text1 = res
+ that.infoText.title = "鍏朵粬淇℃伅"
+ // that.infoText.title = "寮傚父"
+ that.infoText.error = errorInfo
return
}
that.infoType = 2
- that.text1 = res
+ that.infoText.title = "鍏朵粬淇℃伅"
+ // that.infoText.title = "寮傚父"
+ that.infoText.error = errorInfo
} else {
if (that.infoType == 1) {
return
@@ -408,10 +531,63 @@
})
},
+ infoModel(res) {
+ let that = this
+ if (res.data && res.data !== "") {
+ if (that.infoType == 2 || that.infoType == 3) {
+ return;
+ }
+ // infoType1:鍙湁鎷ｆ枡绛変俊鎭�
+ that.infoType = 1
+ if (res.data[0].ioType === 101) {
+ that.infoText.title = '鍏ㄦ澘鍑哄簱'
+ } else if(res.data[0].ioType === 103) {
+ that.infoText.title = '妫�鏂欏嚭搴�'
+ } else if(res.data[0].ioType === 107) {
+ that.infoText.title = '鐩樼偣鍑哄簱'
+ }
+ that.infoText.staNo = res.data[0].staNo
+ that.swiperList = res.data[0].matDtos
+ // that.infoText.matnr = res.data[0].matDtos[0].matnr
+ // that.infoText.specs = res.data[0].matDtos[0].specs
+ // that.infoText.maknx = res.data[0].matDtos[0].maknx
+ // that.infoText.count = res.data[0].matDtos[0].count
+ } else {
+ if (that.infoType == 2 || that.infoType == 3) {
+ return;
+ }
+ that.infoType = 0
+ }
+ },
// 鎺у埗鍣�
controller() {
switch(this.infoType) {
// 鏈変俊鎭� 浣� 娌℃湁閿欒淇℃伅
+ case 0:
+ if (this.errorInfoViewShow) {
+ this.errorInfoViewShow = false
+ this.errorInfoMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.homeViewShow = true
+ this.homeMode = ['fade', 'slide-bottom']
+ },1000)
+ } else if (this.infoViewShow) {
+ this.infoViewShow = false
+ this.infoMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.homeViewShow = true
+ this.homeMode = ['fade', 'slide-bottom']
+ },1000)
+ } else if (this.errorInfoViewShow && this.infoViewShow) {
+ this.errorInfoViewShow = false
+ this.infoViewShow = false
+ this.infoMode = ['fade', 'slide-bottom']
+ setTimeout(()=>{
+ this.homeViewShow = true
+ this.homeMode = ['fade', 'slide-bottom']
+ },1000)
+ }
+ return;
case 1:
if (this.homeViewShow) {
this.homeViewShow = false
@@ -466,23 +642,7 @@
},1000)
}
return;
- default :
- if (this.errorInfoViewShow) {
- this.errorInfoViewShow = false
- this.errorInfoMode = ['fade', 'slide-bottom']
- setTimeout(()=>{
- this.homeViewShow = true
- this.homeMode = ['fade', 'slide-bottom']
- },1000)
- } else if (this.infoViewShow) {
- this.infoViewShow = false
- this.infoMode = ['fade', 'slide-bottom']
- setTimeout(()=>{
- this.homeViewShow = true
- this.homeMode = ['fade', 'slide-bottom']
- },1000)
- }
- return;
+
}
},
@@ -515,9 +675,31 @@
uni.setStorageSync('BaseLedId', this.baseLedId);
uni.setStorageSync('BasePort',this.basePort);
uni.setStorageSync('BaseCrnId',this.baseCrnId);
+ uni.setStorageSync('UPROJ',this.baseUrl);
this.getUrl()
this.ejectShow = false
},
+ // 鏃ュ巻 鏈嶅姟鍣�
+ getDate2() {
+ let that = this
+ if(that.commonUrl == 'undefined') {
+ return
+ }
+ uni.request({
+ url: that.commonUrl + "/monitor/date",
+ method:"GET",
+ success(result) {
+ var res = result.data.data
+ that.calendar = res.year + "骞�" + res.month + "鏈�" + res.day + "鏃� " + res.hour + ":" + res.minute + ":" + res.second + " " + res.week
+ that.currDate = res.year + "/" + res.month + "/" + res.day
+ },
+ fail(res) {
+ console.log(res);
+ }
+
+ })
+ },
+
// 鏃ュ巻
getDate() {
var dt = new Date();
@@ -541,75 +723,82 @@
this.calendar = year + "骞�" + month + "鏈�" + day + "鏃� " + hours + ":" + minutes + ":" + seconds + " " + weeks
},
getDateFormat(value) {
- var date = new Date();// 鑾峰彇褰撳墠鏃堕棿
- date.setDate(date.getDate() + value);// 璁剧疆澶╂暟 -1 澶�
- var m = date.getMonth() + 1
- var d = date.getDate()
- var newDate = m + '-' + d
- return newDate
- },
+ var date = new Date(this.currDate);// 鑾峰彇褰撳墠鏃堕棿
+ date.setDate(date.getDate() + value);// 璁剧疆澶╂暟 -1 澶�
+ var m = date.getMonth() + 1
+ var d = date.getDate()
+ var newDate = m + '-' + d
+ return newDate
+ },
/*************** 鎶樼嚎鍥� *****************************************************************************************************/
- initlineChart() {
- let that = this
- uni.request({
- url: that.commonUrl + "/monitor/line/charts",
- method:'GET',
- success(result) {
- var res = result.data
- if (res.code === 200) {
- that.chartsData.Line.categories = [
- that.getDateFormat(-11),that.getDateFormat(-10),that.getDateFormat(-9),that.getDateFormat(-8),
- that.getDateFormat(-7),that.getDateFormat(-6),that.getDateFormat(-5),that.getDateFormat(-4),
- that.getDateFormat(-3),that.getDateFormat(-2),that.getDateFormat(-1),that.getDateFormat(0),]
- that.chartsData.Line.series = res.data.rows
- }
- }
- })
- },
+ initlineChart() {
+ let that = this
+ if(that.commonUrl == 'undefined') {
+ return
+ }
+ uni.request({
+ url: that.commonUrl + "/monitor/line/charts",
+ method:'GET',
+ success(result) {
+ var res = result.data
+ if (res.code === 200) {
+ that.chartsData.Line.categories = [
+ that.getDateFormat(-11),that.getDateFormat(-10),that.getDateFormat(-9),that.getDateFormat(-8),
+ that.getDateFormat(-7),that.getDateFormat(-6),that.getDateFormat(-5),that.getDateFormat(-4),
+ that.getDateFormat(-3),that.getDateFormat(-2),that.getDateFormat(-1),that.getDateFormat(0),]
+ that.chartsData.Line.series = res.data.rows
+ }
+ }
+ })
+ },
/*************** 楗煎浘 *****************************************************************************************************/
- initPieChart() {
- let that = this
- uni.request({
- url: that.commonUrl + "/monitor/loc/rep",
- method:'GET',
- success(result) {
- var res = result.data
- if (res.code === 200) {
- that.chartsData.Pie.series[0].data = res.data.pie
- that.stockCount = res.data.stockCunt
- that.emptyCount = res.data.emptyCount
- that.noneCount = res.data.noneCount
- that.used = res.data.used
- that.usedPr = res.data.usedPr
- }
- }
- })
- },
- getOther() {
- let that = this
- uni.request({
- // http://10.10.0.222:9090/jkwcs/monitor/led?ledId=186
- url: that.commonUrl + "/monitor/other",
- data: {
- crnId: that.baseCrnId,
- ledId: 1,
- },
- success(result) {
- console.log(result);
- var res = result.data
- if (res.code === 200) {
- that.xDistance = res.data.xDistance
- that.yDistance = res.data.yDistance
- that.xDuration = res.data.xDuration
- that.yDuration = res.data.yDuration
- } else if (res.code === 403) {
-
- } else {
-
- }
- }
- })
- },
+ initPieChart() {
+ let that = this
+ if(that.commonUrl == 'undefined') {
+ return
+ }
+ uni.request({
+ url: that.commonUrl + "/monitor/loc/rep",
+ method:'GET',
+ success(result) {
+ var res = result.data
+ if (res.code === 200) {
+ that.chartsData.Pie.series[0].data = res.data.pie
+ that.baseInfo.stockCount = res.data.stockCunt
+ that.baseInfo.emptyCount = res.data.emptyCount
+ that.baseInfo.noneCount = res.data.noneCount
+ that.baseInfo.used = res.data.used
+ that.baseInfo.usedPr = res.data.usedPr
+ }
+ }
+ })
+ },
+ getOther() {
+ let that = this
+ if(that.commonUrl == 'undefined') {
+ return
+ }
+ uni.request({
+ url: that.commonUrl + "/monitor/other",
+ data: {
+ crnId: that.baseCrnId,
+ ledId: that.baseLedId,
+ },
+ success(result) {
+ var res = result.data
+ if (res.code === 200) {
+ that.baseInfo.xDistance = res.data.xDistance
+ that.baseInfo.yDistance = res.data.yDistance
+ that.baseInfo.xDuration = res.data.xDuration
+ that.baseInfo.yDuration = res.data.yDuration
+ } else if (res.code === 403) {
+
+ } else {
+
+ }
+ }
+ })
+ },
}
}
@@ -617,6 +806,7 @@
<style>
/* @import url("../../static/css/common.css"); */
+ @import url("home.css");
/* 鍒� */
.flex-col {
display: flex;
@@ -743,6 +933,9 @@
width: 3.5vw;
height: 3.5vw;
}
+ .red{
+ color: red
+ }
@@ -838,20 +1031,23 @@
}
.eject-title {
width: 100%;
- height: 10vh;
- line-height: 10vh;
- font-size: 2vw;
+ height: 5vh;
+ line-height: 6vh;
+ font-size: 3vh;
font-weight: 700;
color: #606266;
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;
}
@@ -903,4 +1099,16 @@
border-left: 1px solid #ccc;
}
+ .info-box-text {
+ width: 100%;height: 100%;
+ display: flex;flex-direction: column;align-items: center;justify-content: center;
+ }
+ .info-box-text-item {
+ height: 20%;font-size: 8vh;
+ justify-content: center;
+ white-space: pre-line;
+ }
+ .textred{
+ color: red;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.1