private.git - Gitblit

main / private

parent: 427e376c | 补丁 | 提交 | ignore whitespace

Merge branch 'tzskMonitor-AGV-2' of http://47.97.1.152:5880/r/private into ...

whycq

2024-06-05 da17d5c7365b6123d68519ed8fa671ef29415d69

Merge branch 'tzskMonitor-AGV-2' of http://47.97.1.152:5880/r/private into tzskMonitor-AGV-2

# Conflicts:
#	Monitor-APP/pages/index/data.json

4个文件已修改

	Monitor-APP/manifest.json	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Monitor-APP/pages/home/home.css	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Monitor-APP/pages/home/home.vue	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Monitor-APP/pages/index/data.json	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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" : {

 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 {

 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{

 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,