From 0cbcf44149ba483997a72540ad4acd697ff833b7 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 29 十一月 2022 23:11:32 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/data.json | 7 +
Monitor-APP/pages.json | 21 ++--
Monitor-APP/main.js | 2
Monitor-APP/pages/home/home.vue | 153 +++++++++++++++++++++++++++++++++----
4 files changed, 150 insertions(+), 33 deletions(-)
diff --git a/Monitor-APP/main.js b/Monitor-APP/main.js
index bd81521..cdb1b80 100644
--- a/Monitor-APP/main.js
+++ b/Monitor-APP/main.js
@@ -4,7 +4,7 @@
import Vue from 'vue'
Vue.config.productionTip = false
Vue.prototype.baseHttp = 'http://'
-Vue.prototype.baseUrl = '/bfwcs'
+// Vue.prototype.baseUrl = '/bfwcs'
App.mpType = 'app'
const app = new Vue({
...App
diff --git a/Monitor-APP/pages.json b/Monitor-APP/pages.json
index 3621667..7a23469 100644
--- a/Monitor-APP/pages.json
+++ b/Monitor-APP/pages.json
@@ -1,6 +1,16 @@
{
"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
{
+ "path": "pages/home/home",
+ "style": {
+ "navigationStyle":"home",
+ // 鍘绘帀椤堕儴瀵艰埅鏍�
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
"path": "pages/index/index",
"style": {
"navigationStyle":"custom",
@@ -15,17 +25,8 @@
"style": {
"navigationStyle":"custom"
}
- },
- {
- "path": "pages/home/home",
- "style": {
- "navigationStyle":"home",
- // 鍘绘帀椤堕儴瀵艰埅鏍�
- "app-plus": {
- "titleNView": false
- }
- }
}
+
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 2056396..79655c0 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">
@@ -187,7 +186,8 @@
<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 +202,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 +211,15 @@
<!-- 涓讳綋 -->
<view class="info-main">
<view class="info-box">
- <y-box>{{text}}</y-box>
+ <y-box>
+ <view class="info-box-text">
+ <view class="flex-col info-box-text-item">鐩爣绔欙細{{infoText.staNo}}</view>
+ <view class="flex-col info-box-text-item">鍟嗗搧缂栧彿锛歿{infoText.matnr}}</view>
+ <view class="flex-col info-box-text-item">鍟嗗搧鍚嶇О锛歿{infoText.maknx}}</view>
+ <view class="flex-col info-box-text-item">鍟嗗搧瑙勬牸锛歿{infoText.specs}}</view>
+ <view class="flex-col info-box-text-item">鏁伴噺锛歿{infoText.count}}</view>
+ </view>
+ </y-box>
</view>
</view>
</view>
@@ -220,7 +228,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 +237,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>
@@ -266,6 +278,12 @@
<input type="text" v-model="baseCrnId">
</view>
</view>
+ <view class="item">
+ <view class="desc">Url锛�</view>
+ <view class="input">
+ <input type="text" v-model="baseUrl">
+ </view>
+ </view>
</view>
<!-- button -->
<view class="eject-button">
@@ -285,7 +303,7 @@
return {
series: [],
homeViewShow: true,
- infoViewShow: false,
+ infoViewShow: false ,
errorInfoViewShow: false,
homeMode: [],
infoMode: [],
@@ -322,12 +340,20 @@
basePort: '',
baseLedId: '',
baseCrnId: '',
+ baseUrl: '',
info: null,
error: null,
infoType: 0,
text: '',
- text1: '',
-
+ infoText: {
+ title: '鍏ㄦ澘鍑哄簱',
+ staNo: "200",
+ matnr: "300",
+ maknx: "400",
+ specs: "500",
+ count: "600",
+ error: "鍒╃敤绔嬩綋浠撳簱璁惧鍙疄鐜颁粨搴撻珮灞傚悎鐞嗗寲銆佸瓨鍙栬嚜鍔ㄥ寲銆佹搷浣滅畝渚垮寲锛涖��"
+ },
@@ -339,6 +365,21 @@
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()
+ console.log(that.commonUrl);
+ },
onLoad() {
this.getServerData()
this.getDate()
@@ -346,6 +387,9 @@
this.getDate()
this.getInfo()
this.getError()
+ // 娴嬭瘯鐢�
+ // this.getInfo2()
+ // this.getError2()
this.controller()
},1000)
setInterval(()=>{
@@ -354,25 +398,84 @@
},
methods: {
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))
},
+ // 鑾峰彇閿欒淇℃伅
+ getInfo2() {
+ let that = this
+ var result = ycqdata.dataInfo2
+ var res = result.data
+ 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 = '妫�鏂欏嚭搴�'
+ }
+ that.infoText.staNo = res.data[0].staNo
+ 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
+ }
+ },
+ 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;
}
+ // infoType1:鍙湁鎷ｆ枡绛変俊鎭�
that.infoType = 1
- that.text = res
+ if (res.data[0].ioType === 101) {
+ that.infoText.title = '鍏ㄦ澘鍑哄簱'
+ } else if(res.data[0].ioType === 103) {
+ that.infoText.title = '妫�鏂欏嚭搴�'
+ }
+ that.infoText.staNo = res.data[0].staNo
+ 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;
@@ -386,18 +489,21 @@
getError() {
let that = this
uni.request({
- url:"http://192.168.1.111:8088/sxjzwms/mat/info",
+ url: that.commonUrl + "/monitor/led/error",
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.error = errorInfo
return
}
that.infoType = 2
- that.text1 = res
+ that.infoText.title = "寮傚父"
+ that.infoText.error = errorInfo
} else {
if (that.infoType == 1) {
return
@@ -515,6 +621,7 @@
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
},
@@ -592,7 +699,7 @@
url: that.commonUrl + "/monitor/other",
data: {
crnId: that.baseCrnId,
- ledId: 1,
+ ledId: that.baseLedId,
},
success(result) {
console.log(result);
@@ -838,9 +945,9 @@
}
.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;
@@ -903,4 +1010,12 @@
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;
+ }
</style>
\ No newline at end of file
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 35e7702..c536da0 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -1,5 +1,5 @@
{
- "dataYYY":
+ "dataInfo2":
{"data":{"msg": "鎿嶄綔鎴愬姛","code": 200,"data": [{
"title":"鍏ㄦ澘鍑哄簱",
"workNo":8046,
@@ -10,12 +10,13 @@
"matDtos":[{
"matnr":"LPJ.SLJ.XG.037",
"maknx":"宸ョ▼濉戞枡涓嬪集澶�",
- "batch":null,"count":40.0
+ "batch":null,"count":40.0,
+ "specs":"gcslxwt"
}],
"emptyMk":false,
"ioType":101
}]
}},
- "dataEEE":{"data":{"msg":"鎿嶄綔鎴愬姛","code":200,"data":""}}
+ "dataError2":{"data":{"msg":"鎿嶄綔鎴愬姛","code":200,"data":""}}
}
--
Gitblit v1.9.1