代码提交

This commit is contained in:
lixiaobang 2023-02-17 10:58:12 +08:00
parent 63ea2b14b2
commit d16b36bb98
3 changed files with 1246 additions and 1113 deletions

View File

@ -4,8 +4,8 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<script type="text/javascript" src="../stactic/webrtcstreamer.js"></script> <!-- <script type="text/javascript" src="../stactic/webrtcstreamer.js"></script>
<script type="text/javascript" src="../stactic/adapter.min.js"></script> <script type="text/javascript" src="../stactic/adapter.min.js"></script> -->
<script src="https://jsmpeg.com/jsmpeg.min.js" charset="utf-8"></script> <script src="https://jsmpeg.com/jsmpeg.min.js" charset="utf-8"></script>
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>yanduscreen</title> <title>yanduscreen</title>

View File

@ -12,8 +12,8 @@
</div> </div>
<div class="main"> <div class="main">
<el-tabs v-model="activeName" @tab-click="handleClick" style="height: 4%"> <el-tabs v-model="activeName" @tab-click="handleClick" style="height: 4%">
<el-tab-pane label="设备信息" name="first"> </el-tab-pane> <el-tab-pane label="设备信息" name="first" style="font-size:20px"> </el-tab-pane>
<el-tab-pane label="现场照片/红外视频" name="second"></el-tab-pane> <el-tab-pane label="现场照片/红外视频" name="second" style="font-size:20px"></el-tab-pane>
</el-tabs> </el-tabs>
<div v-if="activeName == 'first'" style="height: 100%; width: 100%"> <div v-if="activeName == 'first'" style="height: 100%; width: 100%">
<div class="basic"> <div class="basic">
@ -588,9 +588,6 @@ export default {
token: localStorage.getItem("token"), token: localStorage.getItem("token"),
}; };
if (index == 1) { if (index == 1) {
if (this.JSMpeg != null) {
this.closeJSMpeg()
}
let that = this; let that = this;
Object.keys(this.vectorgraphData).forEach((key) => { Object.keys(this.vectorgraphData).forEach((key) => {
@ -663,9 +660,6 @@ export default {
} }
}); });
} else if (index == 2) { } else if (index == 2) {
if (this.JSMpeg != null) {
this.closeJSMpeg()
}
let that = this; let that = this;
Object.keys(this.vectorgraphData).forEach((key) => { Object.keys(this.vectorgraphData).forEach((key) => {
this.vectorgraphData[ this.vectorgraphData[
@ -941,7 +935,7 @@ export default {
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.title { .title {
font-size: 22px; font-size: 28px;
font-weight: 700; font-weight: 700;
color: transparent; color: transparent;
-webkit-background-clip: text; -webkit-background-clip: text;
@ -1078,6 +1072,11 @@ export default {
} }
} }
} }
.content1{
height: 100%;
width: 100%;
overflow: hidden;
}
/deep/.el-tabs__content { /deep/.el-tabs__content {
height: 100%; height: 100%;
overflow: auto; overflow: auto;
@ -1118,9 +1117,11 @@ export default {
} }
.el-tabs__item.is-active { .el-tabs__item.is-active {
color: #56fefe !important; color: #56fefe !important;
font-size: 23px;
} }
.el-tabs__item { .el-tabs__item {
color: rgb(60, 127, 127) !important; color: rgb(60, 127, 127) !important;
font-size: 18px;
} }
.el-tabs__active-bar { .el-tabs__active-bar {

File diff suppressed because it is too large Load Diff