#
whycq
2024-07-01 346a966f1d29883aaa3181b421da5e697b1c5d32
#
3个文件已修改
429 ■■■■ 已修改文件
Monitor-APP/pages/home/home.css 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Monitor-APP/pages/home/home.vue 101 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Monitor-APP/pages/index/data.json 318 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Monitor-APP/pages/home/home.css
@@ -1,7 +1,7 @@
.text-content {
    width: 100%;
    height: 100%;
    font-size: 22px;
    font-size: 1.6vw;
    /* background-color: aliceblue;     */
}
.swiper-head {
@@ -15,7 +15,7 @@
}
.swiper-body {
    width: 100%;
    height: 90%;
    height: 100%;
    /* background-color: #aa0000; */
}
.swiper-body-main {
@@ -33,11 +33,11 @@
    background-color: rgba(0, 0, 0, .2);
}
.swiper-item:nth-child(2n-1) {
    background-color: rgba(255, 255, 127, 0.1);
    background-color: rgba(145, 145, 145, 0.1);
}
.swiper-item:first-child {
    background-color: rgba(255, 85, 0, 1.0);
    background-color: rgba(255, 85, 0, 0.7);
}
.swiper-item:nth-child(2) {
    background-color: rgba(211, 70, 0, 1.0);
    background-color: rgba(255, 85, 0, 0.5);
}
Monitor-APP/pages/home/home.vue
@@ -214,13 +214,12 @@
                            <!-- 文本容器 -->
                            <view class="text-content">
                                <!-- head -->
                                <view class="swiper-head">
                                <!-- <view class="swiper-head">
                                    <view style="width: 30%;">托盘码: {{infoText.barcode}}</view>
                                    <view style="width: 20%;">工作号: {{infoText.workNo}}</view>
                                    <view style="width: 30%;">源库位: {{infoText.sourceLocNo}}</view>
                                    <view style="width: 20%;">目标站: {{infoText.staNo}}</view>
                                    <!-- <view style="width: 10%;">数量</view> -->
                                </view>
                                    <view style="width: 20%;">接收站点: {{infoText.staNo}}</view>
                                </view> -->
                                <!-- body -->
                                <view class="swiper-body">
                                    <!-- swiper 一些说明
@@ -228,18 +227,21 @@
                                    vertical 滑动方向是否为纵向 
                                    display-multiple-items 同时显示的滑块数量 -->
                                    <swiper class="swiper-body-main" vertical="true" 
                                    display-multiple-items="6"
                                    circular="true" :autoplay="true" :interval="3000" :duration="2000">
                                    display-multiple-items="5"
                                    circular="true" :autoplay="false" :interval="3000" :duration="2000">
                                        <swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
                                            <view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view>
                                            <!-- <view style="width: 30%;">料号: {{item.matnr}}</view> -->
                                            <view style="width: 40%;">名称: {{item.maknx}}</view>
                                            <view style="width: 30%;">客户: {{item.manu}}</view>
                                            <!-- <view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view> -->
                                            <view style="width: 20%;">任务单号: {{item.taskNo}}</view>
                                            <view style="width: 20%;">载具编号: {{item.barcode}}</view>
                                            <view style="width: 20%;">工作号: {{item.taskNo}}</view>
                                            <view style="width: 20%;">物料名称: {{item.maktx}}</view>
                                            <view style="width: 20%;">物料号: {{item.matnr}}</view>
                                            
                                            <view style="width: 30%;">出库: {{item.count}} / 总数: {{item.total}}</view>
                                            <view style="width: 40%;">规格: {{item.specs}}</view>
                                            <view style="width: 30%;">备注: {{item.memo}}</view>
                                            <view style="width: 20%;">任务类型: {{item.ioType$}}</view>
                                            <view style="width: 20%;">出发站点: {{item.startPoint ? item.startPoint : '--'}}</view>
                                            <view style="width: 20%;">接收站点: {{item.targetPoint}}</view>
                                            <view style="width: 20%;">转运数量: {{item.anfme}}</view>
                                            <!-- <view style="width: 20%;">备注: {{item.memo}}</view> -->
                                            <!-- 11 -->
                                        </swiper-item>
                                    </swiper>
@@ -421,10 +423,10 @@
                this.getOther()
                // this.getDate()
                this.getDate2()
                // this.getInfo()
                this.getInfo()
                // this.getError()
                this.getInfo2()
                this.getError2()
                // this.getInfo2()
                // this.getError2()
                this.getUrl()
                this.controller()
                // 测试用
