#

zjj

3 天以前 a08153a89ec03508ed964fe8ca6847942532d485

 Monitor-APP/pages/home/home.vue

@@ -30,8 +30,12 @@
                              
                                 <view style="width: 100%;display: flex;" v-for="(item,i) in locList" :key="i">
                                    
                                    <view style="display: flex; justify-content: center;align-items: center;width: 48%; font-size: 1.3vw;">物料码: {{item.matnr}}</view>
                                    <view style="display: flex; justify-content: center;align-items: center;width: 48%; font-size: 1.3vw;">数量: {{item.matnrCount}}</view>
                                 <view
                                    style="display: flex; justify-content: center;align-items: center;width: 48%; font-size: 1.3vw;">
                                    物料码: {{item.matnr}}</view>
                                 <view
                                    style="display: flex; justify-content: center;align-items: center;width: 48%; font-size: 1.3vw;">
                                    数量: {{item.matnrCount}}</view>
                                    
                                    
                                    
@@ -44,14 +48,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">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> -->
@@ -59,13 +65,16 @@
                              </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>
@@ -81,14 +90,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> -->
@@ -96,7 +107,8 @@
                                    </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>
@@ -112,14 +124,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">INCOME DATE</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;">
                                          <text class="item-title">今天</text> 
                                          <text class="item-subTitle">Today</text>
                                       </view>
@@ -128,24 +142,32 @@
                                 <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>
@@ -154,12 +176,14 @@
                           </y-box>
                        </view>
                        <view style="height: 2%;"></view>
                        <view style="height: 18%;display: flex;justify-content: space-around;align-items: center;">
                        <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>
                              <image style="height: 100%;" src="../../static/img/logo-bai.png"
                                 mode="aspectFit"></image>
                           </view>
                        </view>
                     </view>
@@ -199,8 +223,7 @@
                           circular 是否采用衔接滑动，即播放到末尾后重新回到开头
                           vertical 滑动方向是否为纵向 
                           display-multiple-items 同时显示的滑块数量 -->
                           <swiper class="swiper-body-main" vertical="true" 
                           display-multiple-items="1"
                           <swiper class="swiper-body-main" vertical="true" display-multiple-items="1"
                           circular="true" :autoplay="true" :interval="3000" :duration="2000">
                              <swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
                                 <view style="width: 100%;">{{i+1}} / {{swiperList.length}}</view>
@@ -316,7 +339,9 @@
<script>
   import demodata from '@/mockdata/demodata.json';
   import ycqdata from '@/pages/index/data.json';
   import {WebSocketClient} from "@/static/js/WebSocketClient"	
   import {
      WebSocketClient
   } from "@/static/js/WebSocketClient"
   import WebSocketUtil from './uniWebSocket';
   let socket;
   export default {
@@ -394,7 +419,9 @@
            filename: '',
            dialogContent: '',
            wmsUrl:'',
            wmsPort:''
            wmsPort: '',
            switchDebounceTimer: null,
            viewSwitchInProgress: false
            
         }
      },
@@ -483,22 +510,9 @@
            if (this.oldData && this.oldData.length > 100) {
               this.oldData = [];
            }
         }, 3000*10); // 每小时执行一次
         
         // 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)
         }, 30000 * 10); // 每小时执行一次
            
         // },1000*30)
      },
      methods: {
         uniWebSocket(){
@@ -549,52 +563,7 @@
                // 建立连接
                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"){
@@ -606,11 +575,14 @@
               that.baseInfo.usedPr = data.usedPr
               
               that.chartsData.Line.categories = [
                  that.getDateFormat(-11),that.getDateFormat(-10),that.getDateFormat(-9),that.getDateFormat(-8),
                  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(-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.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
@@ -690,6 +662,14 @@
               }
            })
         },
         getDateFormat(value) {
            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
            return newDate
         },
         getUrl() {
            this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl            
         },
