提交合并

lishifeng

2020-08-25 0bbb5cc581f46ce424d8d083d6578140715c96ba

提交合并

 src/assets/css/theme/science-blue.css

@@ -91,4 +91,23 @@
    background-color: #00638D;
    border-color: #3ebdc9;
    color: #FFFFFF;
}

/* table */
.el-science-blue .el-table  {
    color: #FFFFFF;
}
.el-science-blue .el-table, 
.el-science-blue .el-table__expanded-cell,
.el-science-blue .el-table tr {
    background: none;
}
.el-science-blue .el-table th{
    background-image: linear-gradient(#62b0fa, #3497f3, #1660B9);
}
.el-science-blue .el-table thead {
    color: #FFFFFF;
}
.el-science-blue .el-table--enable-row-hover .el-table__body tr:hover>td {
    background-color: #5489bb;
}

 src/pages/dataTest/history.vue

@@ -96,71 +96,12 @@
    data() {
        return {
            battFullName: '电池组全称',
            data: [
                {
                    id: '湖北省',
                    label: '湖北省',
                    children: [
                        {
                            id: '湖北省-武汉市',
                            label: '武汉市',
                            children: [
                                {
                                    id: '湖北省-武汉市-东西湖区',
                                    label: '东西湖区',
                                    children: [
                                        {
                                            id: '湖北省-武汉市-东西湖区-测试机房',
                                            label: '测试机房',
                                        }
                                    ]
                                },
                            ]
                        }
                    ]
                },
                {
                    id: '河南省',
                    label: '河南省',
                    children: [
                        {
                            id: '河南省-驻马店市',
                            label: '驻马店市',
                            children: [
                                {
                                    id: '河南省-驻马店市-驿城区',
                                    label: '驿城区',
                                    children: [
                                        {
                                            id: '河南省-驻马店市-驿城区-测试机房',
                                            label: '测试机房',
                                            children: []
                                        }
                                    ]
                                },
                            ]
                        }
                    ]
                }
            ],
            data: [],
            list: [
                {
                    value: 'herongDischarge',
                    label: '核容放电',
                    children: [
                        {
                            value: "2020-02-02 00:00:00",
                            label: "2020-02-02 00:00:00"
                        },
                        {
                            value: "2020-02-02 00:10:00",
                            label: "2020-02-02 00:10:00"
                        },
                        {
                            value: "2020-02-02 00:20:00",
                            label: "2020-02-02 00:20:00"
                        }
                    ]
                    children: []
                },
                {
                    value: 'herongCharge',

 src/pages/dataTest/realTime.vue

@@ -72,7 +72,14 @@
                            <bar-chart ref="curr" id="curr"></bar-chart>
                        </el-tab-pane>
                        <el-tab-pane label="数据表格" name="tblData">
                            数据表格
                            <el-table border size="small" :data="table.data" height="100%">
                                <el-table-column
                                v-for="header in table.headers" :key="header.prop"
                                :prop="header.prop"
                                :label="header.label"
                                :width="header.width"
                                align="center"></el-table-column>
                            </el-table>
                        </el-tab-pane>
                    </el-tabs>
                </div>
@@ -97,7 +104,46 @@
        return {
            battFullName: '电池组全称',
            acTabs: 'vol',
            data: []
            data: [],
            table: {
                headers: [
                    {
                        prop: 'num1',
                        label: '单体编号',
                        width: '',
                    },
                    {
                        prop: 'vol1',
                        label: '电压(V)',
                        width: '',
                    },
                    {
                        prop: 'res1',
                        label: '内阻(mΩ)',
                        width: '',
                    },
                    {
                        prop: 'temp1',
                        label: '温度(℃)',
                        width: '',
                    },
                    {
                        prop: 'conduct1',
                        label: '电导',
                        width: '',
                    },
                    {
                        prop: 'curr1',
                        label: '均衡电流',
                        width: '',
                    },
                ],
                data: [
                    {
                        num1: '#1',
                    },
                ]
            }
        }
    },
    methods: {