private.git - Gitblit

			@@ -17,84 +17,103 @@
			<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>
			<text class="item-text"
			style="text-align: left;">利用立体仓库设备可实现仓库高层合理化、存取自动化、操作简便化；自动化立体仓库是当前技术水平较高的形式。自动化立体仓库的主体由货架、巷道式堆垛起重机、入（出）库工作台和自动运进（出）及操作控制系统组成。货架是钢结构或钢筋混凝土结构的建筑物或结构体，货架内是标准尺寸的货位空间，巷道堆垛起重机穿行于货架之间的巷道中，完成存、取货的工作。管理上采用计算机及条形码技术。</text>
			</view>
			<view class="box-item">
			<text class="item-title">仓库数据</text>
			<text class="item-subTitle">warehouse data</text>
			<view class="img-box">


			<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 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 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 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 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 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 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 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 style="height: 100%;text-align: left;text-indent: 2em;">累计升降时长(小时)
			</view>
			</view>
			</view>


			</view>
			</view>
			<view class="box-item">
			<view class="flex-row" style="width: 100%;">
			<!-- 左侧 -->
			<view class="flex-col" style="align-items: flex-start;justify-content: flex-start;">
			<view class="flex-col"
			style="align-items: flex-start;justify-content: flex-start;">
			<text class="item-title">库位使用率</text>
			<text class="item-subTitle">EQUIPMENT USAGE THIS MONTH</text>
			</view>
			<!-- 右侧 -->
			<view style="margin-left: auto;">
			<!-- 百分比 -->
			<view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
			<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>
			</view>
			</view>
			</view>

			<view class="flex-col" style="width: 100%;align-items: flex-start;position: relative;font-size: 1vw">

			<view class="flex-col"
			style="width: 100%;align-items: flex-start;position: relative;font-size: 1vw">
			<!-- 进度条 -->
			<view class="flex-row" style="width: 100%;position: relative;margin-top: 5%;">
			<view class="progressBar" style="width: 80%;height: 2vw;">
			<view class="progress" :style="'width:'+ baseInfo.usedPr + '%'"></view>
			</view>
			<view style="position: absolute;bottom: 0;right: 0;font-size: 2.5vw;color: #FF5722;;">{{baseInfo.used}}</view>
			<view
			style="position: absolute;bottom: 0;right: 0;font-size: 2.5vw;color: #FF5722;;">
			{{baseInfo.used}}
			</view>
			</view>
			</view>
			</view>
			@@ -110,14 +129,16 @@
			<view class="box-item">
			<view class="flex-row" style="width: 100%;">
			<!-- 左侧 -->
			<view class="flex-col" style="align-items: flex-start;justify-content: flex-start;">
			<view class="flex-col"
			style="align-items: flex-start;justify-content: flex-start;">
			<text class="item-title">入出库统计</text>
			<text class="item-subTitle">ORDER STATISTICS</text>
			</view>
			<!-- 右侧 -->
			<view style="margin-left: auto;">
			<!-- 百分比 -->
			<view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
			<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>
			@@ -125,31 +146,34 @@
			</view>
			</view>
			<view class="charts-box">
			<qiun-data-charts type="line" :chartData="chartsDataLine1" :echartsH5="true" :echartsApp="true"/>
			<qiun-data-charts type="line" :chartData="chartsDataLine1"
			:echartsH5="true" :echartsApp="true" />
			</view>
			</view>
			</y-box>
			</view>




			<!-- null -->
			<view style="height: 2%;"></view>




			<view style="height: 43%;">
			<y-box>
			<view class="box-item">
			<view class="flex-row" style="width: 100%;">
			<!-- 左侧 -->
			<view class="flex-col" style="align-items: flex-start;justify-content: flex-start;">
			<view class="flex-col"
			style="align-items: flex-start;justify-content: flex-start;">
			<text class="item-title">库存类型</text>
			<text class="item-subTitle">INCOME DATE</text>
			</view>
			<!-- 右侧 -->
			<view style="margin-left: auto;">
			<!-- 百分比 -->
			<view class="flex-col" style="align-items: flex-end;justify-content: flex-end;" >
			<text class="item-title">今天</text>
			<view class="flex-col"
			style="align-items: flex-end;justify-content: flex-end;">
			<text class="item-title">今天</text>
			<text class="item-subTitle">Today</text>
			</view>
			</view>
			@@ -157,35 +181,47 @@
			<view class="flex-row" style="width: 100%;">
			<!-- 左 -->
			<view class="charts-box-ring">
			<qiun-data-charts type="ring" :opts="{legend:{position:'bottom'}}" :eopts="ringOpts" :chartData="chartsDataPie2" :echartsH5="true" :echartsApp="true"/>
			<qiun-data-charts type="ring" :opts="{legend:{position:'bottom'}}"
			:eopts="ringOpts" :chartData="chartsDataPie2" :echartsH5="true"
			:echartsApp="true" />
			</view>
			<!-- 右 -->
			<view>
			<view class="flex-row sub-info">
			<image src="../../static/g1.png" mode="aspectFit"></image>
			<view style="width: 8vw;height: 4vw;line-height: 4vw;">在库</view>
			<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.stockCount}}</view>
			<view
			style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">
			{{baseInfo.stockCount}}
			</view>
			</view>
			<view class="flex-row sub-info" style="margin-top: 2vh;">
			<image src="../../static/f1.png" mode="aspectFit"></image>
			<view style="width: 8vw;height: 4vw;line-height: 4vw;">空库</view>
			<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.emptyCount}}</view>
			<view
			style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">
			{{baseInfo.emptyCount}}
			</view>
			</view>
			<view class="flex-row sub-info" style="margin-top: 2vh;">
			<image src="../../static/e1.png" mode="aspectFit"></image>
			<view style="width: 8vw;height: 4vw;line-height: 4vw;">锁定</view>
			<view style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">{{baseInfo.noneCount}}</view>
			<view
			style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">
			{{baseInfo.noneCount}}
			</view>
			</view>
			</view>
			</view>
			</view>


			</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 class="flex-col"
			style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
			自动仓库WCS监控平台
			</view>
			</y-box>
			@@ -194,7 +230,7 @@
			</view>
			</view>
			</view>


			</view>
			</uni-transition>
			<!-- 全板/拣料信息 -->
			@@ -218,9 +254,9 @@
			<view>商品名称：{{item.maknx}}</view>
			<view>规格：{{item.specs}}</view>
			<view>数量：{{item.count}} / {{item.total ? item.total : '--'}}</view>






			<!-- head -->
			<!-- <view class="swiper-head">
			<view style="width: 20%;">目标站：{{infoText.staNo}}</view>
			@@ -231,11 +267,11 @@
			</view> -->
			<!-- body -->
			<!-- <view class="swiper-body"> -->
			<!-- swiper 一些说明
			<!-- swiper 一些说明
			circular 是否采用衔接滑动，即播放到末尾后重新回到开头
			vertical 滑动方向是否为纵向
			display-multiple-items 同时显示的滑块数量 -->
			<!-- <swiper class="swiper-body-main" vertical="true"
			<!-- <swiper class="swiper-body-main" vertical="true"
			display-multiple-items="8"
			circular="true" :autoplay="true" :interval="3000" :duration="1000">
			<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
			@@ -264,7 +300,7 @@
			<view class="button-left"></view>
			<view class="button-right"></view>
			<!-- 主体 -->
			<view class="info-main" >
			<view class="info-main">
			<view class="info-box">
			<y-box>
			<view class="info-box-text">
			@@ -275,7 +311,7 @@
			</view>
			</view>
			</uni-transition>


			<!-- 自定义弹出层 -->
			<view class="eject-mask" v-show="ejectShow">
			<view class="eject">
			@@ -335,7 +371,7 @@
			return {
			series: [],
			homeViewShow: true,
			infoViewShow: false ,
			infoViewShow: false,
			errorInfoViewShow: false,
			homeMode: [],
			infoMode: [],
			@@ -364,7 +400,7 @@
			},
			duration: 1000,
			calendar: '',
			ringOpts:{},
			ringOpts: {},
			chartsDataLine1: {},
			chartsDataPie2: {},
			fontSize: '',
			@@ -422,53 +458,70 @@
			that.baseLedId = BaseLedId
			that.basePort = BasePort
			that.baseCrnId = BaseCrnId
			// this.getUrl()



			this.getDate2()
			setTimeout(() => {
			// this.getServerData()
			// this.initlineChart()
			// this.initPieChart()
			// this.getOther()
			setTimeout(() => {
			this.getServerData()
			this.initlineChart()
			this.initPieChart()
			this.getOther()
			setTimeout(() => {
			this.getServerData()
			this.initlineChart()
			this.initPieChart()
			this.getOther()
			}, 3000)
			}, 1000)
			}, 1000)
			},
			onLoad() {
			setInterval(()=>{
			// this.getInfo()
			// this.getError()
			this.getInfo2()
			this.getError2()
			setInterval(() => {
			this.getDate2()
			this.getUrl()
			this.getInfo()
			this.getError()
			// this.getInfo2()
			// this.getError2()
			this.controller()
			},1000)
			setInterval(()=>{
			}, 1000)

			setInterval(() => {
			this.getServerData()
			this.initlineChart()
			this.initPieChart()
			this.getOther()
			this.getDate2()
			},3600000)
			this.getUrl()
			this.getServerData()
			this.initlineChart()
			this.initPieChart()
			this.getOther()
			this.getDate2()
			}, 3600000)
			},
			methods: {
			timeOuts() {
			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))
			this.chartsDataPie2=JSON.parse(JSON.stringify(this.chartsData.Pie))
			this.chartsDataLine1 = JSON.parse(JSON.stringify(this.chartsData.Line))
			this.chartsDataPie2 = JSON.parse(JSON.stringify(this.chartsData.Pie))
			},
			// 获取错误信息
			getInfo2() {
			let that = this
			var result = ycqdata.dataInfo2
			var res = result.data
			var res = result.data
			console.log(res);
			that.infoModel(res)
			},
			getError2 () {
			getError2() {
			let that = this
			let result = ycqdata.dataError2
			var res = result.data
			var res = result.data
			if (res.data && res.data !== "") {
			var errorInfo = res.data
			if (that.infoType == 1) {
			@@ -491,28 +544,32 @@
			let that = this
			uni.request({
			url: that.commonUrl + "/monitor/led",
			method:"GET",
			data: {ledId:that.baseLedId},
			method: "GET",
			data: {
			ledId: that.baseLedId
			},
			success(result) {
			var res = result.data
			var res = result.data
			that.infoModel(res)
			}
			})


			},
			getError() {
			let that = this
			uni.request({
			url: that.commonUrl + "/monitor/led/error",
			data: {ledId:that.baseLedId},
			method:"GET",
			data: {
			ledId: that.baseLedId
			},
			method: "GET",
			success(result) {
			var res = result.data
			var res = result.data
			if (res.data && res.data !== "") {
			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
			@@ -529,7 +586,7 @@
			}
			}
			})


			},
			infoModel(res) {
			let that = this
			@@ -541,9 +598,9 @@
			that.infoType = 1
			if (res.data[0].ioType === 101) {
			that.infoText.title = '全板出库'
			} else if(res.data[0].ioType === 103) {
			} else if (res.data[0].ioType === 103) {
			that.infoText.title = '检料出库'
			} else if(res.data[0].ioType === 107) {
			} else if (res.data[0].ioType === 107) {
			that.infoText.title = '盘点出库'
			}
			that.infoText.staNo = res.data[0].staNo
			@@ -561,90 +618,90 @@
			},
			// 控制器
			controller() {
			switch(this.infoType) {
			switch (this.infoType) {
			// 有信息但没有错误信息
			case 0:
			case 0:
			if (this.errorInfoViewShow) {
			this.errorInfoViewShow = false
			this.errorInfoMode = ['fade', 'slide-bottom']
			setTimeout(()=>{
			setTimeout(() => {
			this.homeViewShow = true
			this.homeMode = ['fade', 'slide-bottom']
			},1000)
			}, 1000)
			} else if (this.infoViewShow) {
			this.infoViewShow = false
			this.infoMode = ['fade', 'slide-bottom']
			setTimeout(()=>{
			setTimeout(() => {
			this.homeViewShow = true
			this.homeMode = ['fade', 'slide-bottom']
			},1000)
			}, 1000)
			} else if (this.errorInfoViewShow && this.infoViewShow) {
			this.errorInfoViewShow = false
			this.infoViewShow = false
			this.infoMode = ['fade', 'slide-bottom']
			setTimeout(()=>{
			setTimeout(() => {
			this.homeViewShow = true
			this.homeMode = ['fade', 'slide-bottom']
			},1000)
			}, 1000)
			}
			return;
			case 1:
			case 1:
			if (this.homeViewShow) {
			this.homeViewShow = false
			this.homeMode = ['fade', 'slide-bottom']
			setTimeout(()=>{
			setTimeout(() => {
			this.infoViewShow = true
			this.infoMode = ['fade', 'slide-bottom']
			},1000)
			}, 1000)
			} else if (this.errorInfoViewShow) {
			this.errorInfoViewShow = false
			this.errorInfoMode = ['fade', 'slide-bottom']
			setTimeout(()=>{
			setTimeout(() => {
			this.infoViewShow = true
			this.infoMode = ['fade', 'slide-bottom']
			},1000)
			}, 1000)
			}


			return;
			// 有信息且有错误信息
			case 2:
			if (this.homeViewShow) {
			this.homeViewShow = false
			this.homeMode = ['fade', 'slide-bottom']
			setTimeout(()=>{
			setTimeout(() => {
			this.errorInfoViewShow = true
			this.errorInfoMode = ['fade', 'slide-bottom']
			},1000)
			}, 1000)
			} else if (this.infoViewShow) {
			this.infoViewShow = false
			this.infoMode = ['fade', 'slide-bottom']
			setTimeout(()=>{
			setTimeout(() => {
			this.errorInfoViewShow = true
			this.errorInfoMode = ['fade', 'slide-bottom']
			},1000)
			}, 1000)
			}
			return;
			// 有信息且有错误信息
			// 有信息且有错误信息
			case 3:
			if (this.homeViewShow) {
			this.homeViewShow = false
			this.homeMode = ['fade', 'slide-bottom']
			setTimeout(()=>{
			setTimeout(() => {
			this.errorInfoViewShow = true
			this.errorInfoMode = ['fade', 'slide-bottom']
			},1000)
			}, 1000)
			} else if (this.infoViewShow) {
			this.infoViewShow = false
			this.infoMode = ['fade', 'slide-bottom']
			setTimeout(()=>{
			setTimeout(() => {
			this.errorInfoViewShow = true
			this.errorInfoMode = ['fade', 'slide-bottom']
			},1000)
			}, 1000)
			}
			return;


			}


			},
			// 主屏幕
			handle(type) {
			@@ -662,7 +719,7 @@
			this.modeClass = type
			},
			// 配置
			ejected () {
			ejected() {
			this.ejectShow = true
			},
			// 取消配置
			@@ -673,58 +730,72 @@
			ejectConfirm() {
			uni.setStorageSync('BaseIp', this.baseIP);
			uni.setStorageSync('BaseLedId', this.baseLedId);
			uni.setStorageSync('BasePort',this.basePort);
			uni.setStorageSync('BaseCrnId',this.baseCrnId);
			uni.setStorageSync('UPROJ',this.baseUrl);
			uni.setStorageSync('BasePort', this.basePort);
			uni.setStorageSync('BaseCrnId', this.baseCrnId);
			uni.setStorageSync('UPROJ', this.baseUrl);
			this.getUrl()
			this.ejectShow = false
			},
			// 日历服务器
			getDate2() {
			let that = this
			if(that.commonUrl == 'undefined') {
			if (that.commonUrl == 'undefined') {
			return
			}
			uni.request({
			url: that.commonUrl + "/monitor/date",
			method:"GET",
			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.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);
			}


			})
			},


			// 日历
			getDate() {
			var dt = new Date();
			var year,month,day,hours,minutes,seconds,weeks
			var year, month, day, hours, minutes, seconds, weeks
			year = dt.getFullYear();
			month = (dt.getMonth()+1) < 10 ? '0'+ (dt.getMonth()+1) : (dt.getMonth()+1);
			day = dt.getDate() < 10 ? '0'+dt.getDate() : dt.getDate();
			month = (dt.getMonth() + 1) < 10 ? '0' + (dt.getMonth() + 1) : (dt.getMonth() + 1);
			day = dt.getDate() < 10 ? '0' + dt.getDate() : dt.getDate();
			hours = dt.getHours() < 10 ? '0' + dt.getHours() : dt.getHours();
			minutes = dt.getMinutes() < 10 ? '0' + dt.getMinutes() : dt.getMinutes();
			seconds = dt.getSeconds() < 10 ? '0' + dt.getSeconds() : dt.getSeconds();
			weeks = dt.getDay();
			seconds = dt.getSeconds() < 10 ? '0' + dt.getSeconds() : dt.getSeconds();
			weeks = dt.getDay();
			switch (weeks) {
			case 0: weeks = "星期日"; break;
			case 1: weeks = "星期一"; break;
			case 2: weeks = "星期二"; break;
			case 3: weeks = "星期三"; break;
			case 4: weeks = "星期四"; break;
			case 5: weeks = "星期五"; break;
			default : weeks = "星期六";
			case 0:
			weeks = "星期日";
			break;
			case 1:
			weeks = "星期一";
			break;
			case 2:
			weeks = "星期二";
			break;
			case 3:
			weeks = "星期三";
			break;
			case 4:
			weeks = "星期四";
			break;
			case 5:
			weeks = "星期五";
			break;
			default:
			weeks = "星期六";
			}
			this.calendar = year + "年" + month + "月" + day + "日 " + hours + ":" + minutes + ":" + seconds + " " + weeks
			},
			getDateFormat(value) {
			var date = new Date(this.currDate);// 获取当前时间
			date.setDate(date.getDate() + value);// 设置天数 -1 天
			var date = new Date(this.currDate); // 获取当前时间
			date.setDate(date.getDate() + value); // 设置天数 -1 天
			var m = date.getMonth() + 1
			var d = date.getDate()
			var newDate = m + '-' + d
			@@ -733,19 +804,23 @@
			/************* 折线图 ***************************************************************************************************/
			initlineChart() {
			let that = this
			if(that.commonUrl == 'undefined') {
			if (that.commonUrl == 'undefined') {
			return
			}
			uni.request({
			url: that.commonUrl + "/monitor/line/charts",
			method:'GET',
			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.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,12 +829,12 @@
			/************* 饼图 ***************************************************************************************************/
			initPieChart() {
			let that = this
			if(that.commonUrl == 'undefined') {
			if (that.commonUrl == 'undefined') {
			return
			}
			uni.request({
			url: that.commonUrl + "/monitor/loc/rep",
			method:'GET',
			method: 'GET',
			success(result) {
			var res = result.data
			if (res.code === 200) {
			@@ -775,13 +850,13 @@
			},
			getOther() {
			let that = this
			if(that.commonUrl == 'undefined') {
			if (that.commonUrl == 'undefined') {
			return
			}
			uni.request({
			url: that.commonUrl + "/monitor/other",
			data: {
			crnId: that.baseCrnId,
			crnId: that.baseCrnId,
			ledId: that.baseLedId,
			},
			success(result) {
			@@ -792,40 +867,43 @@
			that.baseInfo.xDuration = res.data.xDuration
			that.baseInfo.yDuration = res.data.yDuration
			} else if (res.code === 403) {


			} else {


			}
			}
			})
			},
			}


			}
			</script>

			<style>
			/* @import url("../../static/css/common.css"); */
			@import url("home.css");

			/* 列 */
			.flex-col {
			display: flex;
			flex-direction: column;
			}

			/* 行 */
			.flex-row {
			display: flex;
			flex-direction: row;
			}

			.container{

			.container {
			width: 100vw;
			min-height: 100vh;
			background-color: #00163E;
			color: #fff;
			text-align: center;


			}

			/* 主视图 */
			.home-view {
			width: 100vw;
			@@ -833,32 +911,37 @@
			background-image: url(../../static/background.png);
			background-size: 100vw 100vh;
			}

			.home-right {
			width: 50vw;
			height: 89vh;
			/* background-color: cadetblue; */
			}

			.home-right-box {
			width: 98%;
			height: 98%;
			}

			.head {
			width: 100vw;
			height: 11vh;
			font-size:4vw;
			font-size: 4vw;
			font-weight: 700;
			display: flex;
			align-items: center;
			justify-content: center;
			transform: scale(0.7);
			}

			.time-tools {
			position: absolute;
			right: 2%;
			top: 2%;
			font-size:1vw;
			font-size: 1vw;
			transform: scale(0.8);
			}

			.button-left {
			position: absolute;
			background-image: url(../../static/right.png);
			@@ -869,6 +952,7 @@
			height: 8.5%;
			transform: scaleX(-1);
			}

			.button-right {
			position: absolute;
			background-image: url(../../static/right.png);
			@@ -878,6 +962,7 @@
			width: 13.5%;
			height: 8.5%;
			}

			.img-box {
			width: 100%;
			/* background-color: #666666; */
			@@ -887,6 +972,7 @@
			flex-wrap: wrap;
			font-size: 1vw;
			}

			.item-img {
			width: 50%;
			margin-top: 5%;
			@@ -896,13 +982,14 @@
			justify-content: flex-start;
			align-items: flex-start;
			}
			.distance {

			}

			.distance {}

			.item-img image {
			height: 5vw;
			width: 5vw;
			}

			.progressBar {
			margin-top: 9%;
			/* width: 100%; */
			@@ -910,44 +997,51 @@
			background-color: #233751;
			border-radius: 5vw;
			}

			.progress {
			/* width: 90%; */
			height: 100%;
			background-color: #FF5722;
			border-radius: 5vw;
			}

			.charts-box {
			width: 80%;
			height: 24vh;
			margin-left: 10%;
			}
			width: 80%;
			height: 24vh;
			margin-left: 10%;
			}

			.charts-box-ring {
			width: 50%;
			height: 24vh;
			/* background-color: #00ffff; */
			}

			.sub-info {
			font-size: 1.5vw;
			}

			.sub-info image {
			width: 3.5vw;
			height: 3.5vw;
			}
			.red{

			.red {
			color: red
			}








			/* 共用 */
			.main {
			width: 100vw;
			height: 88vh;
			margin-top: 1vh;
			display: flex;


			}

			.mian-item {
			width: 50%;
			height: 100%;
			@@ -956,10 +1050,12 @@
			align-items: center;
			justify-content: center;
			}

			.mian-item-box {
			width: 98%;
			height: 98%;
			}

			.box-item {
			width: 100%;
			margin-top: 4%;
			@@ -968,21 +1064,24 @@
			align-items: flex-start;
			justify-content: flex-start;
			}

			.item-title {
			font-size:1.5vw;
			font-size: 1.5vw;
			font-weight: 700;
			}

			.item-subTitle {
			font-size:0.5vw;
			font-size: 0.5vw;
			text-indent: 0em;
			}

			.item-text {
			font-size: 1vw;
			text-indent: 2em;
			letter-spacing: 1px;
			line-height: 3vh;
			}


			/* 全板/拣料信息 */
			.info-view {
			width: 100vw;
			@@ -990,6 +1089,7 @@
			background-image: url(../../static/background.png);
			background-size: 100vw 100vh;
			}

			.info-main {
			width: 100vw;
			height: 88vh;
			@@ -997,10 +1097,12 @@
			justify-content: center;
			align-items: center;
			}

			.info-box {
			width: 98%;
			height: 98%;
			}

			/* 异常信息 */
			.error-info-view {
			width: 100vw;
			@@ -1008,7 +1110,7 @@
			background-image: url(../../static/background.png);
			background-size: 100vw 100vh;
			}


			/* 弹出:配置区域 */
			.eject-mask {
			width: 100%;
			@@ -1020,30 +1122,37 @@
			z-index: 999;
			display: flex;
			align-items: center;
			justify-content: center;
			justify-content: center;
			}
			.eject{

			.eject {
			position: relative;
			width: 40vw;
			height: 40vh;
			background-color: #fff;
			border-radius: 2rem;
			}

			.eject-title {
			width: 100%;
			height: 5vh;
			line-height: 6vh;
			font-size: 3vh;
			font-weight: 700;
			color: #606266;
			color: #606266;
			text-align: center;
			}

			.eject-input {
			margin-top: 2vh;
			height: 25vh;

			/* background-color: #00163E; */
			::-webkit-scrollbar{display:none}
			::-webkit-scrollbar {
			display: none
			}
			}

			.item {
			display: flex;
			align-items: center;
			@@ -1051,13 +1160,15 @@
			font-size: 1.5vw;
			color: #363636;
			}

			.desc {
			display: inline-block;
			width: 40%;
			text-align: right;
			color: #606266;


			}

			.input {
			display: flex;
			align-items: center;
			@@ -1069,13 +1180,15 @@
			margin-right: 20%;
			text-align: start;
			}

			.eject-input input {
			width: 100%;
			height: 3vh;
			font-size: 1vw;




			}

			.eject-button {
			display: flex;
			align-items: center;
			@@ -1086,6 +1199,7 @@
			width: 100%;
			border-top: 1px solid #ccc;
			}

			.button-item {
			width: 50%;
			height: 100%;
			@@ -1094,21 +1208,30 @@
			text-align: center;
			color: #909399;
			}

			.button-item:last-child {
			color: #67C23A;


			border-left: 1px solid #ccc;
			}

			.info-box-text {
			width: 100%;height: 100%;
			display: flex;flex-direction: column;align-items: center;justify-content: center;
			width: 100%;
			height: 100%;
			display: flex;
			flex-direction: column;
			align-items: center;
			justify-content: center;
			}

			.info-box-text-item {
			height: 20%;font-size: 8vh;
			height: 20%;
			font-size: 8vh;
			justify-content: center;
			white-space: pre-line;
			}
			.textred{

			.textred {
			color: red;
			}
			</style>