Merge branch 'xiaomi_tv' of http://47.97.1.152:5880/r/private into xiaomi_tv

whycq

2023-12-19 b7624700808dbf7922726e67375e9dd2979d61fa

Merge branch 'xiaomi_tv' of http://47.97.1.152:5880/r/private into xiaomi_tv

# Conflicts:
#	Monitor-APP/pages/home/home.vue

 Monitor-APP/pages/home/home.vue

@@ -1,4 +1,5 @@
<template>
<<<<<<< HEAD
    <view class="container">
        <!-- 宁波捷丰项目 -->
        <uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
@@ -317,9 +318,294 @@
            </view>
        </view>
    </view>
=======
    <view class="container">
        <!-- 宁波捷丰项目 -->
        <uni-transition :duration="duration" :mode-class="homeMode" :show="homeViewShow">
            <view class="home-view">
                <view class="head">
                    <text>自动仓库WCS监控平台</text>
                </view>
                <!-- 日历 -->
                <view class="time-tools">{{calendar}}</view>
                <view class="button-left" @click="ejected()"></view>
                <view class="button-right" @click="ejected()"></view>
                <!-- 主视图 -->
                <view class="main">
                    <view class="mian-item">
                        <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>
                                <view class="box-item">
                                    <text class="item-title">仓库数据</text>
                                    <text class="item-subTitle">warehouse data</text>
                                    <view style="width: 100%;">
                                        <table style="width: 100%;font-size:1vw;">
                                            <tr><th>排名</th><th>料号</th><th>名称</th><th>数量</th></tr>
                                            <tr v-for="(item,i) in tableList" :key="i">
                                                <td>top {{i+1}}</td>
                                                <td>{{item.matnr}}</td>
                                                <td>{{item.maktx}}</td>
                                                <td>{{item.anfme}}</td>
                                            </tr>
                                        </table>
                                    </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;">
                                            <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;" >
                                                <!-- 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-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>
                                    </view>
                                </view>
                            </y-box>
                        </view>
                    </view>
                    <view class="mian-item">
                        <view class="mian-item-box">
                            <view style="width: 100%;height: 100%;">
                                <view style="height: 35%;">
                                    <!-- 折线图 -->
                                    <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;">
                                                    <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;" >
                                                        <!-- style="justify-content: flex-end;position: absolute;top: 0;right: 1vw;text-align: right;" -->
                                                        <text class="item-title">{{pakin}} / {{pikout}}</text>
                                                        <text class="item-subTitle">今日入/出数</text>
                                                    </view>
                                                </view>
                                            </view>
                                            <view class="charts-box">
                                                <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;">
                                                    <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> 
                                                        <text class="item-subTitle">Today</text>
                                                    </view>
                                                </view>
                                            </view>
                                            <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"/>
                                                </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;font-family: DS-DIGI-1;">{{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;font-family: DS-DIGI-1;">{{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;font-family: DS-DIGI-1;">{{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;">
                                            <!-- 嘉善边锋机械股份有限公司 -->
                                            自动仓库WCS监控平台
                                            <!-- <image src="../../static/ruiyun.jpg" mode="" style="width: 100%;"></image> -->
                                        </view>
                                    </y-box>
                                </view>
                            </view>
                        </view>
                    </view>
                </view>
				
            </view>
        </uni-transition>
        <!-- 全板/拣料信息 -->
        <uni-transition :duration="duration" :mode-class="infoMode" :show="infoViewShow">
            <view class="home-view">
                <view class="head">
                    <text>{{infoText.title}}</text>
                </view>
                <!-- 日历 -->
                <view class="time-tools">{{calendar}}</view>
                <view class="button-left" @click="ejected()"></view>
                <view class="button-right" @click="ejected()"></view>
                <!-- 主体 -->
                <view class="info-main">
                    <view class="info-box">
                        <y-box>
                            <!-- 文本容器 -->
                            <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>
                                <!-- 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-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.matnr}}</view>
                                            <view style="width: 20%;">{{item.maknx}}</view>
                                            <view style="width: 20%;">{{item.batch}}</view>
                                            <view style="width: 10%;">{{item.count}}</view>
                                        </swiper-item>
                                    </swiper>
                                </view>
                            </view>
                        </y-box>
                    </view>
                </view>
            </view>
        </uni-transition>
        <!-- 异常信息 -->
        <uni-transition :duration="duration" :mode-class="errorInfoMode" :show="errorInfoViewShow">
            <view class="error-info-view">
                <view class="head">
                    <text>{{infoText.title}}</text>
                </view>
                <!-- 日历 -->
                <view class="time-tools">{{calendar}}</view>
                <view class="button-left"></view>
                <view class="button-right"></view>
                <!-- 主体 -->
                <view class="info-main" >
                    <view class="info-box">
                        <y-box>
                            <view class="info-box-text">
                                <view class="flex-col info-box-text-item">{{infoText.error}}</view>
                            </view>
                        </y-box>
                    </view>
                </view>
            </view>
        </uni-transition>
		
        <!-- 自定义弹出层 -->
        <view class="eject-mask" v-show="ejectShow">
            <view class="eject">
                <!-- 弹出title -->
                <view class="eject-title">修改 / 配置</view>
                <!-- input -->
                <view class="eject-input">
                    <view class="item">
                        <view class="desc">ip：</view>
                        <view class="input">
                            <input type="text" v-model="baseIP">
                        </view>
                    </view>
                    <view class="item">
                        <view class="desc">port：</view>
                        <view class="input">
                            <input type="text" v-model="basePort">
                        </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>
                </view>
                <!-- button -->
                <view class="eject-button">
                    <view class="button-item" @click="ejectClose">取 消</view>
                    <view class="button-item" @click="ejectConfirm">确 认</view>
                </view>
            </view>
        </view>
    </view>
