From da17d5c7365b6123d68519ed8fa671ef29415d69 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 05 六月 2024 10:52:43 +0800
Subject: [PATCH] Merge branch 'tzskMonitor-AGV-2' of http://47.97.1.152:5880/r/private into tzskMonitor-AGV-2
---
Monitor-APP/pages/index/data.json | 4 ++++
Monitor-APP/manifest.json | 2 +-
Monitor-APP/pages/home/home.css | 2 +-
Monitor-APP/pages/home/home.vue | 12 ++++++++++--
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/Monitor-APP/manifest.json b/Monitor-APP/manifest.json
index fc9a569..f23661f 100644
--- a/Monitor-APP/manifest.json
+++ b/Monitor-APP/manifest.json
@@ -3,7 +3,7 @@
"appid" : "__UNI__CA903B7",
"description" : "",
"versionName" : "1.0.2",
- "versionCode" : 102,
+ "versionCode" : 104,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/Monitor-APP/pages/home/home.css b/Monitor-APP/pages/home/home.css
index 90a2664..abcc1c1 100644
--- a/Monitor-APP/pages/home/home.css
+++ b/Monitor-APP/pages/home/home.css
@@ -1,7 +1,7 @@
.text-content {
width: 100%;
height: 100%;
- font-size: 14px;
+ font-size: 13px;
/* background-color: aliceblue; */
}
.swiper-head {
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index a7afedb..ca7dd3b 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -484,7 +484,11 @@
that.infoText.title = '鐩樼偣鍑哄簱'
} else if (res.data.agvWrkMast.ioType == 103) {
that.infoText.title = '鎷ｆ枡鍑哄簱'
- } else {
+ } else if (res.data.agvWrkMast.ioType == 57) {
+ that.infoText.title = '鐩樼偣鍐嶅叆搴�'
+ } else if (res.data.agvWrkMast.ioType == 53) {
+ that.infoText.title = '鎷ｆ枡鍐嶅叆搴�'
+ } else if (res.data.agvWrkMast.ioType == 101) {
that.infoText.title = '鍏ㄦ澘鍑哄簱'
}
} else{
@@ -525,7 +529,11 @@
that.infoText.title = '鐩樼偣鍑哄簱'
} else if (res.data.agvWrkMast.ioType == 103) {
that.infoText.title = '鎷ｆ枡鍑哄簱'
- } else {
+ } else if (res.data.agvWrkMast.ioType == 57) {
+ that.infoText.title = '鐩樼偣鍐嶅叆搴�'
+ } else if (res.data.agvWrkMast.ioType == 53) {
+ that.infoText.title = '鎷ｆ枡鍐嶅叆搴�'
+ } else if (res.data.agvWrkMast.ioType == 101) {
that.infoText.title = '鍏ㄦ澘鍑哄簱'
}
} else{
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 2660c1a..439403e 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -76,7 +76,11 @@
"mk": "N",
"whsType": null,
"wrkSts": 205,
+<<<<<<< HEAD
"ioType": 107,
+=======
+ "ioType": 53,
+>>>>>>> bd18bae05ec337f06ba825d4e4148f7129009c14
"crnNo": null,
"steNo": null,
"outMost": null,
--
Gitblit v1.9.1