From b8f5f6cdf5c26db929b7cda0188c587eb8d66c1d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:51 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/components/scene/index.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/scene/index.vue b/src/components/scene/index.vue
index 13a2f54..f6e14f2 100644
--- a/src/components/scene/index.vue
+++ b/src/components/scene/index.vue
@@ -161,8 +161,8 @@
this.arrivalSituation.situationPic = mylist.situationPic.split(",")
}
this.mybaseCase = baseCase;
- if (baseCase.violations) {
- this.type = baseCase.violations.typeText;
+ if (baseCase.violationsVO) {
+ this.type = baseCase.violationsVO.typeText;
} else {
this.type = baseCase.illegalBuilding.categoryText;
}
@@ -219,8 +219,8 @@
padding: 20px 0px;
::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
+ // background-color: #09152f;
+ // border: 1px solid #17324c;
}
}
--
Gitblit v1.8.0