>>>>>>> 226c96ebc10302ce7ff5b14287bf46018728a7d7
</template>
 
<script>
<<<<<<< HEAD
    import demodata from '@/mockdata/demodata.json';
    import ycqdata from '@/pages/index/data.json';
    export default {
@@ -404,10 +690,102 @@
            that.baseCrnId = BaseCrnId
            this.getUrl()
            setTimeout(()=>{
=======
    import demodata from '@/mockdata/demodata.json';
    import ycqdata from '@/pages/index/data.json';
    export default {
        data() {
            return {
                series: [],
                homeViewShow: true,
                infoViewShow: false    ,
                errorInfoViewShow: false,
                homeMode: [],
                infoMode: [],
                errorInfoMode: [],
                baseInfo: {
                    xDistance: 1,
                    yDistance: 2,
                    xDuration: 3,
                    yDuration: 4,
                    usedPr: 50,
                    used: 3537,
                    stockCount: '',
                    emptyCount: '',
                    noneCount: '',
                },
                chartsData: {
                    "Line": {
                        "categories": [],
                        "series": []
                    },
                    "Pie": {
                        "series": [{
                            "data": []
                        }]
                    },
                },
                duration: 1000,
                calendar: '',
                ringOpts:{},
                chartsDataLine1: {},
                chartsDataPie2: {},
                fontSize: '',
                height: '',
                showCharts: false,
                ejectShow: false,
                baseIP: '',
                basePort: '',
                baseLedId: '',
                baseCrnId: '',
                baseUrl: '',
                info: null,
                error: null,
                infoType: 0,
                text: '',
                infoText: {
                    title: '',
                    staNo: "",
                    matnr: "",
                    maknx: "",
                    batch: "",
                    count: "",
                    error: ""
                },
                swiperList: [],
                tableList: [],
                pakin: 10,
                pikout: 20,
            }
        },
        onShow() {
            // 隐藏时间,电量,信号等
            // #ifdef APP-PLUS
            plus.navigator.setFullscreen(true)
            // #endif
        },
        mounted() {
            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
            // this.getUrl()
        },
        onLoad() {
            setInterval(()=>{
>>>>>>> 226c96ebc10302ce7ff5b14287bf46018728a7d7
                this.getServerData()
                this.initlineChart()
                this.initPieChart()
                this.getOther()
<<<<<<< HEAD
                setTimeout(()=>{
                    this.getServerData()
                    this.initlineChart()
@@ -427,11 +805,19 @@
                this.getServerData()
                this.getDate2()
                this.getUrl()
=======
                this.getDate2()
>>>>>>> 226c96ebc10302ce7ff5b14287bf46018728a7d7
                this.getInfo()
                this.getError()
                // this.getInfo2()
                // this.getError2()
                this.controller()
<<<<<<< HEAD
=======
                // 测试用
                this.getTop()
>>>>>>> 226c96ebc10302ce7ff5b14287bf46018728a7d7
            },1000)
            
            // setInterval(()=>{
@@ -456,16 +842,244 @@
                    url: that.commonUrl + "/monitor/date",
                    method:"GET",
                    success(result) {
<<<<<<< HEAD
                        // console.log(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
=======
                        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
                        }
                    }
                })
				
            },
            // 控制器
            controller() {
                switch(this.infoType) {
                    // 有信息 但 没有错误信息
                    case 1: 
                        if (this.homeViewShow) {
                            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.errorInfoMode = ['fade', 'slide-bottom']
                            setTimeout(()=>{
                                this.infoViewShow = true
                                this.infoMode = ['fade', 'slide-bottom']
                            },1000)
                        }
						
                        return;
                        // 有信息 且 有错误信息
                    case 2:
                        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;
                    // 有信息 且 有错误信息
                    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;
                    default :
                        if (this.errorInfoViewShow) {
                            this.errorInfoViewShow = false
                            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)
                        }
                        return;
                }
				
            },
            // 主屏幕
            handle(type) {
                this.homeViewShow = !this.homeViewShow
                this.modeClass = type
            },
            // 拣料
            handle1(type) {
                this.infoViewShow = !this.infoViewShow
                this.modeClass = type
            },
            // 异常
            handle2(type) {
                this.errorInfoViewShow = !this.errorInfoViewShow
                this.modeClass = type
            },
            // 配置
            ejected () {
                this.ejectShow = true
            },
            // 取消配置
            ejectClose() {
                this.ejectShow = false
            },
            // 确认配置
            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);
                this.getUrl()
                this.ejectShow = false
            },
            // 日历
            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
            },
            // 日历 服务器
            getDate2() {
                let that = this
                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
                    }
                })
            },
            getDateFormat(value) {
                var date = new Date();// 获取当前时间
                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) {
                            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
                            that.pakin = res.data.rows[0].data[11]
                            that.pikout = res.data.rows[1].data[11]
                        }
                    }
                })
            },
            /*************** 饼图 *****************************************************************************************************/
            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,
