update

.env.production

@@ -6,9 +6,9 @@ VITE_APP_PORT = 3000
 # 是否启用加密,应与服务配合使用,否则会一端加密,一端不解密
 VITE_USE_CRYPTO = false
 # 代理前缀
-VITE_APP_BASE_API = '/ts/frame/api'
+VITE_APP_BASE_API = '/cxyy/api'
 
-VITE_APP_HOST = "http://broadcast.waityou24.cn"
+VITE_APP_HOST = "http://10.120.114.6"
 
 VITE_BASE_URL = "/cxyyAdmin"
 VITE_OUT_DIR = "cxyyAdmin"

src/utils/directives.js

@@ -8,7 +8,7 @@ const InitDirective = (app) => {
       const { value: code } = binding
       const rUser = toRaw(user)
       // 超级管理员不进行检查
-      if (get(rUser, 'role').includes('Admin') && get(rUser, 'is_super') === '0') return
+      if (get(rUser, 'is_super') === '0') return
       const roleCode = get(rUser, 'role_code')
       // 需要判断roleCode中是否有这个权限.但是权限又需要路由拼接起来,最少也得有上层级组合
       const cr = router.currentRoute.value

src/views/user/admin/index.vue

@@ -138,7 +138,7 @@ const toChangeUse = async (data) => {
 }
 const dialog = ref(false)
 const form = ref({})
-const defaultForm = { is_use: '0' }
+const defaultForm = { is_use: '0', role: [] }
 
 const formFields = ref([])
 const formFieldsForCreate = [
@@ -154,7 +154,7 @@ const formFieldsForUpdate = [
 ]
 const notSuperFields = [
   { label: t('所属部门'), model: 'dept', custom: true },
-  { label: t('pages.admin.role'), model: 'role', type: 'select' }
+  { label: t('pages.admin.role'), model: 'role', type: 'selectMany' }
 ]
 const toAdd = () => {
   formFields.value = formFieldsForCreate
@@ -197,10 +197,19 @@ const getDept = (data) => {
   return result.name
 }
 const getRole = (data) => {
-  const res = roleList.value.find((f) => f.code === data)
-  return get(res, 'name')
+  const rd = toRaw(data)
+  if (!isArray(rd)) return
+  const list = []
+  for (const i of rd) {
+    const res = roleList.value.find((f) => f.code === i)
+    if (res) list.push(get(res, 'name'))
+  }
+
+  return list.join(';')
 }
 const getDict = (data) => {
+  console.log(data)
+  console.log(isUseList.value)
   const res = isUseList.value.find((f) => f.value == data)
   return get(res, 'label')
 }