From 69375dc4c4f31775222520c8d00e59f2c98357fd Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 22 九月 2023 13:56:04 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/index/data.json | 2 +-
Monitor-APP/pages/home/home.vue | 12 +++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 33cb71f..c344f78 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -437,10 +437,10 @@
this.initPieChart()
this.getOther()
this.getDate2()
- // this.getInfo()
- // this.getError()
- this.getInfo2()
- this.getError2()
+ this.getInfo()
+ this.getError()
+ // this.getInfo2()
+ // this.getError2()
this.getUrl()
this.controller()
},1000)
@@ -515,6 +515,7 @@
var res = result.data
if (res.data && res.data !== "") {
var errorInfo = res.data
+
if (that.infoType == 1) {
that.infoType = 3
that.infoText.title = "鍏朵粬淇℃伅"
@@ -573,7 +574,7 @@
that.infoText.orderNo = res.data[0].orderNo
}
that.infoText.matnr = res.data[0].matDtos[0].matnr
- that.infoText.barcode = res.data[0].matDtos[0].barcode
+ that.infoText.barcode = res.data[0].barcode
that.infoText.batch = res.data[0].matDtos[0].batch ? res.data[0].matDtos[0].batch : '--'
that.infoText.specs = res.data[0].matDtos[0].specs
that.infoText.count = res.data[0].matDtos[0].count
@@ -1161,5 +1162,6 @@
.info-box-text-item {
height: 20%;font-size: 8vh;
justify-content: center;
+ white-space: pre-line;
}
</style>
\ No newline at end of file
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 7d08e21..6e06fe9 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -92,7 +92,7 @@
"data": {
"msg": "鎿嶄綔鎴愬姛",
"code": 200,
- "data": ""
+ "data": "1鍙峰爢鍨涙満鍦伴潰绔欐�ュ仠\n2鍙峰爢鍨涙満鍦伴潰绔欐�ュ仠"
}
},
"lineData": {
--
Gitblit v1.9.1