.gitignore

New file
@@ -0,0 +1,9 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
*/unpackage/

 .idea/.gitignore

@@ -6,3 +6,4 @@
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
*/unpackage/

 Monitor-APP/pages/home/home.vue

@@ -6,8 +6,8 @@
                    <text>智能大屏显示系统</text>
                </view>
                <!-- 日历 -->
                <view class="time-tools">{{version}}</view>
                <view class="version">当前版本:{{socketUrl}}</view>
                <view class="time-tools">{{calendar}}</view>
                <view class="version">当前版本:{{version}}</view>
                <view class="button-left" @click="ejected()"></view>
                <view class="button-right" @click="ejected()"></view>
                <!-- 主视图 -->
@@ -157,12 +157,13 @@
                                    </y-box>
                                </view>
                                <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>
                                    </y-box>
                                <view style="height: 18%;display: flex;justify-content: space-around;align-items: center;">
                                    <!-- <view style="font-size: 4vh">
                                        自动仓库WCS监控平台
                                    </view> -->
                                    <view style="height: 50%;">
                                        <image style="height: 100%;" src="../../static/img/logo-bai.png" mode="aspectFit"></image>
                                    </view>
                                </view>
                            </view>
                        </view>
@@ -265,27 +266,33 @@
                        </view>
                    </view>
                    <view class="item">
                        <view class="desc">port：</view>
                        <view class="desc">Wcsport：</view>
                        <view class="input">
                            <input type="text" v-model="basePort">
                        </view>
                    </view>										
                    <view class="item">
                        <view class="desc">WcsUrl：</view>
                        <view class="input">
                            <input type="text" v-model="baseUrl">
                        </view>
                    </view>
                    <view class="item">
                        <view class="desc">Wmsport：</view>
                        <view class="input">
                            <input type="text" v-model="wmsPort">
                        </view>
                    </view>
                    <view class="item">
                        <view class="desc">WmsUrl：</view>
                        <view class="input">
                            <input type="text" v-model="wmsUrl">
                        </view>
                    </view>
                    <view class="item">
                        <view class="desc">ledId：</view>
                        <view class="input">
                            <input type="text" v-model="baseLedId">
                        </view>
                    </view>
                    <view class="item">
                        <view class="desc">CrnId：</view>
                        <view class="input">
                            <input type="text" v-model="baseCrnId">
                        </view>
                    </view>
                    <view class="item">
                        <view class="desc">Url：</view>
                        <view class="input">
                            <input type="text" v-model="baseUrl">
                        </view>
                    </view>
                </scroll-view>
@@ -295,6 +302,13 @@
                    <view class="button-item" @click="ejectConfirm">确 认</view>
                </view>
            </view>
        </view>
        <view>
            <!-- 提示窗示例 -->
            <uni-popup ref="upVersion" type="dialog">
                <uni-popup-dialog :type="msgType" title="通知" :content="dialogContent" @confirm="dialogConfirm"
                    @close="dialogClose"></uni-popup-dialog>
            </uni-popup>
        </view>
        <view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
            连接超时，正在重新建立链接:: {{times}} 
@@ -378,8 +392,12 @@
                socketClient: null,
                messages: [],
                version:'',
                socketUrl:''
        
                socketUrl:'',
                msgType: 'success',
                filename: '',
                dialogContent: '',
                wmsUrl:'',
                wmsPort:''
                
            }
        },
@@ -397,11 +415,15 @@
            const BasePort = uni.getStorageSync('BasePort');
            const BaseCrnId = uni.getStorageSync('BaseCrnId');
            const PROJ = uni.getStorageSync('UPROJ');
            const WMSURL = uni.getStorageSync('wmsUrl');
            const WMSPORT = uni.getStorageSync('wmsPort');
            that.baseUrl = PROJ
            that.baseIP = BaseIP
            that.baseLedId = BaseLedId
            that.basePort = BasePort
            that.baseCrnId = BaseCrnId
            that.wmsUrl = WMSURL
            that.wmsPort = WMSPORT
            // this.getUrl()
        },
        created() {
@@ -411,11 +433,15 @@
            const BasePort = uni.getStorageSync('BasePort');
            const BaseCrnId = uni.getStorageSync('BaseCrnId');
            const PROJ = uni.getStorageSync('UPROJ');
            const WMSURL = uni.getStorageSync('wmsUrl');
            const WMSPORT = uni.getStorageSync('wmsPort');
            that.baseUrl = PROJ
            that.baseIP = BaseIP
            that.baseLedId = BaseLedId
            that.basePort = BasePort
            that.baseCrnId = BaseCrnId
            that.wmsUrl = WMSURL
            that.wmsPort = WMSPORT
            that.uniWebSocket();
            // that.webSockerInit()
        },
