1

lzhe

2024-11-10 f4a21753669a30312723b4383f9ab8d74539f519

1

 src/views/mdc/station-live.vue

@@ -2,7 +2,7 @@
 * @Author: lzhe lzhe@example.com
 * @Date: 2024-03-26 10:28:33
 * @LastEditors: lzhe lzhe@example.com
 * @LastEditTime: 2024-11-10 19:35:08
 * @LastEditTime: 2024-11-10 19:56:18
 * @FilePath: /smart-web/src/views/master/person/main/index.vue
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -30,29 +30,28 @@
            <div class="dataHr"></div>
            <div class="content-zhou-box">
                <div class="zhou-one content-zhou-border">
                    <div><div id="wcs-left" style="width: 100%;height:300px;"></div></div>
                    <div><div id="wcs-left" style="width: 100%;height:340px;"></div></div>
                </div>
                <div class="zhou-two content-zhou-border">
                    <el-table :data="tableData2" style="width: 100%;height:300px;">
                    <el-table :data="tableData2" style="width: 100%;height:340px;">
                        <el-table-column prop="test" label="轴"></el-table-column>
                        <el-table-column prop="test" label="坐标"></el-table-column>
                        <el-table-column prop="test" label="扭矩"></el-table-column>
                    </el-table>
                </div>
                <div class="zhou-three content-zhou-border">
                    <el-table :data="alarmtableData" style="width: 100%;height:260px;">
                    <el-table :data="alarmtableData" style="height:300px;">
                        <el-table-column prop="alarmCode" label="报警号"></el-table-column>
                        <el-table-column prop="alarmMsg" label="报警内容"></el-table-column>
                        <el-table-column prop="alarmTime" label="报警时间"></el-table-column>
                    </el-table>
                    <el-pagination
                        style="margin-top: 6px;padding-left: 6px;padding-right: 6px;"
                        style="margin-top: 6px;padding-left: 6px;padding-right: 6px;width: 450;position:absolute;right:0;"
                        @size-change="alarmSizeChange"
                        @current-change="alarmCurrentChange"
                        :current-page="currentPage4"
                        :page-sizes="[15, 50, 100]"
                        :page-size="15"
                        layout="total, sizes, prev, pager, next, jumper"
                        layout="total, prev, pager, next"
                        :total="alarmtotal">
                    </el-pagination>
                </div>
@@ -869,6 +868,7 @@
}
.content-two,.zhou-three {
    flex: 1;
    position: relative;
}
.content-two {
    border-left: 1px solid #eee;
@@ -879,7 +879,7 @@
    width: 25%;
}
.zhou-one {
    width: 28%;
    width: 330px;
}
.zhou-two {
    width:28%;