在线巡查功能优化
This commit is contained in:
parent
698b542cd3
commit
f9f2c789c4
|
|
@ -2002,9 +2002,7 @@ function showCheckCaseChart(data) {
|
||||||
{
|
{
|
||||||
name: '在线巡查数',
|
name: '在线巡查数',
|
||||||
type: 'line',
|
type: 'line',
|
||||||
lineStyle: {
|
|
||||||
width: size(4)
|
|
||||||
},
|
|
||||||
itemStyle: {
|
itemStyle: {
|
||||||
color: '#14B1CA'
|
color: '#14B1CA'
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -355,7 +355,7 @@ async function handleDetail(row) {
|
||||||
dialogConfig.value.show = true
|
dialogConfig.value.show = true
|
||||||
dialogConfig.value.mode = 'detail'
|
dialogConfig.value.mode = 'detail'
|
||||||
dialogConfig.value.title = '详情企业信息'
|
dialogConfig.value.title = '详情企业信息'
|
||||||
|
findOne(row)
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handleModify(row) {
|
async function handleModify(row) {
|
||||||
|
|
|
||||||
|
|
@ -60,10 +60,6 @@
|
||||||
<el-table-column prop="infoAccessMsg" label="资料上报" min-width="100"/>
|
<el-table-column prop="infoAccessMsg" label="资料上报" min-width="100"/>
|
||||||
<el-table-column prop="permitAccessMsg" label="许可信息" min-width="100"/>
|
<el-table-column prop="permitAccessMsg" label="许可信息" min-width="100"/>
|
||||||
|
|
||||||
<template #tableControlColumn="{ data: r }">
|
|
||||||
<el-link type="primary" @click="handDistribution(r.data.row)" title="在线巡查">在线巡查</el-link>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<template #dialog>
|
<template #dialog>
|
||||||
<el-dialog class="business-dialog" v-model="dialogConfig.show" :show-close="false" :append-to-body="true"
|
<el-dialog class="business-dialog" v-model="dialogConfig.show" :show-close="false" :append-to-body="true"
|
||||||
fullscreen>
|
fullscreen>
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,6 @@ public class OnlinePatrolDto {
|
||||||
private String createUserName;//录入人名称
|
private String createUserName;//录入人名称
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private LocalDateTime createTime;//录入时间
|
private LocalDateTime createTime;//录入时间
|
||||||
|
|
||||||
private String approvalStatus;//审批状态
|
private String approvalStatus;//审批状态
|
||||||
private String approvalUserId;//审批人id
|
private String approvalUserId;//审批人id
|
||||||
private String approvalUserName;//审批人名称
|
private String approvalUserName;//审批人名称
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,5 @@ import org.springframework.stereotype.Repository;
|
||||||
*/
|
*/
|
||||||
@Repository
|
@Repository
|
||||||
public interface InsEnterprseRepository extends BaseRepo<InsEnterprse, String> {
|
public interface InsEnterprseRepository extends BaseRepo<InsEnterprse, String> {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,15 @@ public class CaseService {
|
||||||
*
|
*
|
||||||
* @param query@return 分页案件信息
|
* @param query@return 分页案件信息
|
||||||
*/
|
*/
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public Page<Case> findCasesPage(CaseQuery query, RemoteUserInfo user) {
|
||||||
|
if ("zfwsquery".equals(query.getSpecialCondition()))
|
||||||
|
return caseRepository.findAll(buildSpec(query, user), PageableHelper.buildPageRequest(query.page(), query.pageSize(), "fillingDate", "desc")).map(this::handleResult);
|
||||||
|
if (query.getStatus() != null && ("filed".equals(query.getStatus().getValue()) || "investigation_done".equals(query.getStatus().getValue())))
|
||||||
|
return caseRepository.findAll(buildSpec(query, user), PageableHelper.buildPageRequest(query.page(), query.pageSize(), "fillingDate", "desc")).map(this::getCaseevidenceDetailInfo);
|
||||||
|
else
|
||||||
|
return caseRepository.findAll(buildSpec(query, user), PageableHelper.buildPageRequest(query.page(), query.pageSize(), "fillingDate", "desc")).map(this::getCaseDetailInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private Case handleResult(Case caseInfoDto) {
|
private Case handleResult(Case caseInfoDto) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue