monitor.git - Gitblit

			@@ -3,10 +3,11 @@
			<uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
			<view class="home-view">
			<view class="head">
			<text>自动仓库WCS监控平台</text>
			<text>智能大屏显示系统</text>
			</view>
			<!-- 日历 -->
			<view class="time-tools">{{calendar}}</view>
			<view class="time-tools">{{version}}</view>
			<view class="version">当前版本:{{socketUrl}}</view>
			<view class="button-left" @click="ejected()"></view>
			<view class="button-right" @click="ejected()"></view>
			<!-- 主视图 -->
			@@ -15,58 +16,31 @@
			<view class="mian-item-box">
			<y-box>
			<view class="box-item">
			<text class="item-title">自动化立体仓库</text>
			<text class="item-subTitle">Automatic Storageand Retrieval System</text>
			<text class="item-text" style="text-align: left;">利用立体仓库设备可实现仓库高层合理化、存取自动化、操作简便化；自动化立体仓库是当前技术水平较高的形式。自动化立体仓库的主体由货架、巷道式堆垛起重机、入（出）库工作台和自动运进（出）及操作控制系统组成。货架是钢结构或钢筋混凝土结构的建筑物或结构体，货架内是标准尺寸的货位空间，巷道堆垛起重机穿行于货架之间的巷道中，完成存、取货的工作。管理上采用计算机及条形码技术。</text>
			</view>
			<text class="item-title">智能大屏显示系统</text>
			<text class="item-subTitle">Intelligent LargeScreen Display System</text>
			</view>
			<view class="box-item">
			<text class="item-title">仓库数据</text>
			<text class="item-subTitle">warehouse data</text>
			<view class="img-box">
			<view class="img-box">
			<!-- swiper 一些说明
			circular 是否采用衔接滑动，即播放到末尾后重新回到开头
			vertical 滑动方向是否为纵向
			display-multiple-items 同时显示的滑块数量 -->
			<swiper class="swiper-body-main" vertical="true"
			display-multiple-items="5"
			circular="true" :autoplay="true" :interval="3000" :duration="2000">
			<swiper-item class="swiper-item" v-for="(item,i) in locList" :key="i">
			<!-- <view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view> -->
			<!-- <view style="width: 30%;">料号: {{item.matnr}}</view> -->
			<view style="width: 50%; font-size: 1vw;">物料码: {{item.matnr}}</view>
			<view style="width: 50%; font-size: 1vw;">数量: {{item.matnrCount}}</view>



			</swiper-item>
			</swiper>

			<view class="item-img">
			<image src="../../static/a1.png" mode="aspectFit"></image>
			<view class="flex-col" style="width: calc(100% - 5vw);">
			<view class="flex-row" style="position: relative;" >
			<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDistance}}</view>
			<view style="position: absolute;bottom: 0;left: 10vw;">KM</view>
			</view>
			<view style="height: 100%;text-align: left;text-indent: 2em;">累计走行距离(千米)</view>
			</view>
			</view>

			<view class="item-img">
			<image src="../../static/b1.png" mode="aspectFit"></image>
			<view class="flex-col" style="width: calc(100% - 5vw);">
			<view class="flex-row" style="position: relative;" >
			<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDistance}}</view>
			<view style="position: absolute;bottom: 0;left: 10vw;">KM</view>
			</view>
			<view style="height: 100%;text-align: left;text-indent: 2em;">累计升降距离(千米)</view>
			</view>
			</view>

			<view class="item-img">
			<image src="../../static/c1.png" mode="aspectFit"></image>
			<view class="flex-col" style="width: calc(100% - 5vw);">
			<view class="flex-row" style="position: relative;" >
			<view style="-width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.xDuration}}</view>
			<view style="position: absolute;bottom: 0;left: 10vw;">H</view>
			</view>
			<view style="height: 100%;text-align: left;text-indent: 2em;">累计走行时长(小时)</view>
			</view>
			</view>

			<view class="item-img">
			<image src="../../static/d1.png" mode="aspectFit"></image>
			<view class="flex-col" style="width: calc(100% - 5vw);">
			<view class="flex-row" style="position: relative;" >
			<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">{{baseInfo.yDuration}}</view>
			<view style="position: absolute;bottom: 0;left: 10vw;">H</view>
			</view>
			<view style="height: 100%;text-align: left;text-indent: 2em;">累计升降时长(小时)</view>
			</view>
			</view>

			</view>
			</view>
			@@ -83,7 +57,7 @@
			<view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
			<!-- style="justify-content: flex-end;position: absolute;top: 0;right: 1vw;text-align: right;" -->
			<text class="item-title">{{baseInfo.usedPr}}%</text>
			<text class="item-subTitle">同比上月 + 5%</text>
			<!-- <text class="item-subTitle">同比上月 + 5%</text> -->
			</view>
			</view>
			</view>
			@@ -119,8 +93,8 @@
			<!-- 百分比 -->
			<view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
			<!-- style="justify-content: flex-end;position: absolute;top: 0;right: 1vw;text-align: right;" -->
			<text class="item-title">31</text>
			<text class="item-subTitle">今日订单数</text>
			<!-- <text class="item-title">31</text>
			<text class="item-subTitle">今日订单数</text> -->
			</view>
			</view>
			</view>
			@@ -186,7 +160,7 @@
			<view style="height: 18%;">
			<y-box>
			<view class="flex-col" style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
			自动仓库WCS监控平台
			智能大屏显示系统
			</view>
			</y-box>
			</view>
			@@ -212,41 +186,42 @@
			<view class="info-box">
			<y-box>
			<!-- 文本容器 -->
			<view class="text-content" v-for="item in swiperList">
			<view>目标站：{{infoText.staNo}}</view>
			<view>商品编码：{{item.matnr}}</view>
			<view>商品名称：{{item.maknx}}</view>
			<view>规格：{{item.specs}}</view>
			<view>数量：{{item.count}} / {{item.total ? item.total : '--'}}</view>



			<view class="text-content">
			<!-- head -->
			<!-- <view class="swiper-head">
			<view style="width: 20%;">目标站：{{infoText.staNo}}</view>
			<view style="width: 30%;">商品编号</view>
			<view style="width: 20%;">商品名称</view>
			<view style="width: 20%;">规格</view>
			<view style="width: 10%;">数量</view>
			</view> -->
			<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>
			<!-- body -->
			<!-- <view class="swiper-body"> -->
			<view class="swiper-body">
			<!-- swiper 一些说明
			circular 是否采用衔接滑动，即播放到末尾后重新回到开头
			vertical 滑动方向是否为纵向
			display-multiple-items 同时显示的滑块数量 -->
			<!-- <swiper class="swiper-body-main" vertical="true"
			display-multiple-items="8"
			circular="true" :autoplay="true" :interval="3000" :duration="1000">
			<swiper class="swiper-body-main" vertical="true"
			display-multiple-items="2"
			circular="true" :autoplay="true" :interval="3000" :duration="2000">
			<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
			<view style="width: 20%;">No:{{i+1}}</view>
			<view style="width: 30%;">{{item.matNo}}</view>
			<view style="width: 20%;">{{item.maknx}}</view>
			<view style="width: 20%;">{{item.specs}}</view>
			<view style="width: 10%;">{{item.count}}</view>
			<view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view>
			<!-- <view style="width: 30%;">料号: {{item.matnr}}</view> -->
			<view style="width: 50%; font-size: 3vw;">物料编码: {{item.matnr}}</view>
			<view style="width: 50%; font-size: 3vw;">名称: {{item.maknx}}</view>
			<!-- <view style="width: 33%; font-size: 3vw;">生产日期: {{item.manuDate}}</view> -->


			<view style="width: 50%; font-size: 3vw;">规格: {{item.specs}}</view>
			<view style="width: 50%; font-size: 3vw;">批次: {{item.batch}}</view>
			<view style="width: 50%; font-size: 3vw;">销售单号: {{item.orderNo}}</view>
			<view style="width: 50%; font-size: 3vw;">客户名称: {{item.customer}}</view>
			<view style="width: 33%; font-size: 3vw;">数量: {{item.count}}</view>


			</swiper-item>
			</swiper>
			</view> -->
			</view>
			</view>
			</y-box>
			</view>
			@@ -322,7 +297,7 @@
			</view>
			</view>
			<view style="color: #FFF;position: fixed;bottom: 10px;left: 10px;" v-show="timeOut">
			连接超时: {{times}} s
			连接超时，正在重新建立链接:: {{times}}
			</view>
			</view>
			</template>
			@@ -330,6 +305,9 @@
			<script>
			import demodata from '@/mockdata/demodata.json';
			import ycqdata from '@/pages/index/data.json';
			import {WebSocketClient} from "@/static/js/WebSocketClient"
			import WebSocketUtil from './uniWebSocket';
			let socket;
			export default {
			data() {
			return {
			@@ -388,20 +366,21 @@
			specs: "",
			count: "",
			error: "",
			barcode: "",
			orderNo: '',
			batch: '',
			doneOfTray: '',
			totalOfTray: '',
			doneOfUnit: '',
			totalOfUnit: '',
			ctnNo: '1'
			barcode: ""
			},
			swiperList: [],
			timeOut: false,
			times: 0,
			currDate: '',
			textred: 'textred'
			locList:[],
			oldHours:'',
			oldMin:'',
			socketClient: null,
			messages: [],
			version:'',
			socketUrl:''


			}
			},
			onShow() {
			@@ -409,6 +388,7 @@
			// #ifdef APP-PLUS
			plus.navigator.setFullscreen(true)
			// #endif
			this.getVersion()
			},
			mounted() {
			let that = this
			@@ -424,30 +404,253 @@
			that.baseCrnId = BaseCrnId
			// this.getUrl()
			},
			onLoad() {
			setInterval(()=>{
			// this.getInfo()
			// this.getError()
			this.getInfo2()
			this.getError2()
			this.controller()
			},1000)
			created() {
			let that = this
			const BaseIP = uni.getStorageSync('BaseIp');
			const BaseLedId = uni.getStorageSync('BaseLedId');
			const BasePort = uni.getStorageSync('BasePort');
			const BaseCrnId = uni.getStorageSync('BaseCrnId');
			const PROJ = uni.getStorageSync('UPROJ');
			that.baseUrl = PROJ
			that.baseIP = BaseIP
			that.baseLedId = BaseLedId
			that.basePort = BasePort
			that.baseCrnId = BaseCrnId
			that.uniWebSocket();
			// that.webSockerInit()
			},
			onLoad() {
			setInterval(()=>{
			this.getServerData()
			this.initlineChart()
			this.initPieChart()
			this.getOther()
			this.getDate2()
			},3600000)
			this.getUrl()
			this.getServerData()
			this.initlineChart()
			this.initPieChart()
			this.getOther()
			this.getDate2()
			// this.initlineChart()
			// this.initPieChart()
			// this.getOther()
			// // this.getDate()
			// this.getDate2()
			// this.getInfo()
			// this.getError()
			// this.getInfo2()
			// this.getError2()
			// this.getUrl()
			this.controller()
			// this.statisticalModel()
			// 测试用

			},1000)

			setInterval(()=> {
			setTimeout(()=>{
			plus.runtime.restart();
			},100)

			},10006060*4)

			// setInterval(()=> {
			// setTimeout(()=>{
			// var time = new Date();
			// var hh = time.getHours();
			// var mm = time.getMinutes();
			// if(hh > this.oldHours && mm >this.oldMin && this.oldMin - mm < 55){
			// plus.runtime.restart();
			// }
			// if(mm >this.oldMin && mm - this.oldMin >2){
			// plus.runtime.restart();
			// }
			// },100)

			// },1000*30)
			},
			methods: {
			timeOuts() {
			uniWebSocket(){
			let that = this;
			that.commonUrl = that.baseIP + ':' +that.basePort + "/" +that.baseUrl
			that.socketUrl = "ws://"+that.commonUrl+"/led/"+that.baseLedId
			// 创建WebSocket实例
			that.socketClient = new WebSocketUtil(that.socketUrl, {
			// 心跳间隔，默认30秒
			heartbeatInterval: 30000,
			// 重连间隔，默认3秒
			reconnectInterval: 3000,
			// 最大重连次数，-1表示无限重连
			maxReconnectAttempts: -1,
			// 消息回调
			onMessage: (res) => {
			try {
			const data = JSON.parse(res.data);
			that.showDate(data)
			// 处理消息...
			} catch (e) {
			console.error('解析消息失败', e);
			}
			},
			// 连接打开回调
			onOpen: (res) => {
			that.timeOut = false
			that.times = 0
			console.log('WebSocket已连接', res);
			},
			// 连接错误回调
			onError: (error) => {
			console.error('WebSocket错误', error);
			},
			// 连接关闭回调
			onClose: (res) => {
			that.timeOut = true
			that.times = that.times+1
			that.infoType = 0
			console.log('WebSocket已关闭', res);
			},
			// 重连回调
			onReconnect: (info) => {
			console.log(`WebSocket重连(${info.attempts}/${info.maxAttempts})`);
			}
			});

			// 建立连接
			that.socketClient.connect();
			},
			// 发送消息
			sendMessage(content) {
			const message = {
			type: 'chat',
			content: content,
			timestamp: Date.now()
			};

			this.socketClient.send(message)
			.then(() => {
			console.log('消息发送成功');
			})
			.catch(error => {
			console.error('消息发送失败', error);
			});
			},
			webSockerInit(){
			let that = this;

			if(that.baseIP === '' && that.basePort === '' && that.baseUrl ==='' ){
			that.timeOut = true
			that.times = that.times+1
			that.infoType = 0
			return ;
			}

			that.commonUrl = that.baseIP + ':' +that.basePort + "/" +that.baseUrl
			let socketUrl = "ws://"+that.commonUrl+"/led/"+that.baseLedId
			// socketUrl = "ws://10.0.100.150:8080/gtctu/led/113"
			const ws = new WebSocketClient(socketUrl);
			ws.connect()

			console.log(ws)

			ws.onclose(() =>{

			})

			ws.onmessage((msg)=>{
			that.timeOut = false
			let data = JSON.parse(msg.data)
			that.showDate(data)

			})

			},
			showDate(data){
			const that = this
			if(data.type === "default"){
			that.chartsData.Pie.series[0].data = data.pie
			that.baseInfo.stockCount = data.stockCunt
			that.baseInfo.emptyCount = data.emptyCount
			that.baseInfo.noneCount =data.noneCount
			that.baseInfo.used = data.used
			that.baseInfo.usedPr = data.usedPr

			that.chartsData.Line.categories = [
			that.getDateFormat(-11),that.getDateFormat(-10),that.getDateFormat(-9),that.getDateFormat(-8),
			that.getDateFormat(-7),that.getDateFormat(-6),that.getDateFormat(-5),that.getDateFormat(-4),
			that.getDateFormat(-3),that.getDateFormat(-2),that.getDateFormat(-1),that.getDateFormat(0),]
			that.chartsData.Line.series = data.rows
			that.calendar = data.year + "年" + data.month + "月" + data.day + "日 " + data.hour + ":" + data.minute + ":" + data.second + " " + data.week
			that.currDate = data.year + "/" + data.month + "/" + data.day
			that.locList = data.inventoryData
			that.oldHours = data.hour
			that.oldMin = data.minute
			}else if(data.type === "error"){
			if (data.errMsg && data.errMsg !== "") {
			var errorInfo = data.errMsg
			if (that.infoType == 1) {
			that.infoType = 3
			that.infoText.title = "其他信息"
			// that.infoText.title = "异常"
			that.infoText.error = errorInfo
			return
			}
			that.infoType = 2
			that.infoText.title = "其他信息"
			// that.infoText.title = "异常"
			that.infoText.error = errorInfo
			} else {
			if (that.infoType == 1) {
			return
			}
			that.infoType = 0
			}
			}else if(data.type === "task"){
			if (data.taskList && data.taskList !== "" && data.taskList.length !=0) {
			if (that.infoType == 2 \|\| that.infoType == 3) {
			return;
			}
			// infoType1:只有拣料等信息
			that.infoType = 1
			if (data.taskList[0].ioType === 101) {
			that.infoText.title = '全板出库'
			} else if(data.taskList[0].ioType === 103) {
			that.infoText.title = '拣料出库'
			} else if(data.taskList[0].ioType === 107) {
			that.infoText.title = '盘点出库'
			} else if(data.taskList[0].ioType === 1) {
			that.infoText.title = '入库'
			} else if(data.taskList[0].ioType === 10) {
			that.infoText.title = '空托入库'
			} else if(data.taskList[0].ioType === 110) {
			that.infoText.title = '空托出库'
			} else if(data.taskList[0].ioType === 104) {
			that.infoText.title = '并板出库'
			}else if(data.taskList[0].ioType === 54) {
			that.infoText.title = '并板入库'
			}
			that.infoText.barcode = data.taskList[0].barcode
			that.infoText.workNo = data.taskList[0].workNo
			that.infoText.sourceLocNo = data.taskList[0].sourceLocNo
			that.infoText.staNo = data.taskList[0].staNo
			that.swiperList = data.taskList[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
			} else {
			if (that.infoType == 2 \|\| that.infoType == 3) {
			return;
			}
			that.infoType = 0
			}
			}
			},
			statisticalModel() {
			let that = this
			uni.request({
			url: that.commonUrl + "/monitor/locDetl/pda/statisticalModel",
			method:'GET',
			success(result) {
			var res = result.data
			if (res.code === 200) {
			console.log(res.data)
			that.locList = res.data
			}
			}
			})
			},
			timeOut() {
			console.log(this.times);
			},
			getUrl() {
			@@ -462,8 +665,40 @@
			let that = this
			var result = ycqdata.dataInfo2
			var res = result.data
			console.log(res);
			that.infoModel(res)
			if (res.data && res.data !== "") {
			if (that.infoType == 2 \|\| that.infoType == 3) {
			return;
			}
			// infoType1:只有拣料等信息
			that.infoType = 1
			if (res.data[0].ioType === 101) {
			that.infoText.title = '全板出库'
			} else if(res.data[0].ioType === 103) {
			that.infoText.title = '检料出库'
			} else if(res.data[0].ioType === 107) {
			that.infoText.title = '盘点出库'
			} else if(res.data[0].ioType === 1) {
			that.infoText.title = '入库'
			} else if(res.data[0].ioType === 10) {
			that.infoText.title = '空托入库'
			} else if(res.data[0].ioType === 110) {
			that.infoText.title = '空托出库'
			}
			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
			} else {
			if (that.infoType == 2 \|\| that.infoType == 3) {
			return;
			}
			that.infoType = 0
			}
			},
			getError2 () {
			let that = this
			@@ -473,12 +708,14 @@
			var errorInfo = res.data
			if (that.infoType == 1) {
			that.infoType = 3
			that.infoText.title = "异常"
			that.infoText.title = "其他信息"
			// that.infoText.title = "异常"
			that.infoText.error = errorInfo
			return
			}
			that.infoType = 2
			that.infoText.title = "异常"
			that.infoText.title = "其他信息"
			// that.infoText.title = "异常"
			that.infoText.error = errorInfo
			} else {
			if (that.infoType == 1) {
			@@ -494,8 +731,48 @@
			method:"GET",
			data: {ledId:that.baseLedId},
			success(result) {
			that.timeOut = false
			that.times = 0
			var res = result.data
			that.infoModel(res)
			if (res.data && res.data !== "") {
			if (that.infoType == 2 \|\| that.infoType == 3) {
			return;
			}
			// infoType1:只有拣料等信息
			that.infoType = 1
			if (res.data[0].ioType === 101) {
			that.infoText.title = '全板出库'
			} else if(res.data[0].ioType === 103) {
			that.infoText.title = '检料出库'
			} else if(res.data[0].ioType === 107) {
			that.infoText.title = '盘点出库'
			} else if(res.data[0].ioType === 1) {
			that.infoText.title = '入库'
			} else if(res.data[0].ioType === 10) {
			that.infoText.title = '空托入库'
			} else if(res.data[0].ioType === 110) {
			that.infoText.title = '空托出库'
			}
			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
			} else {
			if (that.infoType == 2 \|\| that.infoType == 3) {
			return;
			}
			that.infoType = 0
			}
			},
			fail(err) {
			that.timeOut = true
			that.times = that.times+1
			that.infoType = 0
			}
			})

			@@ -507,6 +784,8 @@
			data: {ledId:that.baseLedId},
			method:"GET",
			success(result) {
			that.timeOut = false
			that.times = 0
			var res = result.data
			if (res.data && res.data !== "") {
			var errorInfo = res.data
			@@ -527,37 +806,13 @@
			}
			that.infoType = 0
			}
			},
			fail(err) {
			that.timeOut = true
			that.infoType = 0
			}
			})

			},
			infoModel(res) {
			let that = this
			if (res.data && res.data !== "") {
			if (that.infoType == 2 \|\| that.infoType == 3) {
			return;
			}
			// infoType1:只有拣料等信息
			that.infoType = 1
			if (res.data[0].ioType === 101) {
			that.infoText.title = '全板出库'
			} else if(res.data[0].ioType === 103) {
			that.infoText.title = '检料出库'
			} else if(res.data[0].ioType === 107) {
			that.infoText.title = '盘点出库'
			}
			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
			} else {
			if (that.infoType == 2 \|\| that.infoType == 3) {
			return;
			}
			that.infoType = 0
			}
			},
			// 控制器
			controller() {
			@@ -682,21 +937,13 @@
			// 日历服务器
			getDate2() {
			let that = this
			if(that.commonUrl == 'undefined') {
			return
			}
			uni.request({
			url: that.commonUrl + "/monitor/date",
			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
			},
			fail(res) {
			console.log(res);

			}

			})
			},

			@@ -733,20 +980,13 @@
			/************* 折线图 ***************************************************************************************************/
			initlineChart() {
			let that = this
			if(that.commonUrl == 'undefined') {
			return
			}
			uni.request({
			url: that.commonUrl + "/monitor/line/charts",
			method:'GET',
			success(result) {
			var res = result.data
			if (res.code === 200) {
			that.chartsData.Line.categories = [
			that.getDateFormat(-11),that.getDateFormat(-10),that.getDateFormat(-9),that.getDateFormat(-8),
			that.getDateFormat(-7),that.getDateFormat(-6),that.getDateFormat(-5),that.getDateFormat(-4),
			that.getDateFormat(-3),that.getDateFormat(-2),that.getDateFormat(-1),that.getDateFormat(0),]
			that.chartsData.Line.series = res.data.rows

			}
			}
			})
			@@ -754,9 +994,6 @@
			/************* 饼图 ***************************************************************************************************/
			initPieChart() {
			let that = this
			if(that.commonUrl == 'undefined') {
			return
			}
			uni.request({
			url: that.commonUrl + "/monitor/loc/rep",
			method:'GET',
			@@ -775,9 +1012,6 @@
			},
			getOther() {
			let that = this
			if(that.commonUrl == 'undefined') {
			return
			}
			uni.request({
			url: that.commonUrl + "/monitor/other",
			data: {
			@@ -785,6 +1019,7 @@
			ledId: that.baseLedId,
			},
			success(result) {
			// console.log(result);
			var res = result.data
			if (res.code === 200) {
			that.baseInfo.xDistance = res.data.xDistance
			@@ -798,6 +1033,27 @@
			}
			}
			})
			},
			//检测当前平台，如果是安卓则启动安卓更新
			getVersion() {
			let that = this;
			uni.getSystemInfo({
			success: (res) => {
			if (res.platform == "android") {
			that.AndroidCheckUpdate();
			}
			}
			})
			},
			// 获取当前版本号
			AndroidCheckUpdate() {
			let that = this;
			plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
			that.version = wgtinfo.version //客户端版本号
			})
			// setTimeout(()=>{
			// that.getUpdateVersion()
			// },100)
			},
			}

			@@ -879,6 +1135,7 @@
			height: 8.5%;
			}
			.img-box {
			height: 23vw;
			width: 100%;
			/* background-color: #666666; */
			display: flex;
			@@ -922,7 +1179,7 @@
			margin-left: 10%;
			}
			.charts-box-ring {
			width: 50%;
			width: 60%;
			height: 24vh;
			/* background-color: #00ffff; */
			}
			@@ -932,9 +1189,6 @@
			.sub-info image {
			width: 3.5vw;
			height: 3.5vw;
			}
			.red{
			color: red
			}


			@@ -971,6 +1225,13 @@
			.item-title {
			font-size:1.5vw;
			font-weight: 700;
			}
			.version{
			position: absolute;
			left: 2%;
			top: 2%;
			font-size:1vw;
			transform: scale(0.8);
			}
			.item-subTitle {
			font-size:0.5vw;
			@@ -1106,9 +1367,5 @@
			.info-box-text-item {
			height: 20%;font-size: 8vh;
			justify-content: center;
			white-space: pre-line;
			}
			.textred{
			color: red;
			}
			</style>