From 2da64dca741938e948b170ba4cfc6ceae2842bde Mon Sep 17 00:00:00 2001
From: heli02 <huxin02@aisino.com>
Date: Fri, 22 Aug 2025 19:48:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9D=A3=E5=AF=BC=E6=A3=80=E6=9F=A5bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=B3=BB=E7=BB=9Fbug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/layouts/header/index-svi.vue                  | 9 ++++++++-
 client/src/router/index.js                               | 2 +-
 client/src/views/dtsjygl/dtsjk.vue                       | 8 +++++++-
 client/src/views/fxczfgl/zxxcxx.vue                      | 3 +++
 client/src/views/main/index.vue                          | 1 +
 .../com/aisino/iles/lawenforcement/model/Zfzbgl.java     | 4 +++-
 .../iles/lawenforcement/model/dto/OnlinePatrolDto.java   | 2 ++
 .../iles/lawenforcement/service/ZsfzglService.java       | 1 -
 8 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/client/src/layouts/header/index-svi.vue b/client/src/layouts/header/index-svi.vue
index 52a92d6..2c28304 100644
--- a/client/src/layouts/header/index-svi.vue
+++ b/client/src/layouts/header/index-svi.vue
@@ -35,7 +35,14 @@
         </span>
       </div>
     </div>
-
+    <div class="right-profile">
+      <span class="zyt" @click="skipPage"><i>综合执法一张图</i></span>
+      <i class="iconfont icon-zngzt_zfdc" v-if="projectName == 'gzt'" title="编辑桌面"></i>
+      <i class="iconfont icon-zngzt_syfw" v-if="projectName != 'gzt'" @click="handleTo({ path: 'gzt' })" title="首页"></i>
+      <NotificationBell/>
+      <public-full-screen></public-full-screen>
+      <i class="iconfont icon-zngzt_tcdl" @click="handleLogout" title="退出"></i>
+    </div>
   </div>
 </template>
 <script setup>
diff --git a/client/src/router/index.js b/client/src/router/index.js
index f87dbcc..e68a068 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -24,7 +24,7 @@ const baseRoutes = [
         children: [
             {
                 path: 'index',
-
+                name: 'SviIndex',
                 component: () => import('@views/main/svi.vue'),
                 meta: {
                     title: '首页',
diff --git a/client/src/views/dtsjygl/dtsjk.vue b/client/src/views/dtsjygl/dtsjk.vue
index 09f776d..ebd4495 100644
--- a/client/src/views/dtsjygl/dtsjk.vue
+++ b/client/src/views/dtsjygl/dtsjk.vue
@@ -112,7 +112,13 @@ const state = reactive({
     rules: {
       industryType: [{ required: true, message: '监管行业不能为空', trigger: 'blur' }],
       unitName: [{ required: true, message: '生产经营单位名称不能为空', trigger: 'blur' }],
-   uired: true, message: '属地不能为空', trigger: 'blur' }],
+      shortName: [{ required: true, message: '单位简称不能为空', trigger: 'blur' }],
+      unifiedSocialCode: [{ required: true, message: '社会统一信用代码不能为空', trigger: 'blur' }],
+      businessStatus: [{ required: true, message: '营业状态不能为空', trigger: 'blur' }],
+      orgCode: [{ required: false, message: '所属机构不能为空', trigger: 'blur' }],
+      legalRepresentative: [{ required: true, message: '法定代表人（经营者）姓名不能为空', trigger: 'blur' }],
+      contactPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
+      agency: [{ required: true, message: '属地不能为空', trigger: 'blur' }],
       legalPhone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
       legalDuty: [{ required: true, message: '法定代表人（经营者）职位不能为空', trigger: 'blur' }],
       regulatedIndustry: [{ required: true, message: '国民经济行业分类不能为空', trigger: 'blur' }],
diff --git a/client/src/views/fxczfgl/zxxcxx.vue b/client/src/views/fxczfgl/zxxcxx.vue
index 28fbf70..3d33bb5 100644
--- a/client/src/views/fxczfgl/zxxcxx.vue
+++ b/client/src/views/fxczfgl/zxxcxx.vue
@@ -60,6 +60,9 @@
     <el-table-column prop="infoAccessMsg" 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>
       <el-dialog class="business-dialog" v-model="dialogConfig.show" :show-close="false" :append-to-body="true"
diff --git a/client/src/views/main/index.vue b/client/src/views/main/index.vue
index d576318..7eec611 100644
--- a/client/src/views/main/index.vue
+++ b/client/src/views/main/index.vue
@@ -39,6 +39,7 @@
       const hashUrl = window.location.hash.slice(1)
       if (hashUrl && hashUrl === '/') {
         //route.push('/svi/index')
+
       }
     } catch (error) {
       handleLogin()
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/model/Zfzbgl.java b/server/src/main/java/com/aisino/iles/lawenforcement/model/Zfzbgl.java
index 7c4d5cb..2814068 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/model/Zfzbgl.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/model/Zfzbgl.java
@@ -45,7 +45,9 @@ public class Zfzbgl extends BaseModel {
     @Comment("属地代码")
     private String sddm;
 
-
+    @Column(length = 200)
+    @Comment("属地名称")
+    private String sdmc;
 
 
     @Column(length = 200)
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/model/dto/OnlinePatrolDto.java b/server/src/main/java/com/aisino/iles/lawenforcement/model/dto/OnlinePatrolDto.java
index 2af84ca..b3f3b7e 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/model/dto/OnlinePatrolDto.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/model/dto/OnlinePatrolDto.java
@@ -17,6 +17,8 @@ public class OnlinePatrolDto {
     private MultipartFile[] files;//附件
     private String createUserId;//录入人id
     private String createUserName;//录入人名称
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;//录入时间
 
     private String approvalStatus;//审批状态
     private String approvalUserId;//审批人id
diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/ZsfzglService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/ZsfzglService.java
index 4e18982..e77ac06 100644
--- a/server/src/main/java/com/aisino/iles/lawenforcement/service/ZsfzglService.java
+++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/ZsfzglService.java
@@ -37,7 +37,6 @@ public class ZsfzglService {
         return zsfzglRepository.findAll(buildQueryCondition(query));
     }
 
-
     public Page<Zsfzgl> page(ZsfzglQuery query, RemoteUserInfo user) {
         Integer _psize = Optional.ofNullable(query.pageSize()).filter(f -> f > 0).orElse(20);
         Integer _page = Optional.ofNullable(query.page()).filter(f -> f > 0).map(f -> f - 1).orElse(0);