From 825158cd4d6f8955a1b639bc85fe9a6de4c3750d Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Mon, 8 Apr 2024 10:33:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9D=83=E9=99=90=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/childView/exportExcil.vue           |  5 +++--
 .../childView/systemSetting/roleManage.vue    | 20 +++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/views/childView/exportExcil.vue b/src/views/childView/exportExcil.vue
index c4931a0..9424a45 100644
--- a/src/views/childView/exportExcil.vue
+++ b/src/views/childView/exportExcil.vue
@@ -67,8 +67,9 @@ export default defineComponent({
         })
         let tableLoading = ref(false)
         let columns = reactive([
-            { title: 'Name', align:'center', ellipsis: true,  dataIndex: 'exportName', key: 'exportName', width:250 },
-            { title: 'Create Time', align:'center', ellipsis: true,  dataIndex: 'createTime', key: 'createTime'},
+            { title: 'Name', align:'center', ellipsis: true,  dataIndex: 'exportName', key: 'exportName', width:350 },
+            { title: 'Time', align:'center', ellipsis: true,  dataIndex: 'dataTime', key: 'dataTime', width:350},
+            // { title: 'Create Time', align:'center', ellipsis: true,  dataIndex: 'createTime', key: 'createTime'},
             { title: 'Type', align:'center', ellipsis: true,  dataIndex: 'span', key: 'span'},
             {
                 title: 'Operations',
diff --git a/src/views/childView/systemSetting/roleManage.vue b/src/views/childView/systemSetting/roleManage.vue
index a664f05..034d15d 100644
--- a/src/views/childView/systemSetting/roleManage.vue
+++ b/src/views/childView/systemSetting/roleManage.vue
@@ -61,13 +61,18 @@
                             <td class="second_td">
                                 <div class="table_td_block" v-for="(menu) in role.level2ResourceList" :key="menu.code"><a-checkbox size="large" v-model:checked="menu.select" @change="checkLevelSec(role,menu)">{{menu.resource}}</a-checkbox></div>
                             </td>
-                            <td class="third_td">
+							<td class="third_td">
+                                <div class="table_td_block td_block_padding0" v-for="(menu) in role.level2ResourceList" :key="menu.code">
+									<div class="table_td_block" v-for="(per) in menu.operationList" :key="per.code"><a-checkbox :disabled="!menu.select"  size="large" v-model:checked="per.select">{{per.resource}}</a-checkbox></div>
+                                </div>
+                            </td>
+                            <!-- <td class="third_td">
                                 <div class="table_td_block" v-for="(menu) in role.level2ResourceList" :key="menu.code">
                                     <div class="table_td_permission">
                                         <div v-for="(per) in menu.operationList" :key="per.code"><a-checkbox :disabled="!menu.select"  size="large" v-model:checked="per.select">{{per.resource}}</a-checkbox></div>
                                     </div>
                                 </div>
-                            </td>
+                            </td> -->
                         </tr>
                     </table>
                 </div>
@@ -447,6 +452,10 @@ export default defineComponent({
             &:last-child{
                 border-bottom: none;
             }
+			&.td_block_padding0{
+				// padding: 16px 0 16px 0px;
+				padding: 0;
+			}
         }
 
         .table_td_permission{
@@ -456,12 +465,15 @@ export default defineComponent({
     }
 
     .first_td{
-        width: 120px;
+        width: 200px;
     }
 
     .second_td{
-        width: 150px;
+        width: 200px;
     }
+	.third_td{
+		width: 130px;
+	}
 }