内容修改

whychdw

2019-07-26 f7ee8e77baceb8e2f41866f25cf0fecd12d2fe61

内容修改

 src/libs/common.css

@@ -66,9 +66,21 @@
.mrt32 {
    margin-top: 32px;
}
.mrl8 {
    margin-left: 8px;
}
.mrl12 {
    margin-left: 12px;
}
.mrl16 {
    margin-left: 16px;
}
.mrr8 {
    margin-right: 8px;
}
.mrr12 {
    margin-right: 12px;
}
.mrr16 {
    margin-right: 16px;
}

 src/views/monitor/channel-select.vue

@@ -1,37 +1,41 @@
<template>
    <div class="component-container">
        <Row>
            <i-col :xl="14" :xxl="17" span="10">
                1
            </i-col>
            <i-col :xl="10" :xxl="7" span="14">
                <divider-card title="通道定义" style="margin-right:16px;">
                    <div class="card-content">
                        <div class="content-item mrt8">
                            <span class="mrr16">CH05</span>
                            <span class="mrr16">程控电源输出+</span>
                            <span class="mrr16">设定值</span>
                            <radius-input></radius-input>
                <div class="mrl12 mrr12">
                    <divider-card title="接口通道">
                        
                    </divider-card>
                    <divider-card title="通道定义">
                        <div class="card-content">
                            <div class="content-item mrt8">
                                <span class="mrr16">CH05</span>
                                <span class="mrr16">程控电源输出+</span>
                                <span class="mrr16">设定值</span>
                                <radius-input></radius-input>
                            </div>
                            <div class="content-item mrt8">
                                <span class="mrr16">CH06</span>
                                <span class="mrr16">程控电源输出-</span>
                                <span class="mrr16">设定值</span>
                                <radius-input></radius-input>
                            </div>
                        </div>
                        <div class="content-item mrt8">
                            <span class="mrr16">CH06</span>
                            <span class="mrr16">程控电源输出-</span>
                            <span class="mrr16">设定值</span>
                            <radius-input></radius-input>
                        </div>
                    </div>
                </divider-card>
                    </divider-card>
                </div>
            </i-col>
            <i-col :xl="14" :xxl="17" span="10">
                <divider-card 
                title="通道状态" 
                style="margin-right:16px;margin-top:30px;"
                maxHeight="500px" paddingBottom="8px">
                    <line-graph class="h200 bg-white"
                style="margin-right:16px;"
                maxHeight="20000px" paddingBottom="8px">
                    <line-graph class="h300 bg-white"
                    ref="channel1"
                    unit=""
                    min="0"
                    max="100"
                    title="测试折线1"></line-graph>
                    <line-graph class="h200 bg-white"
                    <line-graph class="h300 bg-white"
                    ref="channel2"
                    unit=""
                    min="0"

 src/views/monitor/info-display.vue

