diff --git a/client/src/router/index.js b/client/src/router/index.js index 8ecbddf..48561cc 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -487,7 +487,6 @@ const baseRoutes = [ children: [ { path: 'index', - name: '_index', component: () => import('@views/fxczfgl/index.vue'), meta: { title: '非现场执法管理' diff --git a/client/src/stores/json/topMenu.json b/client/src/stores/json/topMenu.json index 3bfd22f..6c3662c 100644 --- a/client/src/stores/json/topMenu.json +++ b/client/src/stores/json/topMenu.json @@ -32,7 +32,6 @@ { "gncdbh": 4, "name": "非现场执法", - "icon": "zyyy_rzzx", "path": "/fxczfgl/index", "router": true }, diff --git a/client/src/views/big-screen/bigdata.vue b/client/src/views/big-screen/bigdata.vue index 0514c3e..3b8cecc 100644 --- a/client/src/views/big-screen/bigdata.vue +++ b/client/src/views/big-screen/bigdata.vue @@ -129,9 +129,8 @@
执法装备概览
-
- +
执法车辆数量
@@ -1879,6 +1878,9 @@ function handCasePageQueryParams(val) { getCasePage() } +function closeCasePage() { + casePageShow.value = false +} /** * 非现场执法 diff --git a/client/src/views/dtsjygl/qyfjfl.vue b/client/src/views/dtsjygl/qyfjfl.vue index fcc7b78..8036710 100644 --- a/client/src/views/dtsjygl/qyfjfl.vue +++ b/client/src/views/dtsjygl/qyfjfl.vue @@ -166,7 +166,7 @@ const state = reactive({ mode: 'detail', loading: false, baseTitle: '企业分级分类', - + formLabelWidth: '90px', showFooter: false, rules: { businessRating: [{required: true, message: '企业分级不能为空', trigger: 'blur'}], diff --git a/client/src/views/xzzfgl/ddjc.vue b/client/src/views/xzzfgl/ddjc.vue index 2d19e1a..a9baeb3 100644 --- a/client/src/views/xzzfgl/ddjc.vue +++ b/client/src/views/xzzfgl/ddjc.vue @@ -226,6 +226,7 @@ const onRemove = (fileList, id, obj, row) => { // 组件删除文件回调 const defaultValues = reactive(DEFAULT_ENTERPRISE_DETAIL) + function findOne(row) { dialogConfig.value.loading = true let defaultVals = { diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseAuditService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseAuditService.java index 29f5f21..5f5cfed 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseAuditService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseAuditService.java @@ -105,6 +105,7 @@ public class EnterpriseAuditService { throw new RuntimeException("联系电话【" + legalPhone + "】在企业上报审核/企业信息管理已存在"); EnterpriseHistory history = new EnterpriseHistory(); BeanUtils.copyProperties(audit, history); + if (null != user) { history.setHistoryTime(now); history.setTheUserName(user.getXm());