private.git - Gitblit

parent: 2c01e015 | 补丁 | 提交 | ignore whitespace

whycq

2024-10-12 f42292b39f9825a0ca0da89bc5b1d96ebbf8dceb

2个文件已修改

	Monitor-APP/pages/home/home.vue	46 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Monitor-APP/pages/index/data.json	122 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Monitor-APP/pages/home/home.vue

@@ -185,9 +185,15 @@
                                <view style="height: 2%;"></view>
                                <view style="height: 18%;">
                                    <y-box>
                                        <view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
                                        <!-- <view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
                                            中扬智能大屏显示系统
                                        </view> -->
										
                                        <view style="display: flex;align-items: center;justify-content: center;width: 100%;height: 100%;">
                                            <view style="flex: 1;">作业中数量： {{useInfo.count1 ? useInfo.count1 : '--'}}</view>
                                            <view style="flex: 1;">未取货数量： {{useInfo.count2 ? useInfo.count2 : '--'}}</view>
                                        </view>
										
                                    </y-box>
                                </view>
                            </view>
@@ -226,20 +232,24 @@
                                    <!-- swiper 一些说明
                                    circular 是否采用衔接滑动，即播放到末尾后重新回到开头
                                    vertical 滑动方向是否为纵向 
                                    display-multiple-items 同时显示的滑块数量 -->
                                    display-multiple-items 同时显示的滑块数量 -->	
                                    <swiper class="swiper-body-main" vertical="true" 
                                    display-multiple-items="3"
                                    circular="true" :autoplay="true" :interval="3000" :duration="2000">
                                    circular="true" :autoplay="true" :interval="5000" :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.matnr}}</view>
                                            <view style="width: 30%;">净重: {{item.weight}}</view>
                                            <view style="width: 25%;">{{i+1}} / {{swiperList.length}}</view>
                                            <view style="width: 25%;">料号: {{item.matnr}}</view>
                                            <view style="width: 25%;">箱号: {{item.batch}}</view>
                                            <view style="width: 25%;">数量: {{item.count}}</view>
                                            
                                            <view style="width: 25%;">卷号: {{item.specs}}</view>
                                            <view style="width: 25%;">订单号    : {{item.orderNo}}</view>
                                            <view style="width: 25%;">客户名称: {{item.cstmrName}}</view>
                                            <view style="width: 25%;">总作业中: {{item.count1}}</view>
                                            
                                            <view style="width: 30%;">长度: {{item.price}}</view>
                                            <view style="width: 40%;">箱号: {{item.batch}}</view>
                                            <view style="width: 30%;">卷号: {{item.model}}</view>
                                            <view style="width: 25%;">码垛后未取货: {{item.count3}}</view>
                                            <view style="width: 25%;">订单作业中: {{item.count2}}</view>
                                            <view style="width: 25%;">备注: {{item.memo}}</view>
                                            
                                            
                                        </swiper-item>