@@ -453,28 +455,28 @@
                    }
                    // infoType1:只有拣料等信息
                    that.infoType = 1
                    if (res.data[0].ioType === 101) {
                    switch (res.data[0].ioType) {
                        case 101:
                        that.infoText.title = '全板出库'
                    } else if(res.data[0].ioType === 103) {
                            break;
                        case 103:
                        that.infoText.title = '检料出库'
                    } else if(res.data[0].ioType === 107) {
                            break;
                        case 107:
                        that.infoText.title = '盘点出库'
                    } else if(res.data[0].ioType === 1) {
                            break;
                        case 1:
                        that.infoText.title = '入库'
                    } else if(res.data[0].ioType === 10) {
                            break;
                        case 10:
                        that.infoText.title = '空托入库'
                    } else if(res.data[0].ioType === 110) {
                            break;
                        case 110:
                        that.infoText.title = '空托出库'
                            break;
                    }
                    that.infoText.barcode = res.data[0].barcode
                    that.infoText.workNo = res.data[0].workNo
                    that.infoText.sourceLocNo = res.data[0].sourceLocNo
                    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
                    that.swiperList = res.data
                } else {
                    if (that.infoType == 2 || that.infoType == 3) {
                        return;
@@ -509,9 +511,9 @@
            getInfo() {
                let that = this
                uni.request({
                    url: that.commonUrl + "/monitor/led",
                    url: that.commonUrl + "/monitor/currentTask",
                    method:"GET",
                    data: {ledId:that.baseLedId},
                    // data: {ledId:that.baseLedId},
                    success(result) {
                        that.timeOuts = false
                        that.times = 0
@@ -522,28 +524,28 @@
                            }
                            // infoType1:只有拣料等信息
                            that.infoType = 1
                            if (res.data[0].ioType === 101) {
                            switch (res.data[0].ioType) {
                                case 101:
                                that.infoText.title = '全板出库'
                            } else if(res.data[0].ioType === 103) {
                                    break;
                                case 103:
                                that.infoText.title = '检料出库'
                            } else if(res.data[0].ioType === 107) {
                                    break;
                                case 107:
                                that.infoText.title = '盘点出库'
                            } else if(res.data[0].ioType === 1) {
                                    break;
                                case 1:
                                that.infoText.title = '入库'
                            } else if(res.data[0].ioType === 10) {
                                    break;
                                case 10:
                                that.infoText.title = '空托入库'
                            } else if(res.data[0].ioType === 110) {
                                    break;
                                case 110:
                                that.infoText.title = '空托出库'
                                    break;
                            }
                            that.infoText.barcode = res.data[0].barcode
                            that.infoText.workNo = res.data[0].workNo
                            that.infoText.sourceLocNo = res.data[0].sourceLocNo
                            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
                            that.swiperList = res.data
                        } else {
                            if (that.infoType == 2 || that.infoType == 3) {
                                return;
@@ -724,6 +726,7 @@
                    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
                    }
Monitor-APP/pages/index/data.json
@@ -3,78 +3,274 @@
        "data": {
            "msg": "操作成功",
            "code": 200,
            "data": [{
                "title": "全板出库",
                "workNo": 8046,
                "staNo": 200,
                "sourceStaNo": null,
                "locNo": null,
                "sourceLocNo": "1500502",
                "barcode": "80009901",
                "matDtos": [{
                        "matnr": "020101000001",
                        "maknx": "63-90型单立柱",
                        "batch": null,
                        "count": 40.0,
                        "specs": "gcslxwt",
                        "info": "浙江中扬",
                        "bz": "红色",
                        "total" : 200
            "data":[
                    {
                          "taskNo": "4",
                          "status": 2,
                          "wrkNo": 6819,
                          "createTime": "2024-07-01T01:28:41.543+0000",
                          "ioType": 1,
                          "ioPri": 10,
                          "startPoint": null,
                          "targetPoint": "0200602",
                          "modiUser": null,
                          "modiTime": "2024-07-01T01:28:41.543+0000",
                          "memo": null,
                          "barcode": "80000001",
                          "assignTime": null,
                          "executeTime": null,
                          "completeTime": null,
                          "cancelTime": null,
                          "wrkSts": 1,
                          "crnNo": 1,
                          "commandStep": 0,
                          "transferMark": 0,
                          "originStartPoint": null,
                          "originTargetPoint": "0200602",
                          "matnr": "TTT0004",
                          "maktx": "测试0004",
                          "anfme": 11,
                          "ioType$": "1.入库",
                          "wrkSts$": "1.生成入库ID",
                          "status$": "派发",
                          "createTime$": "2024-07-01 09:28:41",
                          "modiTime$": "2024-07-01 09:28:41",
                          "modiUser$": null,
                          "completeTime$": "",
                          "executeTime$": "",
                          "durationTime": "0天0小时14分44秒",
                          "assignTime$": "",
                          "cancelTime$": ""
                    },
                    {
                        "matnr": "LPJ.SLJ.XG.037",
                        "maknx": "工程塑料下弯头",
                        "batch": null,
                        "count": 40.0,
                        "specs": "gcslxwt",
                        "info": "浙江中扬",
                        "bz": "暂存",
                        "total" : 200
                          "taskNo": "1",
                          "status": 1,
                          "wrkNo": 6816,
                          "createTime": "2024-07-01T01:17:56.110+0000",
                          "ioType": 1,
                          "ioPri": 10,
                          "startPoint": "1111",
                          "targetPoint": "0200602",
                          "modiUser": 9527,
                          "modiTime": "2024-07-01T01:29:47.133+0000",
                          "memo": null,
                          "barcode": "80000001",
                          "assignTime": null,
                          "executeTime": null,
                          "completeTime": null,
                          "cancelTime": null,
                          "wrkSts": 1,
                          "crnNo": 1,
                          "commandStep": 0,
                          "transferMark": 0,
                          "originStartPoint": null,
                          "originTargetPoint": "0200602",
                          "matnr": "TTT0001",
                          "maktx": "测试0001",
                          "anfme": 11,
                          "ioType$": "1.入库",
                          "wrkSts$": "1.生成入库ID",
                          "status$": "接收",
                          "createTime$": "2024-07-01 09:17:56",
                          "modiTime$": "2024-07-01 09:29:47",
                          "modiUser$": null,
                          "completeTime$": "",
                          "executeTime$": "",
                          "durationTime": "0天0小时25分30秒",
                          "assignTime$": "",
                          "cancelTime$": ""
                    },
                    {
                        "matnr": "LPJ.SLJ.XG.037",
                        "maknx": "工程塑料下弯头",
                        "batch": null,
                        "count": 40.0,
                        "specs": "gcslxwt",
                        "info": "浙江中扬",
                        "bz": "红色",
                        "total" : 200
                          "taskNo": "2",
                          "status": 1,
                          "wrkNo": 6817,
                          "createTime": "2024-07-01T01:28:23.967+0000",
                          "ioType": 1,
                          "ioPri": 10,
                          "startPoint": null,
                          "targetPoint": "0200602",
                          "modiUser": null,
                          "modiTime": "2024-07-01T01:28:23.967+0000",
                          "memo": null,
                          "barcode": "80000001",
                          "assignTime": null,
                          "executeTime": null,
                          "completeTime": null,
                          "cancelTime": null,
                          "wrkSts": 1,
                          "crnNo": 1,
                          "commandStep": 0,
                          "transferMark": 0,
                          "originStartPoint": null,
                          "originTargetPoint": "0200602",
                          "matnr": "TTT0001",
                          "maktx": "测试0001",
                          "anfme": 11,
                          "ioType$": "1.入库",
                          "wrkSts$": "1.生成入库ID",
                          "status$": "接收",
                          "createTime$": "2024-07-01 09:28:23",
                          "modiTime$": "2024-07-01 09:28:23",
                          "modiUser$": null,
                          "completeTime$": "",
                          "executeTime$": "",
                          "durationTime": "0天0小时15分2秒",
                          "assignTime$": "",
                          "cancelTime$": ""
                    },
                    {
                        "matnr": "LPJ.SLJ.XG.037",
                        "maknx": "工程塑料下弯头",
                        "batch": null,
                        "count": 40.0,
                        "specs": "gcslxwt",
                        "info": "浙江中扬",
                        "bz": "红色",
                        "total" : 200
                          "taskNo": "3",
                          "status": 1,
                          "wrkNo": 6818,
                          "createTime": "2024-07-01T01:28:32.720+0000",
                          "ioType": 1,
                          "ioPri": 10,
                          "startPoint": null,
                          "targetPoint": "0200602",
                          "modiUser": null,
                          "modiTime": "2024-07-01T01:28:32.720+0000",
                          "memo": null,
                          "barcode": "80000001",
                          "assignTime": null,
                          "executeTime": null,
                          "completeTime": null,
                          "cancelTime": null,
                          "wrkSts": 1,
                          "crnNo": 1,
                          "commandStep": 0,
                          "transferMark": 0,
                          "originStartPoint": null,
                          "originTargetPoint": "0200602",
                          "matnr": "TTT0003",
                          "maktx": "测试0003",
                          "anfme": 11,
                          "ioType$": "1.入库",
                          "wrkSts$": "1.生成入库ID",
                          "status$": "接收",
                          "createTime$": "2024-07-01 09:28:32",
                          "modiTime$": "2024-07-01 09:28:32",
                          "modiUser$": null,
                          "completeTime$": "",
                          "executeTime$": "",
                          "durationTime": "0天0小时14分53秒",
                          "assignTime$": "",
                          "cancelTime$": ""
                    },
                    {
                        "matnr": "LPJ.SLJ.XG.037",
                        "maknx": "工程塑料下弯头",
                        "batch": null,
                        "count": 40.0,
                        "specs": "gcslxwt",
                        "info": "浙江中扬",
                        "bz": "红色",
                        "total" : 200
                          "taskNo": "5",
                          "status": 1,
                          "wrkNo": 6820,
                          "createTime": "2024-07-01T01:28:47.257+0000",
                          "ioType": 1,
                          "ioPri": 10,
                          "startPoint": null,
                          "targetPoint": "0200602",
                          "modiUser": null,
                          "modiTime": "2024-07-01T01:28:47.257+0000",
                          "memo": null,
                          "barcode": "80000001",
                          "assignTime": null,
                          "executeTime": null,
                          "completeTime": null,
                          "cancelTime": null,
                          "wrkSts": 1,
                          "crnNo": 1,
                          "commandStep": 0,
                          "transferMark": 0,
                          "originStartPoint": null,
                          "originTargetPoint": "0200602",
                          "matnr": "TTT0005",
                          "maktx": "测试0005",
                          "anfme": 11,
                          "ioType$": "1.入库",
                          "wrkSts$": "1.生成入库ID",
                          "status$": "接收",
                          "createTime$": "2024-07-01 09:28:47",
                          "modiTime$": "2024-07-01 09:28:47",
                          "modiUser$": null,
                          "completeTime$": "",
                          "executeTime$": "",
                          "durationTime": "0天0小时14分39秒",
                          "assignTime$": "",
                          "cancelTime$": ""
                    },
                    {
                        "matnr": "LPJ.SLJ.XG.037",
                        "maknx": "工程塑料下弯头",
                        "batch": null,
                        "count": 40.0,
                        "specs": "gcslxwt",
                        "info": "浙江中扬",
                        "bz": "红色",
                        "total" : 200
                          "taskNo": "6",
                          "status": 1,
                          "wrkNo": 6821,
                          "createTime": "2024-07-01T01:28:51.853+0000",
                          "ioType": 1,
                          "ioPri": 10,
                          "startPoint": null,
                          "targetPoint": "0200602",
                          "modiUser": null,
                          "modiTime": "2024-07-01T01:28:51.853+0000",
                          "memo": null,
                          "barcode": "80000001",
                          "assignTime": null,
                          "executeTime": null,
                          "completeTime": null,
                          "cancelTime": null,
                          "wrkSts": 1,
                          "crnNo": 1,
                          "commandStep": 0,
                          "transferMark": 0,
                          "originStartPoint": null,
                          "originTargetPoint": "0200602",
                          "matnr": "TTT0006",
                          "maktx": "测试0006",
                          "anfme": 11,
                          "ioType$": "1.入库",
                          "wrkSts$": "1.生成入库ID",
                          "status$": "接收",
                          "createTime$": "2024-07-01 09:28:51",
                          "modiTime$": "2024-07-01 09:28:51",
                          "modiUser$": null,
                          "completeTime$": "",
                          "executeTime$": "",
                          "durationTime": "0天0小时14分34秒",
                          "assignTime$": "",
                          "cancelTime$": ""
                        },
                        {
                          "taskNo": "7",
                          "status": 1,
                          "wrkNo": 6822,
                          "createTime": "2024-07-01T01:28:57.803+0000",
                          "ioType": 1,
                          "ioPri": 10,
                          "startPoint": null,
                          "targetPoint": "0200602",
                          "modiUser": null,
                          "modiTime": "2024-07-01T01:28:57.803+0000",
                          "memo": null,
                          "barcode": "80000001",
                          "assignTime": null,
                          "executeTime": null,
                          "completeTime": null,
                          "cancelTime": null,
                          "wrkSts": 1,
                          "crnNo": 1,
                          "commandStep": 0,
                          "transferMark": 0,
                          "originStartPoint": null,
                          "originTargetPoint": "0200602",
                          "matnr": "TTT0007",
                          "maktx": "测试0007",
                          "anfme": 11,
                          "ioType$": "1.入库",
                          "wrkSts$": "1.生成入库ID",
                          "status$": "接收",
                          "createTime$": "2024-07-01 09:28:57",
                          "modiTime$": "2024-07-01 09:28:57",
                          "modiUser$": null,
                          "completeTime$": "",
                          "executeTime$": "",
                          "durationTime": "0天0小时14分28秒",
                          "assignTime$": "",
                          "cancelTime$": ""
                    }
                ],
                "emptyMk": false,
                "ioType": 101
            }]
                ]
        }
    },
    "dataError2": {