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

src/api/user-manage.js

@@ -599,7 +599,7 @@ export const selectUserDeptPage = (data = {}) => {
 ///unifiedLogin
 export const unifiedLogin = (data) => {
   return request({
-    url: api + `/unifiedLogin`,
+    url: api + `/ssoLogin`,
     method: "POST",
     data
   });

src/router/index.js

@@ -130,422 +130,425 @@ export const privateRoutes = [
 /**
  * 公开路由表
  */
-export const publicRoutes = [
+export const publicRoutes = [{
-  {
+  path: "/oatuh_login",
-    path: "/login",
+  component: () => import("@/views/login/oatuh_login") //统一登录
-    name: "login",
+},
-    component: () => import("@/views/login/index")
+{
-  },
+  path: "/login",
-  {
+  name: "login",
-    path: "/",
+  component: () => import("@/views/login/index")
-    name: "home",
+},
-    component: () => import("@/views/home/index") //系统登录
+{
-  },
+  path: "/",
-  {
+  name: "home",
-    path: "/KeyPopulations",
+  component: () => import("@/views/home/index") //系统登录
-    name: "KeyPopulations",
+},
-    component: () => import("@/views/KeyPopulations/index") //系统登录
+{
-  },
+  path: "/KeyPopulations",
-  {
+  name: "KeyPopulations",
-    path: "/editPassword", // 注意：带有路径“/”的记录中的组件“默认”是一个不返回 Promise 的函数
+  component: () => import("@/views/KeyPopulations/index") //系统登录
-    component: layout,
+},
-    redirect: "/IdentityManage",
+{
-    children: [
+  path: "/editPassword", // 注意：带有路径“/”的记录中的组件“默认”是一个不返回 Promise 的函数
-      {
+  component: layout,
-        path: "/FourColorWarning",
+  redirect: "/IdentityManage",
-        name: "FourColorWarning",
+  children: [
-        meta: { title: "四色预警管理", icon: "article" },
+    {
-        children: [
+      path: "/FourColorWarning",
-          {
+      name: "FourColorWarning",
-            path: "/IdentityManage",
+      meta: { title: "四色预警管理", icon: "article" },
-            name: "IdentityManage",
+      children: [
-            component: () =>
+        {
-              import(
+          path: "/IdentityManage",
-                "@/views/backOfficeSystem/fourColorManage/IdentityManage/index"
+          name: "IdentityManage",
-              ),
+          component: () =>
-            meta: {
+            import(
-              title: "身份标签管理",
+              "@/views/backOfficeSystem/fourColorManage/IdentityManage/index"
-              icon: "article"
+            ),
-            }
+          meta: {
-          },
+            title: "身份标签管理",
-          {
+            icon: "article"
-            path: "/BehaviorLabels",
-            name: "BehaviorLabels",
-            component: () =>
-              import(
-                "@/views/backOfficeSystem/fourColorManage/BehaviorLabels/index"
-              ),
-            meta: {
-              title: "行为标签管理",
-              icon: "article"
-            }
-          },
-          {
-            path: "/tagManage",
-            name: "tagManage",
-            component: () =>
-              import(
-                "@/views/backOfficeSystem/fourColorManage/tagManage/index"
-              ),
-            meta: {
-              title: "标签组合管理",
-              icon: "article"
-            }
           }
-        ]
+        },
-      },
+        {
-      {
+          path: "/BehaviorLabels",
-        path: "/IntelligentControl",
+          name: "BehaviorLabels",
-        name: "IntelligentControl",
+          component: () =>
-        meta: { title: "智能布控", icon: "article" },
+            import(
-        children: [
+              "@/views/backOfficeSystem/fourColorManage/BehaviorLabels/index"
-          {
+            ),
-            path: "/warningControl",
+          meta: {
-            name: "warningControl",
+            title: "行为标签管理",
-            component: () => import("@/views/backOfficeSystem/IntelligentControl/warningControl/index"),
+            icon: "article"
-            meta: {
-              title: "预警中心",
-              icon: "article"
-            }
-          },
-          {
-            path: "/DeploymentArea",
-            name: "DeploymentArea",
-            component: () => import("@/views/backOfficeSystem/IntelligentControl/DeploymentArea/index"),
-            meta: {
-              title: "布控区域",
-              icon: "article"
-            }
-          },
-          {
-            path: "/myControl",
-            name: "myControl",
-            component: () => import("@/views/backOfficeSystem/IntelligentControl/myControl/index"),
-            meta: {
-              title: "我的布控",
-              icon: "article"
-            }
-          },
-          {
-            path: "/DeploymentAudit",
-            name: "DeploymentAudit",
-            component: () => import("@/views/backOfficeSystem/IntelligentControl/DeploymentAudit/index"),
-            meta: {
-              title: "我的审核",
-              icon: "article"
-            }
-          },
-          {
-            path: "/ControlApproval",
-            name: "ControlApproval",
-            component: () => import("@/views/backOfficeSystem/IntelligentControl/ControlApproval/index"),
-            meta: {
-              title: "我的审批",
-              icon: "article"
-            }
           }
-        ]
+        },
-      },
+        {
-      {
+          path: "/tagManage",
-        path: "/ResearchJudgment",
+          name: "tagManage",
-        name: "ResearchJudgment",
+          component: () =>
-        meta: { title: "线索研判盯办系统", icon: "article" },
+            import(
-        children: [
+              "@/views/backOfficeSystem/fourColorManage/tagManage/index"
-          {
+            ),
-            path: "/DatAcquisition",
+          meta: {
-            name: "DatAcquisition",
+            title: "标签组合管理",
-            component: () => import("@/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index"),
+            icon: "article"
-            meta: {
+          }
-              title: "情报数据采集",
+        }
-              icon: "article"
+      ]
-            }
+    },
-          },
+    {
-          {
+      path: "/IntelligentControl",
-            path: "/MoralAnalysis",
+      name: "IntelligentControl",
-            name: "MoralAnalysis",
+      meta: { title: "智能布控", icon: "article" },
-            component: () => import("@/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index"),
+      children: [
-            meta: {
+        {
-              title: "情报语义分析",
+          path: "/warningControl",
-              icon: "article"
+          name: "warningControl",
-            }
+          component: () => import("@/views/backOfficeSystem/IntelligentControl/warningControl/index"),
-          },
+          meta: {
-          {
+            title: "预警中心",
-            path: "/IntelligenceManagement",
+            icon: "article"
-            name: "IntelligenceManagement",
+          }
-            component: () => import("@/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index"),
+        },
-            meta: {
+        {
-              title: "情报管理",
+          path: "/DeploymentArea",
-              icon: "article"
+          name: "DeploymentArea",
-            }
+          component: () => import("@/views/backOfficeSystem/IntelligentControl/DeploymentArea/index"),
-          },
+          meta: {
-          {
+            title: "布控区域",
-            path: "/InformationFlows",
+            icon: "article"
-            name: "InformationFlows",
+          }
-            meta: { title: "情报流转", icon: "article" },
+        },
-            redirect: "/InformationFlow",
+        {
-            children: [
+          path: "/myControl",
-              {
+          name: "myControl",
-                path: "/InstructionInformation",
+          component: () => import("@/views/backOfficeSystem/IntelligentControl/myControl/index"),
-                name: "InstructionInformation",
+          meta: {
-                component: () => import("@/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/index"),
+            title: "我的布控",
-                meta: {
+            icon: "article"
-                  title: "指令信息",
+          }
-                  icon: "article"
+        },
-                }
+        {
-              },
+          path: "/DeploymentAudit",
-              {
+          name: "DeploymentAudit",
-                path: "/StatisticalAnalysis",
+          component: () => import("@/views/backOfficeSystem/IntelligentControl/DeploymentAudit/index"),
-                name: "StatisticalAnalysis",
+          meta: {
-                component: () => import("@/views/backOfficeSystem/ResearchJudgment/InformationFlows/StatisticalAnalysis/index"),
+            title: "我的审核",
-                meta: {
+            icon: "article"
-                  title: "情报统计分析",
+          }
-                  icon: "article"
+        },
-                }
+        {
+          path: "/ControlApproval",
+          name: "ControlApproval",
+          component: () => import("@/views/backOfficeSystem/IntelligentControl/ControlApproval/index"),
+          meta: {
+            title: "我的审批",
+            icon: "article"
+          }
+        }
+      ]
+    },
+    {
+      path: "/ResearchJudgment",
+      name: "ResearchJudgment",
+      meta: { title: "线索研判盯办系统", icon: "article" },
+      children: [
+        {
+          path: "/DatAcquisition",
+          name: "DatAcquisition",
+          component: () => import("@/views/backOfficeSystem/ResearchJudgment/DatAcquisition/index"),
+          meta: {
+            title: "情报数据采集",
+            icon: "article"
+          }
+        },
+        {
+          path: "/MoralAnalysis",
+          name: "MoralAnalysis",
+          component: () => import("@/views/backOfficeSystem/ResearchJudgment/MoralAnalysis/index"),
+          meta: {
+            title: "情报语义分析",
+            icon: "article"
+          }
+        },
+        {
+          path: "/IntelligenceManagement",
+          name: "IntelligenceManagement",
+          component: () => import("@/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index"),
+          meta: {
+            title: "情报管理",
+            icon: "article"
+          }
+        },
+        {
+          path: "/InformationFlows",
+          name: "InformationFlows",
+          meta: { title: "情报流转", icon: "article" },
+          redirect: "/InformationFlow",
+          children: [
+            {
+              path: "/InstructionInformation",
+              name: "InstructionInformation",
+              component: () => import("@/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/index"),
+              meta: {
+                title: "指令信息",
+                icon: "article"
+              }
+            },
+            {
+              path: "/StatisticalAnalysis",
+              name: "StatisticalAnalysis",
+              component: () => import("@/views/backOfficeSystem/ResearchJudgment/InformationFlows/StatisticalAnalysis/index"),
+              meta: {
+                title: "情报统计分析",
+                icon: "article"
               }
-            ]
-          },
-          {
-            path: "/RecordsOperations",
-            name: "RecordsOperations",
-            component: () => import("@/views/backOfficeSystem/ResearchJudgment/RecordsOperations/index"),
-            meta: {
-              title: "操作记录",
-              icon: "article"
             }
-          }
+          ]
-        ]
-      },
-      {
-        path: "/HumanIntelligence",
-        name: "HumanIntelligence",
-        meta: { title: "人力情报采集管理系统", icon: "article" },
-        children: [
-          {
-            path: "/CollectCrculate",
-            name: "CollectCrculate",
-            component: () =>
-              import(
-                "@/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index"
-              ),
-            meta: {
-              title: "人力情报信息采集流转",
-              icon: "article"
-            }
-          },
-          {
-            path: "/RlStatisticalAnalysis",
-            name: "RlStatisticalAnalysis",
-            component: () =>
-              import(
-                "@/views/backOfficeSystem/HumanIntelligence/RlStatisticalAnalysis/index"
-              ),
-            meta: {
-              title: "人力情报统计分析",
-              icon: "article"
-            }
-          },
-
-          {
-            path: "/TaskScheduling",
-            name: "TaskScheduling",
-            component: () =>
-              import(
-                "@/views/backOfficeSystem/HumanIntelligence/TaskScheduling/index"
-              ),
-            meta: {
-              title: "人力情报信息搜索任务调度",
-              icon: "article"
-            }
-          },
-          {
-            path: "/ConstructionManagement",
-            name: "ConstructionManagement",
-            component: () =>
-              import(
-                "@/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/index"
-              ),
-            meta: {
-              title: "社会信息人员建设管理",
-              icon: "article"
-            }
-          },
-          {
-            path: "/JobAppraisal",
-            name: "JobAppraisal",
-            component: () => import("@/views/backOfficeSystem/HumanIntelligence/JobAppraisal/index"),
-            meta: {
-              title: "社会员工工作信息考核",
-              icon: "article"
-            }
-          },
-        ]
-      },
-      {
-        path: "/ExcavationResearch",
-        name: "ExcavationResearch",
-        meta: { title: "重点人发掘研判", icon: "article" },
-        children: [
-          {
-            path: "/PreliminaryExcavations",
-            name: "PreliminaryExcavations",
-            component: () =>
-              import(
-                "@/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index"
-              ),
-            meta: {
-              title: "重点人员初步发掘",
-              icon: "article"
-            }
-          },
-          {
-            path: "/ZdryFjyp",
-            name: "ZdryFjyp",
-            component: () =>
-              import(
-                "@/views/backOfficeSystem/ExcavationResearch/ZdryFjyp/index"
-              ),
-            meta: {
-              title: "重点人员深度发掘",
-              icon: "article"
-            }
-          },
-          {
-            path: "/LandingAudit",
-            name: "LandingAudit",
-            component: () =>
-              import(
-                "@/views/backOfficeSystem/ExcavationResearch/LandingAudit/index"
-              ),
-            meta: {
-              title: "重点人员落地审核",
-              icon: "article"
-            }
-          },
-          {
-            path: "/WarningModel",
-            name: "WarningModel",
-            component: () =>
-              import(
-                "@/views/backOfficeSystem/ExcavationResearch/WarningModel/index"
-              ),
-            meta: {
-              title: "重点人员预警模型",
-              icon: "article"
-            }
-          },
-
-        ]
-      },
-      {
-        path: "/JudgmentHome",
-        name: "JudgmentHome",
-        redirect: "/ResearchHome",
-        meta: {
-          title: "研判首页",
-          icon: "article"
         },
-        children: [
+        {
-          {
+          path: "/RecordsOperations",
-            path: "/ResearchHome",
+          name: "RecordsOperations",
-            name: "ResearchHome",
+          component: () => import("@/views/backOfficeSystem/ResearchJudgment/RecordsOperations/index"),
-            component: () => import("@/views/backOfficeSystem/JudgmentHome/ResearchHome/index"),
+          meta: {
-            meta: {
+            title: "操作记录",
-              title: "专题研判",
+            icon: "article"
-              icon: "article"
+          }
-            }
+        }
-          },
+      ]
-          {
+    },
-            path: "/tsypHome",
+    {
-            name: "tsypHome",
+      path: "/HumanIntelligence",
-            component: () => import("@/views/backOfficeSystem/JudgmentHome/tsypHome/index"),
+      name: "HumanIntelligence",
-            meta: {
+      meta: { title: "人力情报采集管理系统", icon: "article" },
-              title: "态势研判",
+      children: [
-              icon: "article"
+        {
-            }
+          path: "/CollectCrculate",
-          },
+          name: "CollectCrculate",
-          {
+          component: () =>
-            path: "/MeetingRoom",
+            import(
-            name: "MeetingRoom",
+              "@/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index"
-            component: () => import("@/views/backOfficeSystem/JudgmentHome/MeetingRoom/index"),
+            ),
-            meta: {
+          meta: {
-              title: "网上会商室",
+            title: "人力情报信息采集流转",
-              icon: "article"
+            icon: "article"
-            }
+          }
+        },
+        {
+          path: "/RlStatisticalAnalysis",
+          name: "RlStatisticalAnalysis",
+          component: () =>
+            import(
+              "@/views/backOfficeSystem/HumanIntelligence/RlStatisticalAnalysis/index"
+            ),
+          meta: {
+            title: "人力情报统计分析",
+            icon: "article"
           }
-        ]
-      },
-      {
-        path: "/DeploymentDisposal",
-        name: "DeploymentDisposal",
-        redirect: "/ResearchHome",
-        meta: {
-          title: "全域布控处置",
-          icon: "article"
         },
-        children: [
-          {
-            path: "/mpvPeo",
-            name: "mpvPeo",
-            component: () =>import("@/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index"),
-            meta: {
-              title: "重点人管理",
-              icon: "article"
-            }
-          },
-          {
-            path: "/mpvPeoSh",
-            name: "mpvPeoSh",
-            component: () =>import("@/views/backOfficeSystem/DeploymentDisposal/mpvPeoSh/index"),
-            meta: {
-              title: "重点人审批",
-              icon: "article"
-            }
-          },
-          {
-            path: "/mpvGroup",
-            name: "mpvGroup",
-            component: () =>import("@/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index"),
-            meta: {
-              title: "重点群体管理",
-              icon: "article"
-            }
-          },
-          {
-            path: "/mpvGroupSh",
-            name: "mpvGroupSh",
-            component: () =>import("@/views/backOfficeSystem/DeploymentDisposal/mpvGroupSh/index"),
-            meta: {
-              title: "重点群体审核",
-              icon: "article"
-            }
-          },
 
-        ]
+        {
-      },
+          path: "/TaskScheduling",
-      {
+          name: "TaskScheduling",
-        path: "/BasicManagement",
+          component: () =>
-        name: "BasicManagement",
+            import(
-        meta: {
+              "@/views/backOfficeSystem/HumanIntelligence/TaskScheduling/index"
-          title: "基础管理",
+            ),
-          icon: "article"
+          meta: {
-        },
+            title: "人力情报信息搜索任务调度",
-        children: [
+            icon: "article"
-          {
-            path: "/surveillanceControl",
-            name: "surveillanceControl",
-            component: () =>
-              import(
-                "@/views/backOfficeSystem/BasicManagement/surveillanceControl/index"
-              ),
-            meta: {
-              title: "布控监视",
-              icon: "article"
-            }
           }
-        ]
+        },
-      }
+        {
-    ]
+          path: "/ConstructionManagement",
-  }
+          name: "ConstructionManagement",
+          component: () =>
+            import(
+              "@/views/backOfficeSystem/HumanIntelligence/ConstructionManagement/index"
+            ),
+          meta: {
+            title: "社会信息人员建设管理",
+            icon: "article"
+          }
+        },
+        {
+          path: "/JobAppraisal",
+          name: "JobAppraisal",
+          component: () => import("@/views/backOfficeSystem/HumanIntelligence/JobAppraisal/index"),
+          meta: {
+            title: "社会员工工作信息考核",
+            icon: "article"
+          }
+        },
+      ]
+    },
+    {
+      path: "/ExcavationResearch",
+      name: "ExcavationResearch",
+      meta: { title: "重点人发掘研判", icon: "article" },
+      children: [
+        {
+          path: "/PreliminaryExcavations",
+          name: "PreliminaryExcavations",
+          component: () =>
+            import(
+              "@/views/backOfficeSystem/ExcavationResearch/PreliminaryExcavations/index"
+            ),
+          meta: {
+            title: "重点人员初步发掘",
+            icon: "article"
+          }
+        },
+        {
+          path: "/ZdryFjyp",
+          name: "ZdryFjyp",
+          component: () =>
+            import(
+              "@/views/backOfficeSystem/ExcavationResearch/ZdryFjyp/index"
+            ),
+          meta: {
+            title: "重点人员深度发掘",
+            icon: "article"
+          }
+        },
+        {
+          path: "/LandingAudit",
+          name: "LandingAudit",
+          component: () =>
+            import(
+              "@/views/backOfficeSystem/ExcavationResearch/LandingAudit/index"
+            ),
+          meta: {
+            title: "重点人员落地审核",
+            icon: "article"
+          }
+        },
+        {
+          path: "/WarningModel",
+          name: "WarningModel",
+          component: () =>
+            import(
+              "@/views/backOfficeSystem/ExcavationResearch/WarningModel/index"
+            ),
+          meta: {
+            title: "重点人员预警模型",
+            icon: "article"
+          }
+        },
+
+      ]
+    },
+    {
+      path: "/JudgmentHome",
+      name: "JudgmentHome",
+      redirect: "/ResearchHome",
+      meta: {
+        title: "研判首页",
+        icon: "article"
+      },
+      children: [
+        {
+          path: "/ResearchHome",
+          name: "ResearchHome",
+          component: () => import("@/views/backOfficeSystem/JudgmentHome/ResearchHome/index"),
+          meta: {
+            title: "专题研判",
+            icon: "article"
+          }
+        },
+        {
+          path: "/tsypHome",
+          name: "tsypHome",
+          component: () => import("@/views/backOfficeSystem/JudgmentHome/tsypHome/index"),
+          meta: {
+            title: "态势研判",
+            icon: "article"
+          }
+        },
+        {
+          path: "/MeetingRoom",
+          name: "MeetingRoom",
+          component: () => import("@/views/backOfficeSystem/JudgmentHome/MeetingRoom/index"),
+          meta: {
+            title: "网上会商室",
+            icon: "article"
+          }
+        }
+      ]
+    },
+    {
+      path: "/DeploymentDisposal",
+      name: "DeploymentDisposal",
+      redirect: "/ResearchHome",
+      meta: {
+        title: "全域布控处置",
+        icon: "article"
+      },
+      children: [
+        {
+          path: "/mpvPeo",
+          name: "mpvPeo",
+          component: () => import("@/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index"),
+          meta: {
+            title: "重点人管理",
+            icon: "article"
+          }
+        },
+        {
+          path: "/mpvPeoSh",
+          name: "mpvPeoSh",
+          component: () => import("@/views/backOfficeSystem/DeploymentDisposal/mpvPeoSh/index"),
+          meta: {
+            title: "重点人审批",
+            icon: "article"
+          }
+        },
+        {
+          path: "/mpvGroup",
+          name: "mpvGroup",
+          component: () => import("@/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index"),
+          meta: {
+            title: "重点群体管理",
+            icon: "article"
+          }
+        },
+        {
+          path: "/mpvGroupSh",
+          name: "mpvGroupSh",
+          component: () => import("@/views/backOfficeSystem/DeploymentDisposal/mpvGroupSh/index"),
+          meta: {
+            title: "重点群体审核",
+            icon: "article"
+          }
+        },
+
+      ]
+    },
+    {
+      path: "/BasicManagement",
+      name: "BasicManagement",
+      meta: {
+        title: "基础管理",
+        icon: "article"
+      },
+      children: [
+        {
+          path: "/surveillanceControl",
+          name: "surveillanceControl",
+          component: () =>
+            import(
+              "@/views/backOfficeSystem/BasicManagement/surveillanceControl/index"
+            ),
+          meta: {
+            title: "布控监视",
+            icon: "article"
+          }
+        }
+      ]
+    }
+  ]
+}
 ];
 
 const router = createRouter({

src/store/modules/user.js

@@ -221,7 +221,7 @@ export default {
         removeAllItem();
         // 待补充 清理权限相关的配置
         if (isOatuh) {
-          window.location.href = `http://80.149.27.78:8001/login`;
+          window.location.href = `http://155.240.22.102:40992`;
         } else {
           router.push("/login");
         }

src/views/login/oatuh_login.vue

@@ -0,0 +1,42 @@
+<template></template>
+
+<script setup>
+import { ref, onMounted } from "vue";
+import { useStore } from "vuex";
+import { useRouter } from "vue-router";
+import {
+  setItem
+} from "@/utils/storage";
+const loginDialog = ref(false);
+const deptList = ref([]);
+const store = useStore();
+function redirectAuth() {
+
+  let token = location.hash.slice(20) || null;
+  if (token != null) {
+    token = token.replace(/\ +/g, "");
+    setItem("SSOTOKEN", token)
+    handleLogin({ token: token});
+  } else {
+    window.location.href = `http://155.240.22.102:40992`;
+  }
+}
+
+const handleLogin = (e) => {
+  store.dispatch("user/oatuhLogin", e).then((res) => {
+    // 登录后操作
+    if (res.deptList.length === 1) {
+      window.location.hash = "/";
+    } else {
+      deptList.value = [...res.deptList];
+      loginDialog.value = true;
+      authorization.value = res.jwtToken;
+    }
+  });
+};
+onMounted(() => {
+  redirectAuth();
+});
+</script>
+
+<style></style>