@@ -1,31 +1,82 @@
<template>
    <div class="component-container">
        <Row>
            <i-col :xl="14" :xxl="17" span="10">
                1
            <i-col span="12">
                <div class="mrl12 mrr12">
                    <divider-card title="通道信息">
                        <div class="card-content">
                            <div class="content-item mrt8 text-left">
                                <span class="mrr16">CH01</span>
                                <span class="mrr16">DC5V输入+</span>
                                <span class="mrr8">设定值</span>
                                <radius-input></radius-input>
                            </div>
                        </div>
                        <div class="card-content">
                            <div class="content-item mrt8 text-left">
                                <span class="mrr16">CH02</span>
                                <span class="mrr16">DC5V输入-</span>
                                <span class="mrr8">设定值</span>
                                <radius-input></radius-input>
                            </div>
                        </div>
                        <div class="card-content">
                            <div class="content-item mrt8 text-left">
                                <span class="mrr16">CH03</span>
                                <span class="mrr16">DC±15V输入+</span>
                                <span class="mrr8">设定值</span>
                                <radius-input></radius-input>
                            </div>
                        </div>
                        <div class="card-content">
                            <div class="content-item mrt8 text-left">
                                <span class="mrr16">CH04</span>
                                <span class="mrr16">DC±15V输入-</span>
                                <span class="mrr8">设定值</span>
                                <radius-input></radius-input>
                            </div>
                        </div>
                        <div class="card-content">
                            <div class="content-item mrt8 text-left">
                                <span class="mrr16">CH05</span>
                                <span class="mrr16">程控电源输出+</span>
                                <span class="mrr8">设定值</span>
                                <radius-input></radius-input>
                            </div>
                        </div>
                        <div class="card-content">
                            <div class="content-item mrt8 text-left">
                                <span class="mrr16">CH06</span>
                                <span class="mrr16">程控电源输出-</span>
                                <span class="mrr8">设定值</span>
                                <radius-input></radius-input>
                            </div>
                        </div>
                    </divider-card>
                </div>
            </i-col>
            <i-col :xl="10" :xxl="7" span="14">
            <i-col span="12">
                <divider-card title="输入数据" style="margin-right:16px;">
                    <div class="card-content">
                        <div class="content-item">
                        <div class="content-item mrt8 text-left">
                            <span class="mrr16">IN1</span>
                            <span class="mrr8">直流输入</span>
                            <radius-input></radius-input> V 
                            <radius-input></radius-input> A
                        </div>
                        <div class="content-item mrt8">
                        <div class="content-item mrt8 text-left">
                            <span class="mrr16">IN2</span>
                            <span class="mrr8">交流输入</span>
                            <radius-input></radius-input> V 
                            <radius-input></radius-input> A
                        </div>
                        <div class="content-item mrt8">
                        <div class="content-item mrt8 text-left">
                            <span class="mrr16">IN3</span>
                            <span class="mrr8">直流输入</span>
                            <radius-input></radius-input> V 
                            <radius-input></radius-input> A
                        </div>
                        <div class="content-item mrt8">
                        <div class="content-item mrt8 text-left">
                            <span class="mrr16">IN4</span>
                            <span class="mrr8">直流输入</span>
                            <radius-input></radius-input> V 
@@ -35,25 +86,25 @@
                </divider-card>
                <divider-card title="输出数据" style="margin-right:16px;margin-top:30px;">
                    <div class="card-content">
                        <div class="content-item">
                        <div class="content-item text-left">
                            <span class="mrr16">OUT1</span>
                            <span class="mrr8">直流输入</span>
                            <radius-input></radius-input> V 
                            <radius-input></radius-input> A
                        </div>
                        <div class="content-item mrt8">
                        <div class="content-item mrt8 text-left">
                            <span class="mrr16">OUT2</span>
                            <span class="mrr8">交流输入</span>
                            <radius-input></radius-input> V 
                            <radius-input></radius-input> A
                        </div>
                        <div class="content-item mrt8">
                        <div class="content-item mrt8 text-left">
                            <span class="mrr16">OUT3</span>
                            <span class="mrr8">直流输入</span>
                            <radius-input></radius-input> V 
                            <radius-input></radius-input> A
                        </div>
                        <div class="content-item mrt8">
                        <div class="content-item mrt8 text-left">
                            <span class="mrr16">OUT4</span>
                            <span class="mrr8">直流输入</span>
                            <radius-input></radius-input> V 
@@ -63,27 +114,27 @@
                </divider-card>
                <divider-card title="采集数据" style="margin-right:16px;margin-top:30px;">
                    <div class="card-content">
                        <div class="content-item">
                        <div class="content-item text-left">
                            <span class="mrr16">sens1</span>
                            <span class="mrr8">电压量</span>
                            <span class="hidden">占</span>
                            <radius-input></radius-input> V 
                            <radius-input></radius-input> A
                        </div>
                        <div class="content-item mrt8">
                        <div class="content-item mrt8 text-left">
                            <span class="mrr16">sens2</span>
                            <span class="mrr8">开关量</span>
                            <span class="hidden">占</span>
                            <radius-input></radius-input> V 
                            <radius-input></radius-input> A
                        </div>
                        <div class="content-item mrt8">
                        <div class="content-item mrt8 text-left">
                            <span class="mrr16">sens3</span>
                            <span class="mrr8">信号波形</span>
                            <radius-input></radius-input> V 
                            <radius-input></radius-input> A
                        </div>
                        <div class="content-item mrt8">
                        <div class="content-item mrt8 text-left">
                            <span class="mrr16">sens4</span>
                            <span class="mrr8">通信</span>
                            <span class="hidden">占位</span>
@@ -111,4 +162,7 @@
        font-size: 16px;
        text-align: center;
    }
    .card-content .content-item.text-left {
        text-align: left;
    }
</style>