diff --git a/client/src/layouts/header/index-svi.vue b/client/src/layouts/header/index-svi.vue
index 2e2ba7b..ac20ee7 100644
--- a/client/src/layouts/header/index-svi.vue
+++ b/client/src/layouts/header/index-svi.vue
@@ -36,7 +36,7 @@
-
+gzt_tcdl" @click="handleLogout" title="退出">
diff --git a/client/src/views/dtsjygl/zfjctj.vue b/client/src/views/dtsjygl/zfjctj.vue
index 49385a6..ce03b46 100644
--- a/client/src/views/dtsjygl/zfjctj.vue
+++ b/client/src/views/dtsjygl/zfjctj.vue
@@ -24,7 +24,8 @@
import {reactive, toRefs, getCurrentInstance, watch, computed, ref} from 'vue'
import Browser from '@/components/Browser.vue'
import {useUserStore} from '@/stores/modules/user'
-
+import supervisions from "@/api/lawenforcement/SupervisionCheck.js"
+const userStore = useUserStore()
const state = reactive({
componentLoading: false,
diff --git a/client/src/views/xzzfgl/jchc.vue b/client/src/views/xzzfgl/jchc.vue
index 0ae5ec1..b10b792 100644
--- a/client/src/views/xzzfgl/jchc.vue
+++ b/client/src/views/xzzfgl/jchc.vue
@@ -264,7 +264,13 @@ function handleDialogOk(formRef) {
console.log(dialogConfig.value.data)
supervisions.add(dialogConfig.value.data).then(res => {
if (res.success) {
-
+ messagesApi.sendMessage({
+ title: '交叉互查完成',
+ content: '您有新的交叉互查执法信息待处理!',
+ routeUrl: '/xzzfgl/ddjcjh/ddjcrwgl',
+ businessKey: dialogConfig.value.data.enterprise.enterpriseId,
+ receiverIds: ['111111']
+ }).then(rs => {
})
ElMessage.success("转交成功")
dialogConfig.value.show = false
diff --git a/client/src/views/xzzfgl/jchcrwgl.vue b/client/src/views/xzzfgl/jchcrwgl.vue
index b2926e8..8adad7d 100644
--- a/client/src/views/xzzfgl/jchcrwgl.vue
+++ b/client/src/views/xzzfgl/jchcrwgl.vue
@@ -172,7 +172,10 @@ function handleQuery(query) {
queryParams.value.checkType = '交叉互查'
queryParams.value.flag = 'cl'
apiConfig.value.api.query(queryParams.value).then(res => {
-
+ if (res.success) {
+ tableConfig.value.tableData = res
+ tableConfig.value.tableLoading = false
+ }
})
}
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenController.java b/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenController.java
index 67b03a3..76d25ce 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenController.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenController.java
@@ -23,7 +23,11 @@ import java.util.Map;
@RequestMapping(Constants.API_PREFIX + "/bigscreen")
public class BigScreenController {
+ private final BigScreenService bigScreenService;
+ public BigScreenController(BigScreenService bigScreenService) {
+ this.bigScreenService = bigScreenService;
+ }
/**
* 数据概览统计
*
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/SupervisionCheckService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/SupervisionCheckService.java
index 4e7ff22..d8f088a 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/service/SupervisionCheckService.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/SupervisionCheckService.java
@@ -91,6 +91,8 @@ public class SupervisionCheckService {
supervisionCheck.setCheckType(supervisionCheckDto.getCheckType());
if("交叉互查".equals(supervisionCheckDto.getCheckType())){
supervisionCheck.setCheckStatus(SupervisionCheck.CheckStatus.reviewing_done);
+ }else{
+ supervisionCheck.setCheckStatus(SupervisionCheck.CheckStatus.pending);
}
supervisionCheck.setDeliverTime(LocalDateTime.now());
supervisionCheck.setEvidence(supervisionCheckDto.getEvidence());