From 31cb9747ac44c92203d3f17c7f2bb24449e9d285 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期五, 09 十二月 2022 11:33:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/detail/index.vue | 64 ++++++++++++++------------------
1 files changed, 28 insertions(+), 36 deletions(-)
diff --git a/src/components/detail/index.vue b/src/components/detail/index.vue
index e5a9857..14aeb40 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>
- <span class="data-detail">杩濊</span>
+ </label>
+ <span class="data-detail">{{ getCategoryLabel(baseCase.category) }}</span>
</div>
<div class="data-item__right">
<label class="data-title">
澶х被鍚嶇О:
</label>
- <span class="data-detail">{{baseCase.violations.categoryText}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.categoryText}}</span>
</div>
</div>
<div class="data-item">
@@ -20,13 +20,13 @@
<label class="data-title">
灏忕被鍚嶇О:
</label>
- <span class="data-detail">{{baseCase.violations.typeText}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.typeText}}</span>
</div>
<div class="data-item__right">
<label class="data-title">
浜嬩欢绛夌骇:
</label>
- <span class="data-detail">{{baseCase.violations.gradeText}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.gradeText}}</span>
</div>
</div>
<div class="data-item">
@@ -34,21 +34,7 @@
<label class="data-title">
妗堢敱:
</label>
- <span class="data-detail">{{baseCase.violations.actionCause}}</span>
- </div>
- </div>
- <div class="data-item">
- <div class="data-item__left">
- <label class="data-title">
- 鎵�灞炲尯鍘�:
- </label>
- <span class="data-detail">xxx</span>
- </div>
- <div class="data-item__right">
- <label class="data-title">
- 鎵�灞炵ぞ鍖�:
- </label>
- <span class="data-detail">{{baseCase.communityText}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.actionCause}}</span>
</div>
</div>
<div class="data-item">
@@ -57,6 +43,12 @@
鎵�灞炶閬�:
</label>
<span class="data-detail">{{baseCase.streetText}}</span>
+ </div>
+ <div class="data-item__right">
+ <label class="data-title">
+ 鎵�灞炵ぞ鍖�:
+ </label>
+ <span class="data-detail">{{baseCase.communityText}}</span>
</div>
</div>
<div class="data-item">
@@ -72,7 +64,7 @@
<label class="data-title">
鍏宠仈鍟嗛摵鍚嶇О:
</label>
- <span class="data-detail">{{baseCase.violations.shopName}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.shopName}}</span>
</div>
</div>
<div class="data-item">
@@ -80,7 +72,7 @@
<label class="data-title">
闂鎻忚堪:
</label>
- <span class="data-detail">{{baseCase.violations.description}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.description}}</span>
</div>
</div>
<div class="data-user">
@@ -89,13 +81,13 @@
<label class="data-title">
鍙嶆槧浜�:
</label>
- <span class="data-detail">{{baseCase.violations.informant}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.informant}}</span>
</div>
<div class="data-item__right">
<label class="data-title">
鑱旂郴鏂瑰紡:
</label>
- <span class="data-detail">{{baseCase.violations.informantPhoneCode}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.informantPhoneCode}}</span>
</div>
</div>
<div class="data-item">
@@ -103,7 +95,7 @@
<label class="data-title">
韬唤璇佸彿:
</label>
- <span class="data-detail">{{baseCase.violations.informantIdCard}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.informantIdCard}}</span>
</div>
</div>
</div>
@@ -119,7 +111,7 @@
<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>
+ <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>
@@ -132,6 +124,8 @@
import MyFilePicture from '@/components/filePictrue'
import MySovleProblem from '@/components/solveProblem'
import MyScene from '@/components/scene'
+import { CATEGOTY } from "@/utils/helper";
+
export default {
components: {
MyProcess, MyFilePicture, MySovleProblem, MyScene
@@ -163,27 +157,25 @@
baseCase:{},
handlePassVo:{},
currentSitVo:{},
- // problemProVo:{},
filesPictureVo:{}
}
},
created() {
- console.log('created');
- const {info} = this;
- this.baseCase = info.baseCase;
- this.handlePassVo = info.handlePassVo;
- this.currentSitVo = info.currentSitVo;
- // this.problemProVo = info.problemProVo;
- this.filesPictureVo = info.filesPictureVo;
- console.log(info);
+ this.baseCase = this.info.baseCase;
+ this.handlePassVo = this.info.handlePassVo;
+ this.currentSitVo = this.info.currentSitVo;
+ this.filesPictureVo = this.info.filesPictureVo;
},
methods: {
changeComponent(index) {
this.activeIndex = index;
},
+ getCategoryLabel(category) {
+ return CATEGOTY.find(item => item.value === category).label;
+ }
},
- props: ['info']
+ props: ['info','mycode']
}
</script>
<style lang="scss" scoped>
--
Gitblit v1.8.0