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

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",

src/utils/auth.js

@@ -83,17 +83,24 @@ export function isShiQingZhi() {
 }
 
 
-/** 获取当前角色 */
+/** 获取当前用户角色信息 */
 export function getRole() {
-  const { deptBizType, deptLevel } = getItem('deptId')[0]
+  const roleList = Array.isArray(getItem('roleList')) ? getItem('roleList') : []
-  /** 是否是市情指领导 */
+
-  const isShiQzLeader = getItem('roleList').find(item => item.roleCode == 'JS_666666') != undefined
+  /** 角色配置映射表 */
-  if (isShiQzLeader) return {label: '市情指领导',value:'01',ename: 'shiQzLeader'}
+  const ROLE_MAP = [
-  /** 是否是市情指人员 */
+    { code: 'JS_666666', label: '市情指领导', value: '01', ename: 'shiQzLeader' },
-  const isShiQz = getItem('roleList').find(item => item.roleCode == 'JS_777777') != undefined
+    { code: 'JS_777777', label: '市情指挥人员', value: '02', ename: 'shiQz' },
-  if (isShiQz) return {label: '市情指挥人员',value:'02', ename: 'shiQz'}
+    { code: 'JS_888888', label: '县情指人员', value: '03', ename: 'xianQz' }
-  /** 是否是县情指人员 */
+  ]
-  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'}
+  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' }
 }

src/views/backOfficeSystem/HumanIntelligence/infoCollection/index.vue

@@ -98,7 +98,7 @@
           <el-link v-if="isShowBtn('肯定')" size="small" type="primary" @click="affirm(row)">肯定</el-link>
           <el-link v-if="isShowBtn('关注部门')" size="small" type="primary" @click="FollowUpOnDept(row)">关注部门</el-link>
           <!-- 市局能给所有数据创建标签 -->
-          <el-link v-if="isShowBtn('创建标签')" size="small" type="primary" @click="openCustomTag(row)">创建</el-link>
+          <el-link v-if="isShowBtn('打标签')" size="small" type="primary" @click="openCustomTag(row)">打标签</el-link>
 
           <el-link v-if="isShowBtn('删除')" size="small" type="danger" @click="delDictItem(row.id)">删除</el-link>
 
@@ -139,7 +139,8 @@
   <Configuration v-model="configurationShow" :dataList="dataList" @getList="getList" />
 
   <!-- 转会商 -->
-  <transferMerchant v-if="isShowTransferMerchantTc" :row="currRow" ref="transferMerchantRef" title="转会商" @close="isShowTransferMerchantTc = false" @ok="getList" />
+  <transferMerchant v-if="isShowTransferMerchantTc" :row="currRow" ref="transferMerchantRef" title="转会商"
+    @close="isShowTransferMerchantTc = false" @ok="getList" />
 
 </template>
 
@@ -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 = {
-    "市情指领导": ["肯定", "采纳", "回退", "分组", "转线索", "转合成", "转会商", "修改", "详情"],
+    "市情指领导": ["肯定", "采纳", "回退", "分组", "转线索", "转合成", "转会商","打标签", "修改", "详情","关注部门"],
-    "市情指挥人员": ["采纳", "回退", "分组", "转线索", "转合成", "转会商", "修改", "详情"],
+    "市情指挥人员": ["采纳", "回退", "分组", "转线索", "转合成", "转会商","打标签", "修改", "详情","关注部门"],
     "县情指人员": ["上报", "回退", "修改", "详情"],
     "部门": ["上报", "新增", "修改", "续报", "详情"]
   };