From 9094dea7cd9e45e4bb0a3d22a8dc1d682ca7463b Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 19 Apr 2021 09:38:35 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue
---
src/views/dataL/dataL.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/dataL/dataL.vue b/src/views/dataL/dataL.vue
index 32577e2..80cabd6 100644
--- a/src/views/dataL/dataL.vue
+++ b/src/views/dataL/dataL.vue
@@ -1,6 +1,6 @@
<template>
- <div id="Lour">
- <div class="left">
+ <div id="Lour" style="height: 100%">
+ <div class="left" style="height: 101%">
<div class="top">
<div class="top-l">
<div class="left-top">
@@ -1139,7 +1139,7 @@
this.getMap();
} else {
// this.re();
- this.getMap();
+ console.log(`没有找到到window.frames[0].init`)
}
};
},
@@ -1149,7 +1149,7 @@
#Lour {
width: 100%;
font-size: 14px;
- height: 99.5%;
+ height: 100%;
// font: 12px/1.5 Tahoma,Helvetica,Arial,'宋体',sans-serif;
// font: 12px/1 Tahoma,Helvetica,Arial,"\5b8b\4f53",sans-serif;
// font: 14px/1.5 'Microsoft YaHei',arial,tahoma,\5b8b\4f53,sans-serif;
@@ -1167,7 +1167,7 @@
overflow: hidden;
.left {
width: 67%;
- height: 99.5%;
+ height: 100%;
// border: 1px solid rgb(236, 24, 24);
background-color: #fff;
display: flex;
@@ -1392,7 +1392,7 @@
}
.right {
width: 30%;
- height: 90.5%;
+ height: 95.5%;
// border: 1px solid rgb(23, 201, 62);
background-color: #fff;
display: flex;
--
Gitblit v1.9.3