diff --git a/src/views/modules/staff/archives/componments/professional.vue b/src/views/modules/staff/archives/componments/professional.vue
index 994cfa3..8d2158f 100644
--- a/src/views/modules/staff/archives/componments/professional.vue
+++ b/src/views/modules/staff/archives/componments/professional.vue
@@ -55,7 +55,14 @@
简历附件:
-
{{info.resumeUrl || "暂无"}}
+
预览
+
暂无
diff --git a/src/views/modules/staff/profile/componments/chart-form/index.vue b/src/views/modules/staff/profile/componments/chart-form/index.vue
index cc29358..6dd302e 100644
--- a/src/views/modules/staff/profile/componments/chart-form/index.vue
+++ b/src/views/modules/staff/profile/componments/chart-form/index.vue
@@ -40,7 +40,11 @@ export default {
show: true
},
series: {
- center: ['50%', '40%']
+ center: ['50%', '40%'],
+ itemStyle: {
+ borderWidth: 2, // 设置border的宽度有多大
+ borderColor: '#fff'
+ }
}
},
chartData: {
diff --git a/src/views/modules/sys/role/index.vue b/src/views/modules/sys/role/index.vue
index 282e864..3575449 100644
--- a/src/views/modules/sys/role/index.vue
+++ b/src/views/modules/sys/role/index.vue
@@ -38,20 +38,21 @@
width="180"
label="创建时间"
>
-
+
编辑
删除
+
@@ -100,6 +101,9 @@ export default {
this.handleGetTableList()
},
methods: {
+ handleAuthorizedMenu (item) {
+ console.log(item)
+ },
// 获取数据列表
handleGetTableList () {
apiSysRoleList({
@@ -133,10 +137,10 @@ export default {
this.dataListSelections = val
},
// 新增 / 编辑
- handleAddOrUpdate (id) {
+ handleAddOrUpdate (id, disabled = false) {
this.addOrUpdateVisible = true
this.$nextTick(() => {
- this.$refs.addOrUpdate.init(id)
+ this.$refs.addOrUpdate.init(id, disabled)
})
},
// 删除
diff --git a/src/views/modules/sys/role/role-add-or-update.vue b/src/views/modules/sys/role/role-add-or-update.vue
index 9bca5e8..75ea498 100644
--- a/src/views/modules/sys/role/role-add-or-update.vue
+++ b/src/views/modules/sys/role/role-add-or-update.vue
@@ -1,9 +1,5 @@
-
+
@@ -26,6 +23,7 @@
maxlength="30"
show-word-limit
v-model="dataForm.remark"
+ :readonly="disable"
placeholder="备注"
>
@@ -36,13 +34,18 @@
node-key="menuId"
ref="menuListTree"
:default-expand-all="true"
+ :default-checked-keys="defaultCheckedKeys"
show-checkbox
- >
+ >
+
+ {{ node.label }}
+
+
@@ -54,12 +57,14 @@ import { apiSysMenuList, apiSysRoleInfo, apiSysRoleConfirm } from '@/api/api_sys
export default {
data () {
return {
+ disable: null,
visible: false,
menuList: [],
menuListTreeProps: {
label: 'name',
children: 'children'
},
+ defaultCheckedKeys: [],
dataForm: {
id: 0,
roleName: '',
@@ -74,8 +79,21 @@ export default {
},
mounted () {
},
+ computed: {
+ title () {
+ if (this.disable) {
+ return '已授权菜单'
+ }
+ if (!this.dataForm.id) {
+ return '新增角色'
+ } else {
+ return '编辑角色'
+ }
+ }
+ },
methods: {
- async init (id) {
+ async init (id, disable) {
+ this.disable = disable
this.dataForm = {}
await this.handleGetSysMenuList()
if (id) {
@@ -116,6 +134,10 @@ export default {
},
// 提交
handleConfirm () {
+ if (this.disable) {
+ this.visible = false
+ return
+ }
this.$refs['dataForm'].validate((valid) => {
if (valid) {
let params = {
diff --git a/src/views/modules/sys/user/index.vue b/src/views/modules/sys/user/index.vue
index e4c44ff..3926822 100644
--- a/src/views/modules/sys/user/index.vue
+++ b/src/views/modules/sys/user/index.vue
@@ -40,18 +40,18 @@
width="180"
label="创建时间"
>
-
+
编辑
删除