From 1445c7e1f76c4628f4619cf67150a63d6f8f5e90 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期二, 01 十一月 2022 09:04:16 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/components/detail/index.vue | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/src/components/detail/index.vue b/src/components/detail/index.vue
index 9f8ba6e..33cd86a 100644
--- a/src/components/detail/index.vue
+++ b/src/components/detail/index.vue
@@ -5,14 +5,14 @@
<div class="data-item__left">
<label class="data-title">
闂绫诲瀷:
- </label>
+ </label>
<span class="data-detail">杩濊</span>
</div>
<div class="data-item__right">
<label class="data-title">
澶х被鍚嶇О:
</label>
- <span class="data-detail">{{baseCase.violations.categoryId}}</span>
+ <span class="data-detail">{{baseCase.violations.categoryText}}</span>
</div>
</div>
<div class="data-item">
@@ -20,13 +20,13 @@
<label class="data-title">
灏忕被鍚嶇О:
</label>
- <span class="data-detail">{{baseCase.violations.typeId}}</span>
+ <span class="data-detail">{{baseCase.violations.typeText}}</span>
</div>
<div class="data-item__right">
<label class="data-title">
浜嬩欢绛夌骇:
</label>
- <span class="data-detail">{{baseCase.violations.gradeId}}</span>
+ <span class="data-detail">{{baseCase.violations.gradeText}}</span>
</div>
</div>
<div class="data-item">
@@ -38,27 +38,33 @@
</div>
</div>
<div class="data-item">
- <div class="data-item__left">
+ <!-- <div class="data-item__left">
<label class="data-title">
鎵�灞炲尯鍘�:
</label>
<span class="data-detail">xxx</span>
+ </div> -->
+ <div class="data-item__left">
+ <label class="data-title">
+ 鎵�灞炶閬�:
+ </label>
+ <span class="data-detail">{{baseCase.streetText}}</span>
</div>
<div class="data-item__right">
<label class="data-title">
鎵�灞炵ぞ鍖�:
</label>
- <span class="data-detail">{{baseCase.communityId}}</span>
+ <span class="data-detail">{{baseCase.communityText}}</span>
</div>
</div>
- <div class="data-item">
+ <!-- <div class="data-item">
<div class="data-item__left">
<label class="data-title">
鎵�灞炶閬�:
</label>
- <span class="data-detail">{{baseCase.streetId}}</span>
+ <span class="data-detail">{{baseCase.streetText}}</span>
</div>
- </div>
+ </div> -->
<div class="data-item">
<div class="data-item__left">
<label class="data-title">
@@ -119,9 +125,9 @@
<div class="show-item">
<div class="show-wrap">
<MyProcess v-if="activeIndex === 1" :handlePassVo="handlePassVo" :baseCase="baseCase"></MyProcess>
- <MyFilePicture v-else-if="activeIndex === 2" :filesPictureVo="filesPictureVo" ></MyFilePicture>
- <MySovleProblem v-else-if="activeIndex === 3" :problemProVo="problemProVo"></MySovleProblem>
- <MyScene v-else :currentSitVo="currentSitVo"></MyScene>
+ <MyFilePicture v-else-if="activeIndex === 2" :filesPictureVo="filesPictureVo" :mycode='mycode'></MyFilePicture>
+ <MySovleProblem v-else-if="activeIndex === 3" :baseCase="baseCase" :handlePassVo="handlePassVo"></MySovleProblem>
+ <MyScene v-else :currentSitVo="currentSitVo" :baseCase="baseCase"></MyScene>
</div>
</div>
</div>
@@ -163,7 +169,7 @@
baseCase:{},
handlePassVo:{},
currentSitVo:{},
- problemProVo:{},
+ // problemProVo:{},
filesPictureVo:{}
}
@@ -174,16 +180,16 @@
this.baseCase = info.baseCase;
this.handlePassVo = info.handlePassVo;
this.currentSitVo = info.currentSitVo;
- this.problemProVo = info.problemProVo;
+ // this.problemProVo = info.problemProVo;
this.filesPictureVo = info.filesPictureVo;
- console.log(info);
+ console.log(info);
},
methods: {
changeComponent(index) {
this.activeIndex = index;
},
},
- props: ['info']
+ props: ['info','mycode']
}
</script>
<style lang="scss" scoped>
--
Gitblit v1.8.0