From 534cc0ab76de5779f03f39d23602c20db60604b4 Mon Sep 17 00:00:00 2001 From: sjl <1716605279@qq.com> Date: Thu, 14 Nov 2024 19:24:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/components/resourcePopup.vue | 19 ++++----- .../src/views/authority/resource/index.vue | 40 +++++++++++++------ frontend/src/views/authority/role/index.vue | 4 +- .../machine/device/components/devicePopup.vue | 4 +- frontend/src/views/machine/device/index.vue | 16 +++----- .../views/system/dictionary/dictPq/index.vue | 4 +- .../system/dictionary/dictTree/index.vue | 4 +- .../system/dictionary/dictType/index.vue | 3 -- 8 files changed, 49 insertions(+), 45 deletions(-) diff --git a/frontend/src/views/authority/resource/components/resourcePopup.vue b/frontend/src/views/authority/resource/components/resourcePopup.vue index 9f59556..7fd5eea 100644 --- a/frontend/src/views/authority/resource/components/resourcePopup.vue +++ b/frontend/src/views/authority/resource/components/resourcePopup.vue @@ -15,6 +15,9 @@ + + + - - - + + + + + + - + diff --git a/frontend/src/views/authority/resource/index.vue b/frontend/src/views/authority/resource/index.vue index 786fb1d..2dac0d1 100644 --- a/frontend/src/views/authority/resource/index.vue +++ b/frontend/src/views/authority/resource/index.vue @@ -44,31 +44,47 @@ { prop: 'name', label: '名称', - minWidth: 200, - search: { el: 'input', tooltip: '我是搜索提示' }, + minWidth: 150, + search: { el: 'input' }, }, { prop: 'code', - label: '资源标识', + label: '编码', minWidth: 100, }, - { - prop: 'path', - label: '路径', - minWidth: 200, - }, { prop: 'type', label: '类型', - width: 150, + width: 100, enum: dictStore.getDictData('resourceType'), search: { el: 'select', props: { filterable: true } }, fieldNames: { label: 'label', value: 'code' }, - }, + }, + { + prop: 'icon', + label: '图标', + minWidth: 100, + }, + { + prop: 'path', + label: '路由地址', + minWidth: 200, + }, + { + prop: 'component', + label: '组件地址', + minWidth: 200, + }, + { + prop: 'sort', + label: '排序', + width: 70, + }, + { prop: 'state', label: '权限资源状态', - minWidth: 120, + minWidth: 100, enum: dictStore.getDictData('status'), fieldNames: { label: 'label', value: 'code' }, render: scope => { @@ -77,7 +93,7 @@ ) }, }, - { prop: 'operation', label: '操作', fixed: 'right',minWidth: 200 }, + { prop: 'operation', label: '操作', fixed: 'right',width: 200 }, ]) diff --git a/frontend/src/views/authority/role/index.vue b/frontend/src/views/authority/role/index.vue index aae38c5..459255c 100644 --- a/frontend/src/views/authority/role/index.vue +++ b/frontend/src/views/authority/role/index.vue @@ -77,12 +77,12 @@ const columns = reactive[]>([ prop: 'code', label: '编码', search: { el: 'input' }, - minWidth: 180, + minWidth: 200, }, { prop: 'remark', label: '描述', - minWidth: 380, + minWidth: 300, }, { prop: 'state', diff --git a/frontend/src/views/machine/device/components/devicePopup.vue b/frontend/src/views/machine/device/components/devicePopup.vue index 8938878..b688e7f 100644 --- a/frontend/src/views/machine/device/components/devicePopup.vue +++ b/frontend/src/views/machine/device/components/devicePopup.vue @@ -77,8 +77,8 @@ - - + + []>([ return (
@@ -97,25 +97,19 @@ const columns = reactive[]>([ prop: 'devChns', label: '设备通道数', minWidth: 110, - render: scope => { - return String(scope.row.devChns) // 将数字转换为字符串 - }, + }, { prop: 'devVolt', label: '额定电压（V）', minWidth: 130, - render: scope => { - return String(scope.row.devVolt) // 将数字转换为字符串 - }, + }, { prop: 'devCurr', label: '额定电流（A）', minWidth: 130, - render: scope => { - return String(scope.row.devCurr) // 将数字转换为字符串 - }, + }, { prop: 'manufacturer', @@ -155,7 +149,7 @@ const handleDelete = async (params: Device.ResPqDev) => { } // 导出设备 -const downloadFile = async (params: Device.ReqPqDevParams) => { +const downloadFile = async () => { // 获取当前的搜索参数 const searchParam = proTable.value?.searchParam || {}; diff --git a/frontend/src/views/system/dictionary/dictPq/index.vue b/frontend/src/views/system/dictionary/dictPq/index.vue index 36c8cd4..91c9b07 100644 --- a/frontend/src/views/system/dictionary/dictPq/index.vue +++ b/frontend/src/views/system/dictionary/dictPq/index.vue @@ -148,9 +148,7 @@ const columns = reactive[]>([ prop: 'sort', label: '排序', width:70, - render: scope => { - return String(scope.row.sort) // 将数字转换为字符串 - }, + }, { prop: 'operation', diff --git a/frontend/src/views/system/dictionary/dictTree/index.vue b/frontend/src/views/system/dictionary/dictTree/index.vue index 350b29b..fe3af77 100644 --- a/frontend/src/views/system/dictionary/dictTree/index.vue +++ b/frontend/src/views/system/dictionary/dictTree/index.vue @@ -56,9 +56,7 @@ prop: 'sort', label: '排序', width:70, - render: scope => { - return String(scope.row.sort) // 将数字转换为字符串 - }, + }, { prop: 'state', diff --git a/frontend/src/views/system/dictionary/dictType/index.vue b/frontend/src/views/system/dictionary/dictType/index.vue index 350e5a3..91eb497 100644 --- a/frontend/src/views/system/dictionary/dictType/index.vue +++ b/frontend/src/views/system/dictionary/dictType/index.vue @@ -69,9 +69,6 @@ const columns = reactive[]>([ prop: 'sort', label: '排序', minWidth: 70, - render: scope => { - return String(scope.row.sort) // 将数字转换为字符串 - }, }, { prop: 'createTime',