Merge branch 'main' of http://61.139.16.27:26684/zy_oyj/sgxt_web

src/permission.js

@@ -21,9 +21,9 @@ router.beforeEach(async (to, from, next) => {
   // 存在 token ，进入主页
   // if (store.state.user.token) {
   // 快捷访问
-  console.log(store.getters.token);
+  // console.log(store.getters.token);
   if (store.getters.token) {
-    console.log("路由1");
+    // console.log("路由1");
 
     // 判断用户资料是否获取
     // 若不存在用户信息，则需要获取用户信息
@@ -32,39 +32,39 @@ router.beforeEach(async (to, from, next) => {
     // 添加完动态路由之后，需要在进行一次主动跳转
     const afterMenuList = getItem('menusPermission');
     // 处理用户权限，筛选出需要添加的权限
-    console.log(store.state.permission.routes);
+    // console.log(store.state.permission.routes);
 
     if (store.state.permission.routes.length === 0) {
       const filterRoutes = await store.dispatch('permission/filterRoutes', afterMenuList)
       filterRoutes.forEach(item => {
         router.addRoute(item)
       })
-      console.log("已添加动态路由");
+      // console.log("已添加动态路由");
       next({
         ...to,
         replace: true
       })
     } else {
-      console.log('已存在路由');
+      // console.log('已存在路由');
       next()
     }
     // 利用 addRoute 循环添加
   } else {
     // 没有token的情况下，可以进入白名单
     if (whiteList.indexOf(to.path) > -1) {
-      console.log("路由2");
+      // console.log("路由2");
       next()
     } else {
       const cookie = getCookie("clientKey");
       if (cookie) {
-        console.log("路由3");
+        // console.log("路由3");
         next(`/zeroTrust_login`)
       } else {
-        console.log("路由4");
+        // console.log("路由4");
         const isOatuh = getItem('isOatuh')
         // 没有token的情况下，可以进入白名单
         if (isOatuh) {
-          console.log("路由5");
+          // console.log("路由5");
           const idEntityCard = getItem('idEntityCard')
           next(`/oatuh_login?token=${Base64.encode(idEntityCard)}`)
         } else {

src/router/index.js

@@ -562,7 +562,16 @@ export const publicRoutes = [
               title: "采集积分",
               icon: "article"
             }
+          },
+          {
+            path: "/policeReport",
+            name: "policeReport",
+            component: () => import("@/views/backOfficeSystem/policeReport/index.vue"),
+            meta: {
+              title: "警情管理",
+              icon: "article"
             }
+          },
           // {
           //   path: "/MakeAcomment",
           //   name: "MakeAcomment",
@@ -849,15 +858,15 @@ export const publicRoutes = [
           //   }
           // },
 
-          {
+          // {
-            path: "/policeReport",
+          //   path: "/policeReport",
-            name: "policeReport",
+          //   name: "policeReport",
-            component: () => import("@/views/backOfficeSystem/policeReport/index.vue"),
+          //   component: () => import("@/views/backOfficeSystem/policeReport/index.vue"),
-            meta: {
+          //   meta: {
-              title: "警情管理",
+          //     title: "警情管理",
-              icon: "article"
+          //     icon: "article"
-            }
+          //   }
-          },
+          // },
 
         ]
       },

src/views/backOfficeSystem/fourColorManage/warningControl/behaviorWarning/index.vue

@@ -211,7 +211,7 @@ const bqYs = (val) => {
 const assessShow = ref(false)
 const dataList = ref()
 const pushAssess = (val) => {
-  return holographicProfileJump(val?.rysfzh) // 全息档案跳转
+  return holographicProfileJump(val?.sfzh) // 全息档案跳转
   // assessShow.value = true;
   // dataList.value = val;
 }

src/views/backOfficeSystem/fourColorManage/warningControl/identityWarning/index.vue

@@ -229,7 +229,7 @@ const handleQsFk = (val, type) => {
 const assessShow = ref(false)
 const dataList = ref()
 const pushAssess = (val) => {
-  return holographicProfileJump(val?.rysfzh) // 全息档案跳转
+  return holographicProfileJump(val?.sfzh) // 全息档案跳转
   // assessShow.value = true;
   // dataList.value = val;
 }