@@ -338,6 +348,7 @@
                homeMode: [],
                infoMode: [],
                errorInfoMode: [],
                useInfo: '',
                baseInfo: {
                    xDistance: 1,
                    yDistance: 2,
@@ -420,6 +431,7 @@
                this.initlineChart()
                this.initPieChart()
                this.getOther()
                this.getUserInfo()
                // this.getDate()
                this.getDate2()
                this.getInfo()
@@ -507,6 +519,20 @@
                    that.infoType = 0
                }
            },
            getUserInfo() {
                let that = this
                uni.request({
                    url: that.commonUrl + "/monitor/led",
                    method:"GET",
                    data: {ledId:that.baseLedId},
                    success(res) {
                        res = res.data
                        if (res.data && res.data != '') {
                            that.useInfo = res.data
                        }
                    }
                })
            },
            getInfo() {
                let that = this
                uni.request({

 Monitor-APP/pages/index/data.json

@@ -11,75 +11,79 @@
                "locNo": null,
                "sourceLocNo": "1500502",
                "barcode": "80009901",
                "matDtos": [{
                        "matnr": "020101000001",
                        "maknx": "63-90型单立柱",
                        "batch": null,
                        "count": 40.0,
                        "specs": "gcslxwt",
                        "info": "浙江中扬",
                        "bz": "红色",
                        "total" : 200
                "matDtos": [
					
                    {
                        "matnr": "020101000001",  
                        "count": 40.0,  
                        "batch": "箱-1101", 
                        "specs": "gcslxwt", 
                        "orderNo": "63-90型单立柱",  
                        "cstmrName": "浙江中扬",
                        "memo": "红色", 
                        "count1": 40.0,  
                        "count3":  20, 
                        "count2" : 200 
                    },
                    {
                        "matnr": "LPJ.SLJ.XG.037",
                        "maknx": "工程塑料下弯头",
                        "batch": null,
                        "count": 40.0,
                        "specs": "gcslxwt",
                        "info": "浙江中扬",
                        "bz": "暂存",
                        "total" : 200
                        "matnr": "020101000001",  
                        "count": 40.0,  
                        "batch": "箱-1101", 
                        "specs": "gcslxwt", 
                        "orderNo": "63-90型单立柱",  
                        "cstmrName": "浙江中扬",
                        "memo": "红色", 
                        "count1": 40.0,  
                        "count3":  20, 
                        "count2" : 200 
                    },
                    {
                        "matnr": "LPJ.SLJ.XG.037",
                        "maknx": "工程塑料下弯头",
                        "batch": null,
                        "count": 40.0,
                        "specs": "gcslxwt",
                        "info": "浙江中扬",
                        "bz": "红色",
                        "total" : 200
                        "matnr": "020101000001",  
                        "count": 40.0,  
                        "batch": "箱-1101", 
                        "specs": "gcslxwt", 
                        "orderNo": "63-90型单立柱",  
                        "cstmrName": "浙江中扬",
                        "memo": "红色", 
                        "count1": 40.0,  
                        "count3":  20, 
                        "count2" : 200 
                    },
                    {
                        "matnr": "LPJ.SLJ.XG.037",
                        "maknx": "工程塑料下弯头",
                        "batch": null,
                        "count": 40.0,
                        "specs": "gcslxwt",
                        "info": "浙江中扬",
                        "bz": "",
                        "total" : 200
                        "matnr": "020101000001",  
                        "count": 40.0,  
                        "batch": "箱-1101", 
                        "specs": "gcslxwt", 
                        "orderNo": "63-90型单立柱",  
                        "cstmrName": "浙江中扬",
                        "memo": "红色", 
                        "count1": 40.0,  
                        "count3":  20, 
                        "count2" : 200 
                    },
                    {
                        "matnr": "LPJ.SLJ.XG.037",
                        "maknx": "工程塑料下弯头",
                        "batch": null,
                        "count": 40.0,
                        "specs": "gcslxwt",
                        "info": "浙江中扬",
                        "bz": "",
                        "total" : 200
                        "matnr": "020101000001",  
                        "count": 40.0,  
                        "batch": "箱-1101", 
                        "specs": "gcslxwt", 
                        "orderNo": "63-90型单立柱",  
                        "cstmrName": "浙江中扬",
                        "memo": "红色", 
                        "count1": 40.0,  
                        "count3":  20, 
                        "count2" : 200 
                    },
                    {
                        "matnr": "LPJ.SLJ.XG.037",
                        "maknx": "工程塑料下弯头",
                        "batch": null,
                        "count": 40.0,
                        "specs": "gcslxwt",
                        "info": "浙江中扬",
                        "bz": "",
                        "total" : 200
                    },
                    {
                        "matnr": "LPJ.SLJ.XG.037",
                        "maknx": "工程塑料下弯头",
                        "batch": null,
                        "count": 40.0,
                        "specs": "gcslxwt",
                        "info": "浙江中扬",
                        "bz": "17号框",
                        "total" : 200
                        "matnr": "020101000001",  
                        "count": 40.0,  
                        "batch": "箱-1101", 
                        "specs": "gcslxwt", 
                        "orderNo": "63-90型单立柱",  
                        "cstmrName": "浙江中扬",
                        "memo": "红色", 
                        "count1": 40.0,  
                        "count3":  20, 
                        "count2" : 200 
                    }
                ],
                "emptyMk": false,

			@@ -185,9 +185,15 @@
			<view style="height: 2%;"></view>
			<view style="height: 18%;">
			<y-box>
			<view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
			<!-- <view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
			中扬智能大屏显示系统
			</view> -->

			<view style="display: flex;align-items: center;justify-content: center;width: 100%;height: 100%;">
			<view style="flex: 1;">作业中数量： {{useInfo.count1 ? useInfo.count1 : '--'}}</view>
			<view style="flex: 1;">未取货数量： {{useInfo.count2 ? useInfo.count2 : '--'}}</view>
			</view>

			</y-box>
			</view>
			</view>
			@@ -226,20 +232,24 @@
			<!-- swiper 一些说明
			circular 是否采用衔接滑动，即播放到末尾后重新回到开头
			vertical 滑动方向是否为纵向
			display-multiple-items 同时显示的滑块数量 -->
			display-multiple-items 同时显示的滑块数量 -->
			<swiper class="swiper-body-main" vertical="true"
			display-multiple-items="3"
			circular="true" :autoplay="true" :interval="3000" :duration="2000">
			circular="true" :autoplay="true" :interval="5000" :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.matnr}}</view>
			<view style="width: 30%;">净重: {{item.weight}}</view>
			<view style="width: 25%;">{{i+1}} / {{swiperList.length}}</view>
			<view style="width: 25%;">料号: {{item.matnr}}</view>
			<view style="width: 25%;">箱号: {{item.batch}}</view>
			<view style="width: 25%;">数量: {{item.count}}</view>

			<view style="width: 25%;">卷号: {{item.specs}}</view>
			<view style="width: 25%;">订单号 : {{item.orderNo}}</view>
			<view style="width: 25%;">客户名称: {{item.cstmrName}}</view>
			<view style="width: 25%;">总作业中: {{item.count1}}</view>

			<view style="width: 30%;">长度: {{item.price}}</view>
			<view style="width: 40%;">箱号: {{item.batch}}</view>
			<view style="width: 30%;">卷号: {{item.model}}</view>
			<view style="width: 25%;">码垛后未取货: {{item.count3}}</view>
			<view style="width: 25%;">订单作业中: {{item.count2}}</view>
			<view style="width: 25%;">备注: {{item.memo}}</view>


			</swiper-item>
			@@ -338,6 +348,7 @@
			homeMode: [],
			infoMode: [],
			errorInfoMode: [],
			useInfo: '',
			baseInfo: {
			xDistance: 1,
			yDistance: 2,
			@@ -420,6 +431,7 @@
			this.initlineChart()
			this.initPieChart()
			this.getOther()
			this.getUserInfo()
			// this.getDate()
			this.getDate2()
			this.getInfo()
			@@ -507,6 +519,20 @@
			that.infoType = 0
			}
			},
			getUserInfo() {
			let that = this
			uni.request({
			url: that.commonUrl + "/monitor/led",
			method:"GET",
			data: {ledId:that.baseLedId},
			success(res) {
			res = res.data
			if (res.data && res.data != '') {
			that.useInfo = res.data
			}
			}
			})
			},
			getInfo() {
			let that = this
			uni.request({

			@@ -11,75 +11,79 @@
			"locNo": null,
			"sourceLocNo": "1500502",
			"barcode": "80009901",
			"matDtos": [{
			"matnr": "020101000001",
			"maknx": "63-90型单立柱",
			"batch": null,
			"count": 40.0,
			"specs": "gcslxwt",
			"info": "浙江中扬",
			"bz": "红色",
			"total" : 200
			"matDtos": [

			{
			"matnr": "020101000001",
			"count": 40.0,
			"batch": "箱-1101",
			"specs": "gcslxwt",
			"orderNo": "63-90型单立柱",
			"cstmrName": "浙江中扬",
			"memo": "红色",
			"count1": 40.0,
			"count3": 20,
			"count2" : 200
			},
			{
			"matnr": "LPJ.SLJ.XG.037",
			"maknx": "工程塑料下弯头",
			"batch": null,
			"count": 40.0,
			"specs": "gcslxwt",
			"info": "浙江中扬",
			"bz": "暂存",
			"total" : 200
			"matnr": "020101000001",
			"count": 40.0,
			"batch": "箱-1101",
			"specs": "gcslxwt",
			"orderNo": "63-90型单立柱",
			"cstmrName": "浙江中扬",
			"memo": "红色",
			"count1": 40.0,
			"count3": 20,
			"count2" : 200
			},
			{
			"matnr": "LPJ.SLJ.XG.037",
			"maknx": "工程塑料下弯头",
			"batch": null,
			"count": 40.0,
			"specs": "gcslxwt",
			"info": "浙江中扬",
			"bz": "红色",
			"total" : 200
			"matnr": "020101000001",
			"count": 40.0,
			"batch": "箱-1101",
			"specs": "gcslxwt",
			"orderNo": "63-90型单立柱",
			"cstmrName": "浙江中扬",
			"memo": "红色",
			"count1": 40.0,
			"count3": 20,
			"count2" : 200
			},
			{
			"matnr": "LPJ.SLJ.XG.037",
			"maknx": "工程塑料下弯头",
			"batch": null,
			"count": 40.0,
			"specs": "gcslxwt",
			"info": "浙江中扬",
			"bz": "",
			"total" : 200
			"matnr": "020101000001",
			"count": 40.0,
			"batch": "箱-1101",
			"specs": "gcslxwt",
			"orderNo": "63-90型单立柱",
			"cstmrName": "浙江中扬",
			"memo": "红色",
			"count1": 40.0,
			"count3": 20,
			"count2" : 200
			},
			{
			"matnr": "LPJ.SLJ.XG.037",
			"maknx": "工程塑料下弯头",
			"batch": null,
			"count": 40.0,
			"specs": "gcslxwt",
			"info": "浙江中扬",
			"bz": "",
			"total" : 200
			"matnr": "020101000001",
			"count": 40.0,
			"batch": "箱-1101",
			"specs": "gcslxwt",
			"orderNo": "63-90型单立柱",
			"cstmrName": "浙江中扬",
			"memo": "红色",
			"count1": 40.0,
			"count3": 20,
			"count2" : 200
			},
			{
			"matnr": "LPJ.SLJ.XG.037",
			"maknx": "工程塑料下弯头",
			"batch": null,
			"count": 40.0,
			"specs": "gcslxwt",
			"info": "浙江中扬",
			"bz": "",
			"total" : 200
			},
			{
			"matnr": "LPJ.SLJ.XG.037",
			"maknx": "工程塑料下弯头",
			"batch": null,
			"count": 40.0,
			"specs": "gcslxwt",
			"info": "浙江中扬",
			"bz": "17号框",
			"total" : 200
			"matnr": "020101000001",
			"count": 40.0,
			"batch": "箱-1101",
			"specs": "gcslxwt",
			"orderNo": "63-90型单立柱",
			"cstmrName": "浙江中扬",
			"memo": "红色",
			"count1": 40.0,
			"count3": 20,
			"count2" : 200
			}
			],
			"emptyMk": false,