+
@@ -143,24 +152,20 @@ onMounted(async () => {
-
-
- 复制
+
@@ -194,7 +199,7 @@ onMounted(async () => {
justify-content: flex-end;
.content {
max-width: calc(100% - 110px);
- padding: 10px 15px;
+ padding: 10px 10px;
background: #edf3ff;
border-radius: 10px;
}
@@ -218,13 +223,18 @@ onMounted(async () => {
margin-right: 5px;
}
.content {
- max-width: calc(100% - 110px);
- padding: 10px 15px;
+ padding: 10px 10px;
background: #ffffff;
box-shadow: 0px 2px 10px 0px rgba(128, 135, 152, 0.4);
border-radius: 10px;
border: 1px solid #e3ebfc;
}
+ .width-auto {
+ max-width: calc(100% - 110px);
+ }
+ .width-full {
+ width: calc(100% - 110px);
+ }
.error {
width: 100%;
color: red;
@@ -232,14 +242,6 @@ onMounted(async () => {
padding-left: 60px;
margin-top: 10px;
}
- .stop {
- width: 100%;
- height: 30px;
- color: #4670e3;
- padding-left: 60px;
- margin-top: 10px;
- cursor: pointer;
- }
.btns {
width: 100%;
height: 30px;
diff --git a/src/components/AppRoleDefault/index.d.ts b/src/components/AppRoleDefault/index.d.ts
index a2f03c2..25175f5 100644
--- a/src/components/AppRoleDefault/index.d.ts
+++ b/src/components/AppRoleDefault/index.d.ts
@@ -1,8 +1,10 @@
export interface RoleData {
+ id: string
roleImg: string
roleName: string
roleInfo: string
remark: string
+ type: number
}
interface RoleInfoAppModel {
diff --git a/src/components/AppRoleDefault/index.vue b/src/components/AppRoleDefault/index.vue
index c99e45b..b8f5d3a 100644
--- a/src/components/AppRoleDefault/index.vue
+++ b/src/components/AppRoleDefault/index.vue
@@ -4,6 +4,8 @@ import { ref } from 'vue'
import type { AppGroup, RoleData } from './index.d'
import { getAppList, getRole } from '@/api/base/role'
+defineEmits(['handleRole', 'handleApply'])
+
const roleList = ref
([])
const application = ref([])
const typeIndex = ref(0)
@@ -12,6 +14,7 @@ const typeIndex = ref(0)
function getRoleData() {
getRole(1).then((res) => {
roleList.value = res
+ console.log('角色', res)
})
}
getRoleData()
@@ -19,6 +22,7 @@ getRoleData()
function getAppData() {
getAppList().then((res) => {
application.value = res
+ console.log('应用', res)
})
}
@@ -42,6 +46,7 @@ function handleChange(index: number) {
v-for="(item, index) in roleList"
:key="index"
class="role-card"
+ @click="$emit('handleRole', item, index)"
>
@@ -87,6 +92,7 @@ function handleChange(index: number) {
v-for="(item, index) in application[typeIndex].roleInfoAppModelList"
:key="index"
class="applyList"
+ @click="$emit('handleApply', item, index)"
>
![]()
diff --git a/src/components/AppSubMenuList/index.vue b/src/components/AppSubMenuList/index.vue
index 039a197..2b48f16 100644
--- a/src/components/AppSubMenuList/index.vue
+++ b/src/components/AppSubMenuList/index.vue
@@ -79,6 +79,7 @@ function handleBlur(index: number, item: SubMenuItem, inputValue?: string) {
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/components/AppTextarea/index.vue b/src/components/AppTextarea/index.vue
index a8297b3..effab39 100644
--- a/src/components/AppTextarea/index.vue
+++ b/src/components/AppTextarea/index.vue
@@ -1,9 +1,12 @@
-