kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-03-08 16:43:33 +08:00
parent 68ef8a5214 5b1a050001
commit b768efcb5d
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/AppEpidemicSituation/UserInfo.vue
View File

@@ -5,7 +5,7 @@
<h2 class="name">{{info.name}}的返乡登记信息</h2> <h2 class="name">{{info.name}}的返乡登记信息</h2>
<p><img src="./components/img/org-icon.png" alt=""><span class="start-name">{{info.startAreaName}}</span></p> <p><img src="./components/img/org-icon.png" alt=""><span class="start-name">{{info.startAreaName}}</span></p>
<p><img src="./components/img/blue-icon.png" alt=""><span class="start-name">{{info.arriveAreaName}}</span></p> <p><img src="./components/img/blue-icon.png" alt=""><span class="start-name">{{info.arriveAreaName}}</span></p>
<p><img src="./components/img/time-icon.png" alt="">{{info.createTime}}</p> <p><img src="./components/img/time-icon.png" alt="">{{info.arriveTime}}</p>
</div> </div>
</div> </div>
<div class="info"> <div class="info">

2
src/apps/AppResidentActivitie/AppResidentActivities.vue
View File

@@ -93,7 +93,7 @@ export default {
methods: { methods: {
getList() { getList() {
this.$http this.$http
.post('/app/appvillageactivityinfo/list', null, { .post('/app/appvillageactivityinfo/listUp', null, {
params: { params: {
size: this.size, size: this.size,
current: this.current, current: this.current,

7
src/apps/AppWorkonline/Detail.vue
View File

@@ -97,13 +97,10 @@
<!-- 右 字典值 items.dictionaryCode --> <!-- 右 字典值 items.dictionaryCode -->
<!-- 单下拉框 --> <!-- 单下拉框 -->
<span class="msg_lright" v-if="items.fieldDataType == 9">
{{ $dict.getDict(items.dictionaryCode, items.fieldValue)[$dict.getLabel(items.dictionaryCode, items.fieldValue)].dictName }}
</span>
<span class="msg_lright" v-if="items.fieldDataType != 5 && items.fieldDataType != 9">{{ $dict.getLabel(items.dictionaryCode, items.fieldValue) }}</span> <span class="msg_lright" v-if="items.fieldDataType != 5">{{ $dict.getLabel(items.dictionaryCode, items.fieldValue) }}</span>
<span class="msg_lright" v-if="items.fieldDataType == 5 && items.fieldDataType != 9"> <span class="msg_lright" v-if="items.fieldDataType == 5">
<span v-for="(itemL, indexL) in items.fieldValue" :key="indexL">{{ $dict.getLabel(items.dictionaryCode, itemL) }} </span> <span v-for="(itemL, indexL) in items.fieldValue" :key="indexL">{{ $dict.getLabel(items.dictionaryCode, itemL) }} </span>
</span> </span>
</div> </div>