From 33cd6370c54ca6ef801060b1f887a86de0dddbbf Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Thu, 8 Jun 2023 11:43:07 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]iframe=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
proxy.config.json | 4 ++--
.../get-out-of-line-details.component.html | 2 +-
.../get-out-of-line-details.component.scss | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/proxy.config.json b/proxy.config.json
index 07408fe..e2148be 100644
--- a/proxy.config.json
+++ b/proxy.config.json
@@ -1,6 +1,6 @@
{
"/api": {
- "target": "http://121.36.37.70:8906/",
+ "target": "https://znaq.sinochemoilmarketing.com/",
"测试1": "http://121.36.37.70:8906/",
"测试2": "https://znaq.sinochemoilmarketing.com/",
"测试3": "https://gas.anxincloud.cn/",
@@ -8,7 +8,7 @@
"changeOrigin": true
},
"/signalr": {
- "target": "http://121.36.37.70:8906/",
+ "target": "https://znaq.sinochemoilmarketing.com/",
"secure": false,
"ws": true,
"logLevel": "debug"
diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html
index 108406c..9be47f8 100644
--- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html
+++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html
@@ -40,7 +40,7 @@
[ngStyle]="{'width': canvasWidth + 'px','height': canvasHeight + 'px'}" id="canvas">
-
+
diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss
index 1769bd8..dc28865 100644
--- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss
+++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss
@@ -94,7 +94,8 @@
align-items: center;
justify-content: center;
flex-direction: column;
- height: 550px;
+ min-height: 550px;
+ max-height: 550px;
.imgbox {
flex: 1;