>>>>>>> 226c96ebc10302ce7ff5b14287bf46018728a7d7
                    },
                    fail(res) {
                    }
                    
                })
            },
<<<<<<< HEAD
            getUrl() {
                this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePort + "/" +this.baseUrl
            },
@@ -798,9 +1412,25 @@
        }
        
    }
=======
            // 获取top在库
            getTop() {
                let that = this
                uni.request({
                    url: that.commonUrl + '/monitor/loc/top',
                    success(res) {
                        that.tableList = res.data.data
                    }
                })
            }
        }
		
    }
>>>>>>> 226c96ebc10302ce7ff5b14287bf46018728a7d7
</script>
 
<style>
<<<<<<< HEAD
    /* @import url("../../static/css/common.css"); */
    @import url("home.css");
    /* 列 */
@@ -1098,3 +1728,300 @@
        justify-content: center;
    }
</style>
=======
    /* @import url("../../static/css/common.css"); */
    @import url("home.css");
    @font-face {
        font-style: normal;
        font-family: DS-DIGI-1;
        src: url('../../static/font-family/DS-DIGI-1.ttf');
    }
	
    /* 列 */
    .flex-col {
        display: flex;
        flex-direction: column;
    }
    /* 行 */
    .flex-row {
        display: flex;
        flex-direction: row;
    }
	
    .container{
        width: 100vw;
        min-height: 100vh;
        background-color: #00163E;
        color: #fff;
        text-align: center;
		
    }
    /* 主视图 */
    .home-view {
        width: 100vw;
        min-height: 100vh;
        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-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-family: DS-DIGI-1;
    }
    .button-left {
        position: absolute;
        background-image: url(../../static/right.png);
        background-size: 100% 100%;
        top: 1.8%;
        left: 21.3%;
        width: 13.5%;
        height: 8.5%;
        transform: scaleX(-1);
    }
    .button-right {
        position: absolute;
        background-image: url(../../static/right.png);
        background-size: 100% 100%;
        top: 1.8%;
        left: 65%;
        width: 13.5%;
        height: 8.5%;
    }
	
    .item-img {
        width: 50%;
        margin-top: 5%;
        display: flex;
        flex-direction: row;
        /* background-color: #00ffff; */
        justify-content: flex-start;
        align-items: flex-start;
    }
    .distance {
		
    }
    .item-img image {
        height: 5vw;
        width: 5vw;
    }
    .progressBar {
        margin-top: 9%;
        /* width: 100%; */
        height: 20%;
        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: 50%;
        height: 24vh;
        /* background-color: #00ffff; */
    }
    .sub-info {
        font-size: 1.5vw;
    }
    .sub-info image {
        width: 3.5vw;
        height: 3.5vw;
    }
	
	
	
	
    /* 共用 */
    .main {
        width: 100vw;
        height: 88vh;
        margin-top: 1vh;
        display: flex;
		
    }
    .mian-item {
        width: 50%;
        height: 100%;
        display: flex;
        flex-direction: column;
        align-items: center;
        justify-content: center;
    }
    .mian-item-box {
        width: 98%;
        height: 98%;
    }
    .box-item {
        width: 100%;
        margin-top: 4%;
        display: flex;
        flex-direction: column;
        align-items: flex-start;
        justify-content: flex-start;
    }
    .item-title {
        font-size:1.5vw;
        font-weight: 700;
    }
    .item-subTitle {
        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;
        min-height: 100vh;
        background-image: url(../../static/background.png);
        background-size: 100vw 100vh;
    }
    .info-main {
        width: 100vw;
        height: 88vh;
        display: flex;
        justify-content: center;
        align-items: center;
    }
    .info-box {
        width: 98%;
        height: 98%;
    }
    /* 异常信息 */
    .error-info-view {
        width: 100vw;
        min-height: 100vh;
        background-image: url(../../static/background.png);
        background-size: 100vw 100vh;
    }
	
    /* 弹出:配置区域 */
    .eject-mask {
        width: 100%;
        height: 100%;
        background-color: rgba(0, 0, 0, 0.5);
        position: fixed;
        top: 0;
        left: 0;
        z-index: 999;
        display: flex;
        align-items: center;
        justify-content: center;	
    }
    .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;
        text-align: center;
    }
    .eject-input {
		
    }
    .item {
        display: flex;
        align-items: center;
        margin: 2vh 0 0 0;
        font-size: 1.5vw;
        color: #363636;
    }
    .desc {
        display: inline-block;
        width: 40%;
        text-align: right;
        color: #606266;
		
    }
    .input {
        display: flex;
        align-items: center;
        padding-left: 5px;
        padding-right: 5px;
        width: 100%;
        height: 3vh;
        border: 0.1vh solid #cfd4dc;
        margin-right: 20%;
        text-align: start;
    }
    .eject-input input {
        width: 100%;
        height: 3vh;
        font-size: 1vw;
		
		
    }
    .eject-button {
        display: flex;
        align-items: center;
        position: absolute;
        bottom: 0;
        height: 6vh;
        line-height: 6vh;
        width: 100%;
        border-top: 1px solid #ccc;
    }
    .button-item {
        width: 50%;
        height: 100%;
        font-size: 1.5vw;
        font-weight: bold;
        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;
    }
    .info-box-text-item {
        height: 20%;font-size: 8vh;
        justify-content: center;
    }
</style>
>>>>>>> 226c96ebc10302ce7ff5b14287bf46018728a7d7

 Monitor-APP/static/font-family/DS-DIGI-1.ttf

Binary files differ

 Monitor-APP/static/font-family/DS-DIGIB-2.ttf

Binary files differ

 Monitor-APP/static/font-family/DS-DIGII-3.ttf

Binary files differ

 Monitor-APP/static/font-family/DS-DIGIT-4.ttf

Binary files differ

 Monitor-APP/static/font-family/HFDigits.ttf

Binary files differ