Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

改为24小时制显示

pull/1/head
Lawrence 2020-11-09 18:42:59 +08:00
parent 574f224767
commit 54704e1e6a
1 changed files with 325 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
web_src/src/components/control.vue
View File

@ -23,8 +23,12 @@
</div> </div>
</div> </div>
<el-row :gutter="30"> <el-row :gutter="30">
<el-col :span="12"><div class="control-table" id="ThreadsLoad">table1</div></el-col> <el-col :span="12">
<el-col :span="12"><div class="control-table" id="WorkThreadsLoad">table2</div></el-col> <div class="control-table" id="ThreadsLoad">table1</div>
</el-col>
<el-col :span="12">
<div class="control-table" id="WorkThreadsLoad">table2</div>
</el-col>
</el-row> </el-row>
<el-table :data="allSessionData" style="margin-top: 1rem;"> <el-table :data="allSessionData" style="margin-top: 1rem;">
<el-table-column prop="peer_ip" label="远端"></el-table-column> <el-table-column prop="peer_ip" label="远端"></el-table-column>
@ -48,7 +52,6 @@
</template> </template>
<script> <script>
import uiHeader from './UiHeader.vue' import uiHeader from './UiHeader.vue'
import echarts from 'echarts'; import echarts from 'echarts';
@ -110,8 +113,12 @@ export default {
url: '/zlm/index/api/getThreadsLoad' url: '/zlm/index/api/getThreadsLoad'
}).then(function (res) { }).then(function (res) {
if (res.data.code == 0) { if (res.data.code == 0) {
that.tableOption.xAxis.data.push(new Date().toLocaleTimeString()); that.tableOption.xAxis.data.push(new Date().toLocaleTimeString('chinese', {
that.table1Option.xAxis.data.push(new Date().toLocaleTimeString()); hour12: false
}));
that.table1Option.xAxis.data.push(new Date().toLocaleTimeString('chinese', {
hour12: false
}));
for (var i = 0; i < res.data.data.length; i++) { for (var i = 0; i < res.data.data.length; i++) {
if (that.tableOption.series[i] === undefined) { if (that.tableOption.series[i] === undefined) {
@ -171,13 +178,11 @@ export default {
fontSize: 15 fontSize: 15
} }
}; };
this.tableOption.dataZoom = [ this.tableOption.dataZoom = [{
{
show: true, show: true,
start: this.charZoomStart, start: this.charZoomStart,
end: this.charZoomEnd end: this.charZoomEnd
} }];
];
this.myChart = echarts.init(document.getElementById('ThreadsLoad')); this.myChart = echarts.init(document.getElementById('ThreadsLoad'));
this.myChart.setOption(this.tableOption); this.myChart.setOption(this.tableOption);
this.myChart.on('dataZoom', function (event) { this.myChart.on('dataZoom', function (event) {
@ -216,13 +221,11 @@ export default {
fontSize: 15 fontSize: 15
} }
}; };
this.table1Option.dataZoom = [ this.table1Option.dataZoom = [{
{
show: true, show: true,
start: this.charZoomStart, start: this.charZoomStart,
end: this.charZoomEnd end: this.charZoomEnd
} }];
];
this.myChart1 = echarts.init(document.getElementById('WorkThreadsLoad')); this.myChart1 = echarts.init(document.getElementById('WorkThreadsLoad'));
this.myChart1.setOption(this.table1Option); this.myChart1.setOption(this.table1Option);
this.myChart1.on('dataZoom', function (event) { this.myChart1.on('dataZoom', function (event) {
@ -327,19 +330,23 @@ export default {
#app { #app {
height: 100%; height: 100%;
} }
.control-table { .control-table {
background-color: #ffffff; background-color: #ffffff;
height: 25rem; height: 25rem;
} }
.table-c { .table-c {
border-right: 1px solid #dcdcdc; border-right: 1px solid #dcdcdc;
border-bottom: 1px solid #dcdcdc; border-bottom: 1px solid #dcdcdc;
} }
.table-c td { .table-c td {
border-left: 1px solid #dcdcdc; border-left: 1px solid #dcdcdc;
border-top: 1px solid #dcdcdc; border-top: 1px solid #dcdcdc;
padding: 0.2rem; padding: 0.2rem;
} }
.el-table { .el-table {
width: 99.9% !important; width: 99.9% !important;
} }