From e8a66ef2fbfd31092d395d1ae6791ca5e00c4780 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 08 Apr 2021 09:31:54 +0800
Subject: [PATCH] avue-main样式调增
---
src/views/supervisoryConsole/map.vue | 21 +--
src/views/supervisoryConsole/data.vue | 4
src/styles/media.scss | 1
src/views/home/home.vue | 185 ++++++++++++++++++------------------
src/views/Video/video.vue | 68 +++++++------
5 files changed, 142 insertions(+), 137 deletions(-)
diff --git a/src/styles/media.scss b/src/styles/media.scss
index 2781c4c..39ce1c1 100644
--- a/src/styles/media.scss
+++ b/src/styles/media.scss
@@ -53,7 +53,6 @@
position: absolute;
left: 240px;
padding: 0;
- padding-bottom: 20px;
width: calc(100% - 240px);
height: calc(100% - 64px);
box-sizing: border-box;
diff --git a/src/views/Video/video.vue b/src/views/Video/video.vue
index eab9c5a..5d79289 100644
--- a/src/views/Video/video.vue
+++ b/src/views/Video/video.vue
@@ -1,41 +1,47 @@
<template>
- <iframe v-show="iframeState" id="show-iframe" frameborder=0 name="showHere" scrolling=auto
- v-bind:src="reportUrl"></iframe>
+ <iframe
+ v-show="iframeState"
+ id="show-iframe"
+ frameborder="0"
+ name="showHere"
+ scrolling="auto"
+ v-bind:src="reportUrl"
+ ></iframe>
</template>
<script>
- export default {
- name: "tcgl.vue",
- created() {
- this.getData();
+export default {
+ name: "tcgl.vue",
+ created() {
+ this.getData();
+ },
+ data() {
+ return {
+ reportUrl: "",
+ channelNumber: null,
+ serialNumber: null,
+ };
+ },
+ methods: {
+ getData() {
+ this.reportUrl =
+ "./realVideo/realtime-view-videos.html?channelNumber=" +
+ this.$route.query.channelNumber +
+ "&serialNumber=" +
+ this.$route.query.serialNumber;
},
- data() {
- return {
- reportUrl: '',
- channelNumber: null,
- serialNumber: null
- }
- },
- methods: {
- getData() {
- this.reportUrl = "./realVideo/realtime-view-videos.html?channelNumber="
- + this.$route.query.channelNumber
- + "&serialNumber=" + this.$route.query.serialNumber;
- }
- }
- }
+ },
+};
</script>
<style>
+#show-iframe {
+ display: block !important;
+ height: 95%;
+}
- #show-iframe {
- display: block !important;
- height: 95%;
-
- }
-
- .avue-main .avue-view {
- height: 100%;
- padding: 0px 5px !important;
- }
+.avue-main .avue-view {
+ height: calc(100%);
+ padding: 5px 5px !important;
+}
</style>
diff --git a/src/views/home/home.vue b/src/views/home/home.vue
index 15cf62a..aa828a5 100644
--- a/src/views/home/home.vue
+++ b/src/views/home/home.vue
@@ -7,106 +7,109 @@
* @LastEditTime: 2021-03-18 10:37:42
-->
<template>
- <iframe v-show="iframeState" id="show-iframe" frameborder=0 name="showHere" scrolling=auto
- src="https://web.byisf.com/bigScreen/view/1349193280059879426"></iframe>
+ <iframe
+ v-show="iframeState"
+ id="show-iframe"
+ frameborder="0"
+ name="showHere"
+ scrolling="auto"
+ src="https://web.byisf.com/bigScreen/view/1349193280059879426"
+ ></iframe>
</template>
<script>
- export default {
- name: "tcgl.vue",
- created() {
- //this.getData();
+export default {
+ name: "tcgl.vue",
+ created() {
+ //this.getData();
+ },
+ data() {
+ return {
+ dialogTableVisible: false,
+ form: {},
+ };
+ },
+ mounted() {
+ window.handleStartAnimalHeat = this.handleStartAnimalHeat;
+ window.handleStartHealthcode = this.handleStartHealthcode;
+ window.handleStartAlarm = this.handleStartAlarm;
+ window.handleStartEquipment = this.handleStartEquipment;
+ window.handleStartSuser = this.handleStartSuser;
+ window.handleStartParcel = this.handleStartParcel;
+ window.handleStartParcelKind = this.handleStartParcelKind;
+ },
+ methods: {
+ //体温监测分页数据
+ handleStartAnimalHeat(data) {
+ this.$router.push({
+ path: `/animalHeat/animalHeatPage`,
+ query: data[0],
+ });
},
- data() {
- return {
- dialogTableVisible:false,
- form: {},
- }
+ //健康码分页数据
+ handleStartHealthcode(data) {
+ this.$router.push({
+ path: `/healthcode/healthcodePage`,
+ query: data[0],
+ });
},
- mounted() {
- window.handleStartAnimalHeat = this.handleStartAnimalHeat;
- window.handleStartHealthcode = this.handleStartHealthcode;
- window.handleStartAlarm = this.handleStartAlarm;
- window.handleStartEquipment = this.handleStartEquipment;
- window.handleStartSuser=this.handleStartSuser;
- window.handleStartParcel=this.handleStartParcel;
- window.handleStartParcelKind=this.handleStartParcelKind;
+ //主动报警（一键求助，电话报警）分页数据
+ handleStartAlarm(data) {
+ this.$router.push({
+ path: `/realTimePolice/index`,
+ query: data[0],
+ });
},
- methods: {
- //体温监测分页数据
- handleStartAnimalHeat(data) {
- this.$router.push({
- path: `/animalHeat/animalHeatPage`,
- query: data[0]
- });
- },
- //健康码分页数据
- handleStartHealthcode(data){
- this.$router.push({
- path: `/healthcode/healthcodePage`,
- query: data[0]
- });
- },
- //主动报警（一键求助，电话报警）分页数据
- handleStartAlarm(data){
- this.$router.push({
- path: `/realTimePolice/index`,
- query: data[0]
- });
- },
- //在线设备分页数据
- handleStartEquipment(data){
- this.$router.push({
- path: `/clientManagement/index`,
- query: data[0]
- });
- },
- //客户管理分页数据
- handleStartSuser(){
- this.$router.push({
- path: `/suser/index`
- });
- },
- //包裹分页数据
- handleStartParcel(data){
- debugger;
- this.$router.push({
- path: `/parcel/index`,
- query: data[0]
- });
- },
- //违禁品分页数据
- handleStartParcelKind(data){
- this.$router.push({
- path: `/parcelKind/index`,
- query: data[0]
- });
- }
+ //在线设备分页数据
+ handleStartEquipment(data) {
+ this.$router.push({
+ path: `/clientManagement/index`,
+ query: data[0],
+ });
+ },
+ //客户管理分页数据
+ handleStartSuser() {
+ this.$router.push({
+ path: `/suser/index`,
+ });
+ },
+ //包裹分页数据
+ handleStartParcel(data) {
+ debugger;
+ this.$router.push({
+ path: `/parcel/index`,
+ query: data[0],
+ });
+ },
+ //违禁品分页数据
+ handleStartParcelKind(data) {
+ this.$router.push({
+ path: `/parcelKind/index`,
+ query: data[0],
+ });
+ },
- // getData() {
- // var that = this;
- //
- // window.clearTimeout(window.realTimeQuery);
- //
- // window.realTimeQuery = setInterval(function () {
- // //that.dialogTableVisible = true;
- // }, 3000);
- // }
- }
- }
+ // getData() {
+ // var that = this;
+ //
+ // window.clearTimeout(window.realTimeQuery);
+ //
+ // window.realTimeQuery = setInterval(function () {
+ // //that.dialogTableVisible = true;
+ // }, 3000);
+ // }
+ },
+};
</script>
<style>
+#show-iframe {
+ display: block !important;
+ height: 95%;
+}
- #show-iframe {
- display: block !important;
- height: 95%;
-
- }
-
- .avue-main .avue-view {
- height: 100%;
- padding: 0px 5px !important;
- }
-
+.avue-main .avue-view {
+ height: 100%;
+ padding: 5px 5px !important;
+}
</style>
diff --git a/src/views/supervisoryConsole/data.vue b/src/views/supervisoryConsole/data.vue
index 7ce756d..dfb658d 100644
--- a/src/views/supervisoryConsole/data.vue
+++ b/src/views/supervisoryConsole/data.vue
@@ -79,7 +79,7 @@
:data="tableData"
stripe
style="width: 100%; margin: 10px"
- max-height="352px"
+ max-height="380px"
:resizable="false"
>
<el-table-column prop="waringType" label="警情类型" width="100">
@@ -475,7 +475,7 @@
flex-direction: column;
justify-content: space-between;
margin-bottom: 0px !important;
- height: 96% !important;
+ height: 100% !important;
font-size: 14px;
&:nth-child(2) {
padding-left: 10px;
diff --git a/src/views/supervisoryConsole/map.vue b/src/views/supervisoryConsole/map.vue
index 7e9b272..0063206 100644
--- a/src/views/supervisoryConsole/map.vue
+++ b/src/views/supervisoryConsole/map.vue
@@ -1,15 +1,13 @@
<template>
<el-row>
- <el-col :span="24">
- <iframe
- id="supervisoryMap"
- ref="supervisoryMap"
- :src="baseUrl"
- frameborder="0"
- width="100%"
- height="100%"
- ></iframe>
- </el-col>
+ <iframe
+ id="supervisoryMap"
+ ref="supervisoryMap"
+ :src="baseUrl"
+ frameborder="0"
+ width="100%"
+ height="100%"
+ ></iframe>
</el-row>
</template>
@@ -17,14 +15,13 @@
export default {
data() {
return {
- baseUrl: "",
+ baseUrl: "",
};
},
created() {
this.baseUrl = `/map/index.html?openid=SupervisoryMap`;
},
mounted() {
-
// this.$refs.supervisoryMap.onload = () => {
// window.frames[0].init("AlertSecurity", {
// x: this.form.jd,
--
Gitblit v1.9.3