修复执法一张图位置更新不及时、企业分类不显示等bug

client/src/layouts/header/index-svi.vue

@@ -36,7 +36,12 @@
       </div>
     </div>
     <div class="right-profile">
-onfont icon-zngzt_tcdl" @click="handleLogout" title="退出"></i>
+      <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>

client/src/stores/json/topMenu.json

@@ -8,7 +8,12 @@
       "path": "/svi/index",
       "router": true
     },
-
+    {
+      "gncdbh": 2,
+      "name": "执法对象管理",
+      "icon": "zyyy_rzzx",
+      "path": "/dtsjygl/dtsjk",
+      "router": true
     },
     {
       "gncdbh": 12,

client/src/views/big-screen/bigdata.vue

@@ -12,6 +12,7 @@
     <div class="home" @click="goHome"></div>
     <div class="fullScreen" @click="fullScreen"></div>
     <div class="back" @click="goHome">返回首页</div>
+    </div>
     <div class="switch switch2" :class="{ 'switch-active': isMapMarkActive === 2 }" @click="changeMapMark(2)">
       <div class="icon"></div>
       <div class="label">执法记录仪</div>

client/src/views/main/index.vue

@@ -28,6 +28,11 @@
 
   const handleUserInfo = async () => {
     try {
+      if (!userStore.token) {
+        await handleLogin()
+        // 忘记写return导致后面的业务依然在运行。
+        return
+      }
       // 获取用户信息并持久化到浏览器
       await userStore.getUserInfo()
       // 在url没有hash url的时候路由跳转首页

server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenController.java

@@ -23,7 +23,15 @@ import java.util.Map;
 @RequestMapping(Constants.API_PREFIX + "/bigscreen")
 public class BigScreenController {
 
+    private final BigScreenService bigScreenService;
 
+    public BigScreenController(BigScreenService bigScreenService) {
+        this.bigScreenService = bigScreenService;
+    }
+    /**
+     * 数据概览统计
+     *
+     * @param
      * @return 数据概览统计
      */
     @GetMapping("/dataoverview")

server/src/main/java/com/aisino/iles/lawenforcement/controller/HomePageController.java

@@ -49,6 +49,7 @@ public class HomePageController {
         return Ok.of(homePageService.countCurrentNodeCode(user));
     }
 
+
     /**
      * 执法趋势统计
      *

server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterprisePoniteScheduleService.java

@@ -691,6 +691,8 @@ public class EnterprisePoniteScheduleService {
                 log.info("刷新Token");
                 refreshToken();
             }
+        } catch (Exception e) {
+            log.info("危化企业信息查询查询异常：" + e);
         }
         return flag;
     }

server/src/main/java/com/aisino/iles/lawenforcement/schedule/service/EnterpriseScheduleService.java

@@ -167,6 +167,7 @@ public class EnterpriseScheduleService {
                     .body("{\"page\": " + page + ",\"limit\": 1000,\"entity\": {}}")
                     .execute()
                     .body();
+            log.info("企业信息查询结果：{}", body);
             JsonNode jsonNode = objectMapper.readValue(body, JsonNode.class);
             if (jsonNode.has("code") && 200 == jsonNode.get("code").asInt() && jsonNode.has("data")) {
                 JsonNode data = objectMapper.readValue(jsonNode.get("data").toString(), JsonNode.class);

server/src/main/java/com/aisino/iles/lawenforcement/service/BigScreenService.java

@@ -77,7 +77,9 @@ public class BigScreenService {
 //        Long ajs = bigScreenRepository.getajs();
         Map<String, Long> res = new HashMap<>();
 //        res.put("qys", qys);
-
+//        res.put("ajs", ajs);
+        return res;
+    }
 
     public Map<String, Long> getEnterpriseStatistics(RemoteUserInfo user) {
         String agencyCode = com.aisino.iles.common.util.StringUtils.trimEven0(user.getGajgjgdm()) + "%";