From fe0f6764a0ac8c2655bd3e276c9526817801b96d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com>
Date: Sat, 20 Feb 2021 09:30:08 +0800
Subject: [PATCH 1/3] 1.2.2
---
.../working-area/working-area.component.ts | 47 +++++++++++++------
1 file changed, 32 insertions(+), 15 deletions(-)
diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index bee4eed..fae03ae 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -162,7 +162,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
* 重大调整-主版本号增加
* 日期变更-日期版本号增加
*/
- public VERSION = '1.2.1.20210207_beta';
+ public VERSION = '1.2.2.20210220_beta';
/**
* 数据初始化
*/
@@ -992,24 +992,41 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
if (imageUrl === undefined || imageUrl === null || imageUrl === '') {
this.backgroundImage.texture = this.backgroundTexture;
} else {
- this.backgroundImage.texture = await PIXI.Texture.fromURL(imageUrl);
+ // this.backgroundImage.texture = await PIXI.Texture.fromURL(imageUrl);
+ if (imageWidth !== undefined
+ && imageWidth !== null
+ && imageWidth !== 0
+ && imageHeight !== undefined
+ && imageHeight !== null
+ && imageHeight !== 0) {
+ // console.log(imageWidth, imageHeight);
+ // this.backgroundImage.width = imageWidth;
+ // this.backgroundImage.height = imageHeight;
+ this.backgroundImage.texture =
+ await PIXI.Texture.fromURL(imageUrl + '?x-oss-process=image/resize,m_fixed,h_' + imageHeight + ',w_' + imageWidth); // 图片处理
+ } else {
+ // this.backgroundImage.width = this.backgroundImage.texture.width;
+ // this.backgroundImage.height = this.backgroundImage.texture.height;
+ this.backgroundImage.texture =
+ await PIXI.Texture.fromURL(imageUrl); // 请求原图
+ }
}
this.backgroundImage.angle = imageAngle;
- if (imageWidth !== undefined
- && imageWidth !== null
- && imageWidth !== 0
- && imageHeight !== undefined
- && imageHeight !== null
- && imageHeight !== 0) {
- console.log(imageWidth, imageHeight);
- this.backgroundImage.width = imageWidth;
- this.backgroundImage.height = imageHeight;
- } else {
- this.backgroundImage.width = this.backgroundImage.texture.width;
- this.backgroundImage.height = this.backgroundImage.texture.height;
- }
+ // if (imageWidth !== undefined
+ // && imageWidth !== null
+ // && imageWidth !== 0
+ // && imageHeight !== undefined
+ // && imageHeight !== null
+ // && imageHeight !== 0) {
+ // console.log(imageWidth, imageHeight);
+ // this.backgroundImage.width = imageWidth;
+ // this.backgroundImage.height = imageHeight;
+ // } else {
+ // this.backgroundImage.width = this.backgroundImage.texture.width;
+ // this.backgroundImage.height = this.backgroundImage.texture.height;
+ // }
this.backgroundImage.x = this.backgroundImage.width / 2;
this.backgroundImage.y = this.backgroundImage.height / 2;
From 7d4fa61654d7694c872286640bc688f08d093672 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Sat, 20 Feb 2021 15:38:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=BD=95=E5=85=A5?=
=?UTF-8?q?=E9=A2=84=E6=A1=88=E8=B7=B3=E8=BD=AC=E5=8D=95=E4=BD=8D=E4=BF=A1?=
=?UTF-8?q?=E6=81=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../fire-force/fire-force.component.scss | 1 -
.../linkage-forces.component.scss | 1 -
.../water-collection.component.scss | 1 -
.../basic-info/basic-info.component.scss | 3 -
.../gis-management/gis-labeling/shareUrl.scss | 2 -
.../key-unit-management.component.ts | 2 +-
.../lockscreen/lockscreen.component.scss | 1 -
.../basic-info/basic-info.component.scss | 3 -
.../fireforce-audit.component.html | 106 +++++++++---------
.../fireforce-audit.component.scss | 1 +
.../linkageforces-audit.component.html | 26 ++---
.../linkageforces-audit.component.scss | 5 +-
.../wait-examineer.component.html | 4 +-
.../entry-plan-look.component.ts | 8 +-
.../entry-plan/entry-plan.component.ts | 3 +-
src/app/ui/collection-tools/panel.scss | 5 +-
16 files changed, 81 insertions(+), 91 deletions(-)
diff --git a/src/app/data-collection/fire-force/fire-force.component.scss b/src/app/data-collection/fire-force/fire-force.component.scss
index f0a7e5d..7c301fa 100644
--- a/src/app/data-collection/fire-force/fire-force.component.scss
+++ b/src/app/data-collection/fire-force/fire-force.component.scss
@@ -6,7 +6,6 @@
box-sizing: border-box;
padding: 10px;
font-size: 16px;
- // font-family: Source Han Sans CN;
font-weight: 400;
color: #000000;
}
diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.scss b/src/app/data-collection/linkage-forces/linkage-forces.component.scss
index e157894..4eb6f15 100644
--- a/src/app/data-collection/linkage-forces/linkage-forces.component.scss
+++ b/src/app/data-collection/linkage-forces/linkage-forces.component.scss
@@ -6,7 +6,6 @@
box-sizing: border-box;
padding: 10px;
font-size: 16px;
- // font-family: Source Han Sans CN;
font-weight: 400;
color: #000000;
}
diff --git a/src/app/data-collection/water-collection/water-collection.component.scss b/src/app/data-collection/water-collection/water-collection.component.scss
index 774617c..f0376c1 100644
--- a/src/app/data-collection/water-collection/water-collection.component.scss
+++ b/src/app/data-collection/water-collection/water-collection.component.scss
@@ -6,7 +6,6 @@
box-sizing: border-box;
padding: 10px;
font-size: 16px;
- // font-family: Source Han Sans CN;
font-weight: 400;
color: #000000;
}
diff --git a/src/app/gis-management/basic-info/basic-info.component.scss b/src/app/gis-management/basic-info/basic-info.component.scss
index 7e2a4bc..282cfe8 100644
--- a/src/app/gis-management/basic-info/basic-info.component.scss
+++ b/src/app/gis-management/basic-info/basic-info.component.scss
@@ -18,7 +18,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
width: 100%;
height: 100%;
overflow-y: auto;
- // font-family: Source Han Sans CN;
color: #333333;
padding: 10px;
box-sizing: border-box;
@@ -31,7 +30,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
p{
height: 14px;
font-size: 14px;
- // font-family: Source Han Sans CN;
font-weight: 400;
line-height: 14px;
color: #333333;
@@ -54,7 +52,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
p{
height: 14px;
font-size: 14px;
- // font-family: Source Han Sans CN;
font-weight: 400;
line-height: 14px;
color: #333333;
diff --git a/src/app/gis-management/gis-labeling/shareUrl.scss b/src/app/gis-management/gis-labeling/shareUrl.scss
index 1c21446..dab5edb 100644
--- a/src/app/gis-management/gis-labeling/shareUrl.scss
+++ b/src/app/gis-management/gis-labeling/shareUrl.scss
@@ -8,7 +8,6 @@
position: relative;
.name{
font-size: 20px;
- // font-family: Source Han Sans CN;
font-weight: 400;
color: #FFFFFF;
}
@@ -37,7 +36,6 @@
line-height: 36px;
background: #EEF1F5;
font-size: 16px;
- // font-family: Source Han Sans CN;
font-weight: 400;
color: #333333;
opacity: 0.4;
diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
index 75909dc..660976b 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
@@ -568,7 +568,7 @@ export class KeyUnitManagementComponent implements OnInit {
//跳转查看基本信息页面
unitdetails(element){
- console.log(element)
+ // console.log(element)
sessionStorage.setItem("editable","0")
sessionStorage.setItem("companyName",element.name)
sessionStorage.setItem("companyId",element.id)
diff --git a/src/app/pages/lockscreen/lockscreen.component.scss b/src/app/pages/lockscreen/lockscreen.component.scss
index 041d3ab..932df87 100644
--- a/src/app/pages/lockscreen/lockscreen.component.scss
+++ b/src/app/pages/lockscreen/lockscreen.component.scss
@@ -22,7 +22,6 @@
width: 100%;
height: 100%;
color: #fff;
- font-family: Roboto, sans-serif;
background: url('../../../assets/images/background.jpg');
&::before {
position: fixed;
diff --git a/src/app/plan-audit/basic-info/basic-info.component.scss b/src/app/plan-audit/basic-info/basic-info.component.scss
index c44b0de..abf4034 100644
--- a/src/app/plan-audit/basic-info/basic-info.component.scss
+++ b/src/app/plan-audit/basic-info/basic-info.component.scss
@@ -18,7 +18,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
width: 100%;
height: 760px;
overflow-y: auto;
- // font-family: Source Han Sans CN;
color: #333333;
padding: 10px;
box-sizing: border-box;
@@ -31,7 +30,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
p{
height: 14px;
font-size: 14px;
- // font-family: Source Han Sans CN;
font-weight: 400;
line-height: 14px;
color: #333333;
@@ -54,7 +52,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
p{
height: 14px;
font-size: 14px;
- // font-family: Source Han Sans CN;
font-weight: 400;
line-height: 14px;
color: #333333;
diff --git a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.html b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.html
index 070bd78..5744a5b 100644
--- a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.html
+++ b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.html
@@ -36,25 +36,25 @@
*
队站名称:
-
+
联系方式
@@ -110,25 +110,25 @@ 总队长名称: - +联系方式
@@ -235,73 +235,73 @@ 站长姓名: - +位置信息
@@ -70,21 +70,21 @@ 行政区: - + 地址: - +应急信息
@@ -115,13 +115,13 @@ 服务内容: - +