@@ -697,246 +677,70 @@
            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
            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
            let result = ycqdata.dataError2
            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.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
            }
         },
         getInfo() {
            let that = this
            uni.request({
               url: that.commonUrl + "/monitor/led",
               method:"GET",
               data: {ledId:that.baseLedId},
               success(result) {
                  that.timeOut = false
                  that.times = 0
                  var   res = result.data
                  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
               }
            })
				
         },
         getError() {
            let that = this
            uni.request({
               url: that.commonUrl + "/monitor/led/error",
               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
                     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
                  }
               },
               fail(err) {
                  that.timeOut = true
                  that.infoType = 0
               }
            })
				
         },
         // 控制器
         controller() {
            switch(this.infoType) {
               // 有信息 但 没有错误信息
               case 0: 
                  if (this.errorInfoViewShow) {
            // 防抖处理，避免频繁切换
            if (this.switchDebounceTimer) {
               clearTimeout(this.switchDebounceTimer)
            }

            this.switchDebounceTimer = setTimeout(() => {
               this.performViewSwitch()
            }, 100)
         },

         performViewSwitch() {
            // 使用状态机模式简化视图切换
            const viewStates = {
               0: () => this.showHomeView(),
               1: () => this.showInfoView(),
               2: () => this.showErrorView(),
               3: () => this.showErrorView()
            }

            const switchAction = viewStates[this.infoType]
            if (switchAction && !this.viewSwitchInProgress) {
               this.viewSwitchInProgress = true
               switchAction()

               // 统一的切换完成处理
               setTimeout(() => {
                  this.viewSwitchInProgress = false
               }, this.duration + 100)
            }
         },

         showHomeView() {
            this.infoViewShow = false
                     this.errorInfoViewShow = false
            this.infoMode = ['fade', 'slide-bottom']
                     this.errorInfoMode = ['fade', 'slide-bottom']
                     setTimeout(()=>{
                        this.homeViewShow = true
                        this.homeMode = ['fade', 'slide-bottom']
                     },1000)
                  } else if (this.infoViewShow) {
                     this.infoViewShow = false
                     this.infoMode = ['fade', 'slide-bottom']
                     setTimeout(()=>{
                        this.homeViewShow = true
                        this.homeMode = ['fade', 'slide-bottom']
                     },1000)
                  } else if (this.errorInfoViewShow && this.infoViewShow) {
                     this.errorInfoViewShow = false
                     this.infoViewShow = false
                     this.infoMode = ['fade', 'slide-bottom']
                     setTimeout(()=>{
                        this.homeViewShow = true
                        this.homeMode = ['fade', 'slide-bottom']
                     },1000)
                  }
                  return;
               case 1: 
                  if (this.homeViewShow) {
            }, this.duration)
         },

         showInfoView() {
                     this.homeViewShow = false
                     this.homeMode = ['fade', 'slide-bottom']
                     setTimeout(()=>{
                        this.infoViewShow = true
                        this.infoMode = ['fade', 'slide-bottom']
                     },1000)
                  } else if (this.errorInfoViewShow) {
                     this.errorInfoViewShow = false
            this.homeMode = ['fade', 'slide-bottom']
                     this.errorInfoMode = ['fade', 'slide-bottom']
                     setTimeout(()=>{
                        this.infoViewShow = true
                        this.infoMode = ['fade', 'slide-bottom']
                     },1000)
                  }
            }, this.duration)
         },
                  
                  return;
                  // 有信息 且 有错误信息
               case 2:
                  if (this.homeViewShow) {
         showErrorView() {
                     this.homeViewShow = false
                     this.homeMode = ['fade', 'slide-bottom']
                     setTimeout(()=>{
                        this.errorInfoViewShow = true
                        this.errorInfoMode = ['fade', 'slide-bottom']
                     },1000)
                  } else if (this.infoViewShow) {
                     this.infoViewShow = false
            this.homeMode = ['fade', 'slide-bottom']
                     this.infoMode = ['fade', 'slide-bottom']
                     setTimeout(()=>{
                        this.errorInfoViewShow = true
                        this.errorInfoMode = ['fade', 'slide-bottom']
                     },1000)
                  }
                  return;
               // 有信息 且 有错误信息
               case 3:
                  if (this.homeViewShow) {
                     this.homeViewShow = false
                     this.homeMode = ['fade', 'slide-bottom']
                     setTimeout(()=>{
                        this.errorInfoViewShow = true
                        this.errorInfoMode = ['fade', 'slide-bottom']
                     },1000)
                  } else if (this.infoViewShow) {
                     this.infoViewShow = false
                     this.infoMode = ['fade', 'slide-bottom']
                     setTimeout(()=>{
                        this.errorInfoViewShow = true
                        this.errorInfoMode = ['fade', 'slide-bottom']
                     },1000)
                  }
                  return;
					
            }
				
            }, this.duration)
         },
         // 主屏幕
         handle(type) {
@@ -972,106 +776,6 @@
            uni.setStorageSync('wmsPort',this.wmsPort);
            this.getUrl()
            this.ejectShow = false
         },
         // 日历 服务器
         getDate2() {
            let that = this
            uni.request({
               url: that.commonUrl + "/monitor/date",
               method:"GET",
               success(result) {
                  var res = result.data.data
						
               }
            })
         },
			
         // 日历
         getDate() {
            var dt = new Date();
            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();
            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(); 
            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 = "星期六";
            }
            this.calendar = year + "年" + month + "月" + day + "日 " + hours + ":" + minutes + ":" + seconds + " " + weeks
         },
         getDateFormat(value) {
            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
            return newDate
         },
         /*************** 折线图 *****************************************************************************************************/
         initlineChart() {
            let that = this
            uni.request({
               url: that.commonUrl + "/monitor/line/charts",
               method:'GET',
               success(result) {
                  var res = result.data
                  if (res.code === 200) {
							
                  }
               }
            })
         },
         /*************** 饼图 *****************************************************************************************************/
         initPieChart() {
            let that = this
            uni.request({
               url: that.commonUrl + "/monitor/loc/rep",
               method:'GET',
               success(result) {
                  var res = result.data
                  if (res.code === 200) {
                     that.chartsData.Pie.series[0].data = res.data.pie
                     that.baseInfo.stockCount = res.data.stockCunt
                     that.baseInfo.emptyCount = res.data.emptyCount
                     that.baseInfo.noneCount = res.data.noneCount
                     that.baseInfo.used = res.data.used
                     that.baseInfo.usedPr = res.data.usedPr
                  }
               }
            })
         },
         getOther() {
            let that = this
            uni.request({
               url: that.commonUrl + "/monitor/other",
               data: {
                  crnId: that.baseCrnId, 
                  ledId: that.baseLedId,
               },
               success(result) {
                  // console.log(result);
                  var res = result.data
                  if (res.code === 200) {
                     that.baseInfo.xDistance = res.data.xDistance
                     that.baseInfo.yDistance = res.data.yDistance
                     that.baseInfo.xDuration = res.data.xDuration
                     that.baseInfo.yDuration = res.data.yDuration
                  } else if (res.code === 403) {
							
                  } else {
							
                  }
               }
            })
         },
         //检测当前平台，如果是安卓则启动安卓更新
         getVersion() {
@@ -1202,11 +906,13 @@
<style>
   /* @import url("../../static/css/common.css"); */
   @import url("home.css");

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

   /* 行 */
   .flex-row {
      display: flex;
@@ -1221,6 +927,7 @@
      text-align: center;
      
   }

   /* 主视图 */
   .home-view {
      width: 100vw;
@@ -1228,15 +935,18 @@
      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;
@@ -1247,6 +957,7 @@
      justify-content: center;
      transform: scale(0.7);
   }

   .time-tools {
      position: absolute;
      right: 2%;
@@ -1254,6 +965,7 @@
      font-size:1vw;
      transform: scale(0.8);
   }

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

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

   .img-box {
      height: 23vw;
      width: 100%;
@@ -1283,6 +997,7 @@
      flex-wrap: wrap;
      font-size: 1vw;
   }

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

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

   .progressBar {
      margin-top: 9%;
      /* width: 100%; */
@@ -1306,25 +1022,30 @@
      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%;
   } 

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

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

   .sub-info image {
      width: 3.5vw;
      height: 3.5vw;
@@ -1341,6 +1062,7 @@
      display: flex;
      
   }

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

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

   .box-item {
      width: 100%;
      margin-top: 4%;
@@ -1361,10 +1085,12 @@
      align-items: flex-start;
      justify-content: flex-start;
   }

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

   .version{
      position: absolute;
      left: 1%;
@@ -1372,10 +1098,12 @@
      font-size:1vw;
      transform: scale(0.8);
   }

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

   .item-text {
      font-size: 1vw;
      text-indent: 2em;
@@ -1390,6 +1118,7 @@
      background-image: url(../../static/background.png);
      background-size: 100vw 100vh;
   }

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

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

   /* 异常信息 */
   .error-info-view {
      width: 100vw;
@@ -1422,6 +1153,7 @@
      align-items: center;
      justify-content: center;   
   }

   .eject{
      position: relative;
      width: 45vw;
@@ -1429,6 +1161,7 @@
      background-color: #fff;
      border-radius: 2rem;
   }

   .eject-title {
      width: 100%;
      height: 5vh;
@@ -1438,12 +1171,17 @@
      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;
@@ -1451,6 +1189,7 @@
      font-size: 1.5vw;
      color: #363636;
   }

   .desc {
      display: inline-block;
      width: 40%;
@@ -1458,6 +1197,7 @@
      color: #606266;
      
   }

   .input {
      display: flex;
      align-items: center;
@@ -1469,6 +1209,7 @@
      margin-right: 20%;
      text-align: start;
   }

   .eject-input input {
      width: 100%;
      height: 3vh;
@@ -1476,6 +1217,7 @@
      
      
   }

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

   .button-item {
      width: 50%;
      height: 100%;
@@ -1494,17 +1237,25 @@
      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;
   }
</style>