diff --git a/src/router/index.js b/src/router/index.js
index 830a59c..120dab2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -454,13 +454,13 @@ export const publicRoutes = [
path: "/socialInformationCrculated",
name: "changeTheClue",
component: () => import("@/views/backOfficeSystem/HumanIntelligence/FollowLeads/index"),
- meta: { title: "转线索", icon: "article" },
+ meta: { title: "转线索列表", icon: "article" },
},
{
path: "/socialInformationCrculatec",
name: "recombinantSynthesis",
component: () => import("@/views/backOfficeSystem/HumanIntelligence/ConversionSynthesis/index"),
- meta: { title: "转合成", icon: "article" },
+ meta: { title: "转合成列表", icon: "article" },
},
{
path: "/CollectPoints",
@@ -765,15 +765,7 @@ export const publicRoutes = [
// // }
// // },
- // // {
- // // path: "/policeReport",
- // // name: "policeReport",
- // // component: () => import("@/views/backOfficeSystem/policeReport/index.vue"),
- // // meta: {
- // // title: "警情管理",
- // // icon: "article"
- // // }
- // // },
+
// ]
// },
@@ -941,7 +933,7 @@ export const publicRoutes = [
component: () => import("@/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index"),
meta: { title: "情报采集", icon: "article" },
},
-
+
// {
// path: "/ResearchHome",
// name: "ResearchHome",
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 68a9e19..14cc2b8 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -83,17 +83,24 @@ export function isShiQingZhi() {
}
-/** 获取当前角色 */
+/** 获取当前用户角色信息 */
export function getRole() {
- const { deptBizType, deptLevel } = getItem('deptId')[0]
- /** 是否是市情指领导 */
- const isShiQzLeader = getItem('roleList').find(item => item.roleCode == 'JS_666666') != undefined
- if (isShiQzLeader) return {label: '市情指领导',value:'01',ename: 'shiQzLeader'}
- /** 是否是市情指人员 */
- const isShiQz = getItem('roleList').find(item => item.roleCode == 'JS_777777') != undefined
- if (isShiQz) return {label: '市情指挥人员',value:'02', ename: 'shiQz'}
- /** 是否是县情指人员 */
- const isXianQz = getItem('roleList').find(item => item.roleCode == 'JS_888888') != undefined
- if (isXianQz) return {label: '县情指人员',value:'03', ename: 'xianQz'}
- return {label: '普通用户',value:'04', ename: 'common'}
+ const roleList = Array.isArray(getItem('roleList')) ? getItem('roleList') : []
+
+ /** 角色配置映射表 */
+ const ROLE_MAP = [
+ { code: 'JS_666666', label: '市情指领导', value: '01', ename: 'shiQzLeader' },
+ { code: 'JS_777777', label: '市情指挥人员', value: '02', ename: 'shiQz' },
+ { code: 'JS_888888', label: '县情指人员', value: '03', ename: 'xianQz' }
+ ]
+
+ /** 按优先级匹配角色 */
+ for (const role of ROLE_MAP) {
+ if (roleList.some(item => item.roleCode === role.code)) {
+ return { label: role.label, value: role.value, ename: role.ename }
+ }
+ }
+
+ /** 默认返回普通用户 */
+ return { label: '普通用户', value: '04', ename: 'common' }
}
diff --git a/src/views/backOfficeSystem/HumanIntelligence/infoCollection/index.vue b/src/views/backOfficeSystem/HumanIntelligence/infoCollection/index.vue
index a9da34a..8d7ee85 100644
--- a/src/views/backOfficeSystem/HumanIntelligence/infoCollection/index.vue
+++ b/src/views/backOfficeSystem/HumanIntelligence/infoCollection/index.vue
@@ -98,7 +98,7 @@
肯定
关注部门
- 创建
+ 打标签
删除
@@ -139,7 +139,8 @@
-
+
@@ -161,6 +162,7 @@ import Fszl from '@/views/backOfficeSystem/HumanIntelligence/components/fszl.vue
import CustomTag from '../components/customTag.vue'
import Configuration from '../components/configuration.vue'
import transferMerchant from "./components/transferMerchant.vue";
+import { isShiQingZhi } from "@/utils/auth.js"
const { proxy } = getCurrentInstance();
const { D_GS_XS_LY, D_BZ_SSZT, D_BZ_SF, D_GS_XS_LX, D_BZ_BQJB,
@@ -180,7 +182,8 @@ const chooseData = (val) => {
})
tableList.value = val
}
-
+/** 市情指 */
+const cityIntelligenceCommand = isShiQingZhi()
const currRow = ref({})
const transferMerchantRef = ref()
const isShowTransferMerchantTc = ref(false)
@@ -567,8 +570,8 @@ const isShowBtn = (btnName, row = {}) => {
const lczt = row.lczt
/** 按钮权限 */
const buttonPermissions = {
- "市情指领导": ["肯定", "采纳", "回退", "分组", "转线索", "转合成", "转会商", "修改", "详情"],
- "市情指挥人员": ["采纳", "回退", "分组", "转线索", "转合成", "转会商", "修改", "详情"],
+ "市情指领导": ["肯定", "采纳", "回退", "分组", "转线索", "转合成", "转会商","打标签", "修改", "详情","关注部门"],
+ "市情指挥人员": ["采纳", "回退", "分组", "转线索", "转合成", "转会商","打标签", "修改", "详情","关注部门"],
"县情指人员": ["上报", "回退", "修改", "详情"],
"部门": ["上报", "新增", "修改", "续报", "详情"]
};