diff --git a/src/components/table/fieldRender/index.vue b/src/components/table/fieldRender/index.vue index 95f446f..3e67225 100644 --- a/src/components/table/fieldRender/index.vue +++ b/src/components/table/fieldRender/index.vue @@ -58,86 +58,68 @@ -
+
@@ -230,4 +212,9 @@ const getTagType = (value: string, custom: any): TagProps['type'] => { height: 25px; width: 100%; } +.cn-render-buttons { + :deep(.el-button) { + margin-left: 0; + } +} diff --git a/src/views/auth/audit/index.vue b/src/views/auth/audit/index.vue index cb268f1..899685f 100644 --- a/src/views/auth/audit/index.vue +++ b/src/views/auth/audit/index.vue @@ -34,7 +34,7 @@ const tableStore = new TableStore({ { title: '状态', field: 'stateName' }, { title: '操作', - width: '130', + width: '10', render: 'buttons', buttons: [ { @@ -42,7 +42,7 @@ const tableStore = new TableStore({ title: '审核通过', type: 'primary', icon: 'el-icon-Check', - render: 'tipButton', + render: 'basicButton', click: row => { checkUser([row.id]).then(res => { tableStore.index() diff --git a/src/views/auth/menu/api.vue b/src/views/auth/menu/api.vue index 43c4f66..fc7ea57 100644 --- a/src/views/auth/menu/api.vue +++ b/src/views/auth/menu/api.vue @@ -49,7 +49,7 @@ const tableStore = new TableStore({ { title: '操作', align: 'center', - width: '130', + width: '180', render: 'buttons', buttons: [ { @@ -57,7 +57,7 @@ const tableStore = new TableStore({ title: '编辑编辑', type: 'primary', icon: 'el-icon-EditPen', - render: 'tipButton', + render: 'basicButton', click: row => { popupRef.value.open('编辑接口权限', row) } diff --git a/src/views/auth/menu/menu.vue b/src/views/auth/menu/menu.vue index 10d0817..733dfe9 100644 --- a/src/views/auth/menu/menu.vue +++ b/src/views/auth/menu/menu.vue @@ -57,32 +57,32 @@ const tableStore = new TableStore({ { title: '操作', align: 'center', - width: '130', + width: '180', render: 'buttons', buttons: [ { name: 'edit', - title: '新增菜单', + text: '新增', type: 'primary', icon: 'el-icon-Plus', - render: 'tipButton', + render: 'basicButton', click: row => { popupRef.value.open('新增菜单', { pid: row.id }) } }, { name: 'edit', - title: '编辑菜单', + text: '编辑', type: 'primary', icon: 'el-icon-EditPen', - render: 'tipButton', + render: 'basicButton', click: row => { popupRef.value.open('编辑菜单', row) } }, { name: 'del', - title: '删除菜单', + text: '删除', type: 'danger', icon: 'el-icon-Delete', render: 'confirmButton', diff --git a/src/views/auth/role/index.vue b/src/views/auth/role/index.vue index a7d3085..bad6918 100644 --- a/src/views/auth/role/index.vue +++ b/src/views/auth/role/index.vue @@ -70,7 +70,7 @@ const tableStore = new TableStore({ { title: '操作', align: 'center', - width: '130', + width: '180', render: 'buttons', buttons: [ { @@ -78,7 +78,7 @@ const tableStore = new TableStore({ title: '编辑', type: 'primary', icon: 'el-icon-EditPen', - render: 'tipButton', + render: 'basicButton', click: row => { popupRef.value.open('编辑角色', row) } diff --git a/src/views/auth/userList/index.vue b/src/views/auth/userList/index.vue index fba16e2..fdfaf63 100644 --- a/src/views/auth/userList/index.vue +++ b/src/views/auth/userList/index.vue @@ -101,7 +101,7 @@ const tableStore = new TableStore({ title: '编辑', type: 'primary', icon: 'el-icon-EditPen', - render: 'tipButton', + render: 'basicButton', disabled: row => { return row.state !== 1 }, @@ -114,7 +114,7 @@ const tableStore = new TableStore({ title: '修改密码', type: 'primary', icon: 'el-icon-Lock', - render: 'tipButton', + render: 'basicButton', disabled: row => { return row.state !== 1 }, @@ -135,7 +135,7 @@ const tableStore = new TableStore({ title: '激活', type: 'success', icon: 'el-icon-Open', - render: 'tipButton', + render: 'basicButton', disabled: row => { return row.state !== 2 && row.state !== 5 && row.state !== 0 && row.state !== 4 }, @@ -153,7 +153,7 @@ const tableStore = new TableStore({ title: '注销', type: 'danger', icon: 'el-icon-SwitchButton', - render: 'tipButton', + render: 'basicButton', disabled: row => { return row.state !== 1 && row.state !== 3 }, diff --git a/src/views/govern/alarm/Transient.vue b/src/views/govern/alarm/Transient.vue index cfbe361..fb843ab 100644 --- a/src/views/govern/alarm/Transient.vue +++ b/src/views/govern/alarm/Transient.vue @@ -146,7 +146,7 @@ const tableStore = new TableStore({ { title: '操作', align: 'center', - width: '130', + width: '180', render: 'buttons', buttons: [ { @@ -154,7 +154,7 @@ const tableStore = new TableStore({ title: '波形分析', type: 'primary', icon: 'el-icon-DataLine', - render: 'tipButton', + render: 'basicButton', disabled: row => { return !row.wavePath && row.evtParamTm < 20 }, diff --git a/src/views/govern/analyze/DVR/index.vue b/src/views/govern/analyze/DVR/index.vue index 935ab87..1931207 100644 --- a/src/views/govern/analyze/DVR/index.vue +++ b/src/views/govern/analyze/DVR/index.vue @@ -110,7 +110,7 @@ const tableStore = new TableStore({ { title: '操作', align: 'center', - width: '130', + width: '180', render: 'buttons', buttons: [ { diff --git a/src/views/govern/manage/basic/dictionary.vue b/src/views/govern/manage/basic/dictionary.vue index 775017d..16fa68b 100644 --- a/src/views/govern/manage/basic/dictionary.vue +++ b/src/views/govern/manage/basic/dictionary.vue @@ -89,7 +89,7 @@ const tableStore = new TableStore({ { title: '操作', align: 'center', - width: '130', + width: '180', render: 'buttons', buttons: [ { @@ -97,7 +97,7 @@ const tableStore = new TableStore({ title: '编辑', type: 'primary', icon: 'el-icon-EditPen', - render: 'tipButton', + render: 'basicButton', click: row => { popupDictionary.value.open('编辑字典', row) } diff --git a/src/views/govern/manage/basic/template.vue b/src/views/govern/manage/basic/template.vue index 4d17422..1a1c613 100644 --- a/src/views/govern/manage/basic/template.vue +++ b/src/views/govern/manage/basic/template.vue @@ -68,7 +68,7 @@ const tableStore = new TableStore({ { title: '操作', align: 'center', - width: '130', + width: '180', render: 'buttons', buttons: [ { diff --git a/src/views/govern/manage/basic/version.vue b/src/views/govern/manage/basic/version.vue index c0a4ca1..3f69781 100644 --- a/src/views/govern/manage/basic/version.vue +++ b/src/views/govern/manage/basic/version.vue @@ -66,7 +66,7 @@ const tableStore = new TableStore({ { title: '操作', align: 'center', - width: '130', + width: '180', render: 'buttons', buttons: [ { @@ -74,7 +74,7 @@ const tableStore = new TableStore({ title: '编辑', type: 'primary', icon: 'el-icon-EditPen', - render: 'tipButton', + render: 'basicButton', click: row => { popupVersionRef.value.open('编辑版本', row) } @@ -84,7 +84,7 @@ const tableStore = new TableStore({ title: '启用', type: 'success', icon: 'el-icon-Open', - render: 'tipButton', + render: 'basicButton', disabled: row => { return row.status == 1 }, diff --git a/src/views/govern/manage/factory.vue b/src/views/govern/manage/factory.vue index 5360359..7c8ed91 100644 --- a/src/views/govern/manage/factory.vue +++ b/src/views/govern/manage/factory.vue @@ -265,7 +265,7 @@ const tableStore = new TableStore({ title: '编辑', type: 'primary', icon: 'el-icon-EditPen', - render: 'tipButton', + render: 'basicButton', click: async row => { dialogFormVisible.value = true @@ -280,7 +280,7 @@ const tableStore = new TableStore({ title: '二维码', type: 'primary', icon: 'el-icon-Grid', - render: 'tipButton', + render: 'basicButton', click: row => { deivce.value = row @@ -305,7 +305,7 @@ const tableStore = new TableStore({ title: '删除', type: 'danger', icon: 'el-icon-Delete', - render: 'tipButton', + render: 'basicButton', click: row => { ElMessageBox.confirm('确定删除该设备吗?', '提示', { diff --git a/src/views/govern/manage/gplot/index.vue b/src/views/govern/manage/gplot/index.vue index 40f9fb9..dfb759b 100644 --- a/src/views/govern/manage/gplot/index.vue +++ b/src/views/govern/manage/gplot/index.vue @@ -44,7 +44,7 @@ const tableStore = new TableStore({ { title: '操作', align: 'center', - width: '130', + width: '180', render: 'buttons', buttons: [ { @@ -52,7 +52,7 @@ const tableStore = new TableStore({ title: '编辑', type: 'primary', icon: 'el-icon-EditPen', - render: 'tipButton', + render: 'basicButton', click: row => { popupRef.value.open( row) } diff --git a/src/views/govern/setting/statisticalType/index.vue b/src/views/govern/setting/statisticalType/index.vue index 0b4b8e9..a171985 100644 --- a/src/views/govern/setting/statisticalType/index.vue +++ b/src/views/govern/setting/statisticalType/index.vue @@ -37,7 +37,7 @@ const tableStore = new TableStore({ { title: '操作', align: 'center', - width: '130', + width: '180', render: 'buttons', buttons: [ { @@ -45,7 +45,7 @@ const tableStore = new TableStore({ title: '绑定指标', type: 'primary', icon: 'el-icon-Connection', - render: 'tipButton', + render: 'basicButton', click: row => { bindingRef.value.open(row.id) } @@ -55,7 +55,7 @@ const tableStore = new TableStore({ title: '编辑', type: 'primary', icon: 'el-icon-EditPen', - render: 'tipButton', + render: 'basicButton', click: row => { addRef.value.open('编辑', row) } diff --git a/src/views/setting/dictionary/list/detail.vue b/src/views/setting/dictionary/list/detail.vue index d9a206e..a5aaf73 100644 --- a/src/views/setting/dictionary/list/detail.vue +++ b/src/views/setting/dictionary/list/detail.vue @@ -69,7 +69,7 @@ const tableStore = new TableStore({ title: '编辑', type: 'primary', icon: 'el-icon-EditPen', - render: 'tipButton', + render: 'basicButton', click: row => { popupEditRef.value.open('编辑', { ...row, diff --git a/src/views/setting/dictionary/list/index.vue b/src/views/setting/dictionary/list/index.vue index 51fbe41..7eb7ccb 100644 --- a/src/views/setting/dictionary/list/index.vue +++ b/src/views/setting/dictionary/list/index.vue @@ -68,7 +68,7 @@ const tableStore = new TableStore({ title: '查看', type: 'primary', icon: 'el-icon-ZoomIn', - render: 'tipButton', + render: 'basicButton', click: row => { detail.value = row } @@ -77,7 +77,7 @@ const tableStore = new TableStore({ title: '编辑', type: 'primary', icon: 'el-icon-EditPen', - render: 'tipButton', + render: 'basicButton', click: row => { popupEditRef.value.open('编辑字典类型', row) } diff --git a/src/views/setting/dictionary/tree/index.vue b/src/views/setting/dictionary/tree/index.vue index afa876b..4e1713e 100644 --- a/src/views/setting/dictionary/tree/index.vue +++ b/src/views/setting/dictionary/tree/index.vue @@ -57,7 +57,7 @@ const tableStore = new TableStore({ title: '新增', type: 'primary', icon: 'el-icon-Plus', - render: 'tipButton', + render: 'basicButton', click: row => { popupFormRef.value.open('新增字典类型', { name: '', @@ -74,7 +74,7 @@ const tableStore = new TableStore({ title: '编辑', type: 'primary', icon: 'el-icon-EditPen', - render: 'tipButton', + render: 'basicButton', click: row => { popupFormRef.value.open('编辑字典类型', row) }