@@ -650,11 +676,8 @@
                    }
                })
            },
            timeOut() {
                console.log(this.times);
            },
            getUrl() {
                this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
                this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl				
            },
            getServerData() {
                this.chartsDataLine1=JSON.parse(JSON.stringify(this.chartsData.Line))
@@ -931,6 +954,8 @@
                uni.setStorageSync('BasePort',this.basePort);
                uni.setStorageSync('BaseCrnId',this.baseCrnId);
                uni.setStorageSync('UPROJ',this.baseUrl);
                uni.setStorageSync('wmsUrl',this.wmsUrl);
                uni.setStorageSync('wmsPort',this.wmsPort);
                this.getUrl()
                this.ejectShow = false
            },
@@ -1042,6 +1067,8 @@
                        if (res.platform == "android") {
                            that.AndroidCheckUpdate();
                        }
                            // that.AndroidCheckUpdate();
						
                    }
                })
            },
@@ -1051,9 +1078,107 @@
                plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
                    that.version = wgtinfo.version //客户端版本号
                })
                // setTimeout(()=>{
                //     that.getUpdateVersion()
                // },100)
                setTimeout(()=>{
                    that.getUpdateVersion()
                },100)
            },
            // 校验版本
            getUpdateVersion() {
                let that = this
                let type = 1
                if (that.baseUrl == 'http://undefined:undefined/undefined') {
                    return
                }
                const wms = 'http://'+ that.baseIP + ':' +that.wmsPort + "/" +that.wmsUrl
                console.log(wms)
                let url = wms + '/appVersion/checkUpdate/' + that.version + '/' + type
                uni.request({
                    url: url,
                    method: 'GET',
                    success(res) {
                        console.log(res);
                        var res = res.data
                        if (res.data) {
                            that.filename = res.data.path
                            that.dialogContent = '发现新版本:' + res.data.version + ', 是否立即更新'
                            that.$refs.upVersion.open()
                        } else {
                            uni.showToast({
                                title: res.msg,
                                icon: "none",
                                position: 'top'
                            })
                        }
						
                    }
                })
            },
            dialogConfirm() {
                this.$refs.upVersion.close()
                this.downWgt()
            },
            dialogClose() {
                this.$refs.upVersion.close()
            },
            downWgt() {
                let that = this;
                const wms = 'http://'+ that.baseIP + ':' +that.wmsPort + "/" +that.wmsUrl
                const downloadUrl = wms + "/appVersion/downloadApp/" + that.filename
                uni.showLoading({
                    title: '更新中……'
                })
                const downloadTask = uni.downloadFile({ //执行下载
                    url: downloadUrl, //下载地址
                    timeout: 1000 * 30, //30秒超时时间
                    success: downloadResult => { //下载成功
                        console.log(downloadResult);
                        that.showdownLine = false
                        uni.hideLoading();
                        if (downloadResult.statusCode == 200) {
                            uni.showModal({
                                title: '',
                                content: '更新成功，确定现在重启吗？',
                                confirmText: '重启',
                                confirmColor: '#EE8F57',
                                success: function(res) {
                                    if (res.confirm == true) {
                                        plus.runtime.install( //安装
                                            downloadResult.tempFilePath, {
                                                force: true
                                            },
                                            function(res) {
                                                utils.showToast('更新成功，重启中');
                                                plus.runtime.restart();
                                            }
                                        );
                                    }
                                }
                            });
                        } else {
                            uni.hideLoading();
                            that.showdownLine = false
                            uni.showToast({
                                title:'请先上传安装包',
                                icon: 'error'
                            })
                        }
                    },
                    fail: err => {
                        uni.hideLoading();
                        that.showdownLine = false
                        that.$u.toast(downloadResult.errMsg)
                    },
                    complete: com => {
						
                        console.log(com)
                    }
                });
			
                // 下载进度
                downloadTask.onProgressUpdate(res => {
                    that.downloadNum = res.progress
                    console.log('下载进度' + that.downloadNum);
                });
            },
        }
        
@@ -1285,8 +1410,8 @@
    }
    .eject{
        position: relative;
        width: 40vw;
        height: 40vh;
        width: 45vw;
        height: 45vh;
        background-color: #fff;
        border-radius: 2rem;
    }

 Monitor-APP/static/img/logo-bai.png