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

Merge branch 'dev' into vite

Browse Source 
# Conflicts:
#	examples/router/autoRoutes.js
#	package.json
#	packages/bigscreen/designer/components/Add.vue
#	project/dv/apps/AppGridDV.vue
#	vue.config.js
This commit is contained in:
aixianling
2022-08-23 11:14:38 +08:00
parent cef8dad5f0 de190a9076
commit a5dbdbe778
125 changed files with 15445 additions and 4898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/work/AppAssessment/components/Statistics.vue
View File

@@ -6,11 +6,11 @@
<template slot="content">
<div class="statistics-top">
<div class="statistics-top__item">
<span>监测家庭户数</span>
<span>监测对象户数</span>
<h2 style="color: #2266FF;">{{ totalInfo['监测家庭户数'] }}</h2>
</div>
<div class="statistics-top__item">
<span>监测对象总数</span>
<span>监测对象人口总数</span>
<h2 style="color: #22AA99;">{{ totalInfo['监测对象总数'] }}</h2>
</div>
<div class="statistics-top__item">
@@ -186,7 +186,7 @@
{ prop: 'idNumber', label: '身份证号', align: 'center' },
{ prop: 'householdPhone', label: '户主联系方式', align: 'center' },
{ prop: 'address', label: '家庭住址', align: 'center' },
{ prop: 'status', label: '状态', align: 'center', formart: v => this.dict.getLabel('fpRiskPersonStatus', v) },
{ prop: 'status', label: '状态', align: 'center', formart: v => this.dict.getLabel('fpPrtpStatus', v) },
{ prop: 'girdMemberName', label: '网格员', align: 'center' },
{ prop: 'girdMemberPhone', label: '网格员电话', align: 'center' },
{ prop: 'visitCount', label: '走访次数', align: 'center' }
@@ -198,7 +198,7 @@
this.search.areaId = this.user.info.areaId
this.hideLevel = this.user.info.areaList.length - 1
this.dict.load('fpRiskPersonStatus', 'sex').then(() => {
this.dict.load('fpPrtpStatus', 'sex').then(() => {
this.getLogCount()
})
this.getTotal()

26
packages/work/AppConference/detail.vue
View File

@@ -95,10 +95,10 @@
<template #left>
<el-select v-model="search.joinStatus" placeholder="确认状态" size="small" clearable class="vc-input-160" @change="searchMeetinguser">
<el-option
v-for="(item,k) in confirmStatus"
:key="k"
:label="item.label"
:value="k">
v-for="(item,k) in confirmStatus"
:key="k"
:label="item.label"
:value="k">
</el-option>
</el-select>
</template>
@@ -109,10 +109,10 @@
</template>
</ai-search-bar>
<ai-table
:tableData="info.attendees"
:colConfigs="colConfigs"
style="margin-top: 12px;"
:isShowPagination="false">
:tableData="info.attendees"
:colConfigs="colConfigs"
style="margin-top: 12px;"
:isShowPagination="false">
<el-table-column slot="meetingUserName"
label="姓名"
align="center"
@@ -201,7 +201,7 @@ export default {
{
slot: 'joinStatus',
},
{ prop: 'signInStatus', align: 'center', label: '签到', formart: v => v === '1' ? '已签到' : '未签到' },
{prop: 'signInStatus', align: 'center', label: '签到', formart: v => v === '1' ? '已签到' : '未签到'},
{
slot: 'option',
}
@@ -249,11 +249,9 @@ export default {
params: {id}
}).then(res => {
if (res?.data) {
this.info = {
...res.data,
content: this.formatContent(res.data.content || ""),
files: res.data.files || []
};
let {files = [], content} = res.data
content = content.replace(/(\r\n)|(\n)/g, "<br>")
this.info = {...res.data, content, files};
this.searchMeetinguser()
}
});

9
packages/work/AppHelpedResident/hrList.vue
View File

@@ -37,13 +37,16 @@
</el-button>
</template>
<template #right>
<ai-download url="/app/apppreventionreturntopoverty/exportAcquisitionTable" :params="{...search,ids}"
:instance="instance" fileName="导出名单" suffixName="zip">
<el-button icon="iconfont iconExported">导出名单</el-button>
</ai-download>
<ai-import :instance="instance" name="监测对象" title="导入监测对象"
suffixName="xlsx"
url="/app/apppreventionreturntopoverty/downloadTemplate"
importUrl="/app/apppreventionreturntopoverty/import"
@onSuccess="page.current=1,getTableData()"/>
<ai-download url="/app/apppreventionreturntopoverty/export" :params="{...search,ids}"
:instance="instance" fileName="监测对象导出文件"/>
<ai-download url="/app/apppreventionreturntopoverty/export" :params="{...search,ids}" :instance="instance" fileName="监测对象导出文件"/>
</template>
</ai-search-bar>
<ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
@@ -105,7 +108,7 @@ export default {
},
data() {
return {
search: {status: '',houseType: '', objectType: '', riskType: '', birthStart: '', birthEnd:'',sex: '' },
search: {status: '', houseType: '', objectType: '', riskType: '', birthStart: '', birthEnd: '', sex: '', isHousehold: 1},
page: {current: 1, size: 10, total: 0},
tableData: [],
ids: [],

6
packages/work/processManagement/massesMessage/components/messageDetail.vue
View File

@@ -130,7 +130,7 @@ export default {
methods: {
getDetailInfo() {
this.data.appLeaveMessageReplyList = []
this.instance.post(`app/appleavemessage/queryDetailById?id=` + this.detailId).then((res) => {
this.instance.post(`/app/appleavemessage/queryDetailById?id=` + this.detailId).then((res) => {
this.data = res.data
this.data.images = JSON.parse(res.data.images)
if (this.data.appLeaveMessageReplyList.length) {
@@ -166,7 +166,7 @@ export default {
createUnitId: this.user.info.unitId,
createUnitName: this.user.info.unitName,
}
this.instance.post(`app/appleavemessagereply/addOrUpdate`, params).then((res) => {
this.instance.post(`/app/appleavemessagereply/addOrUpdate`, params).then((res) => {
console.log(res)
this.maskShow = false
this.getDetailInfo()
@@ -193,7 +193,7 @@ export default {
return item
})
}
this.instance.post(`app/appleavemessage/addOrUpdate`, params).then((res) => {
this.instance.post(`/app/appleavemessage/addOrUpdate`, params).then((res) => {
this.getDetailInfo()
})
})