Merge remote-tracking branch 'origin/master'

vue/src/views/jobUserManager/recommendMgt/index.vue

@@ -227,9 +227,9 @@ export default defineComponent({
         align: "center",
         isDefaultClose: true
       },
-      {title: '推送人', dataIndex: 'pushName', key: 'pushName', isDefaultClose: true},
+      {title: '推送人', dataIndex: 'pushName', key: 'pushName', align: 'center', isDefaultClose: true},
       {
-        title: '推送时间', dataIndex: 'createTime', key: 'createTime',
+        title: '推送时间', dataIndex: 'createTime', key: 'createTime', align: 'center',
         customRender: ({record}) => dayjs(record.createTime).format('YYYY-MM-DD'), isDefaultClose: true
       },
       {title: '操作', key: 'operation', width: 100, align: 'center', isDisabled: true},

vue/src/views/system/announcement/index.vue

@@ -105,10 +105,10 @@ export default defineComponent({
             (dayjs(record.startTime).format('YYYY-MM-DD') + "至" +
               dayjs(record.endTime).format('YYYY-MM-DD'))
       },
-      {title: '是否置顶', dataIndex: 'recordStatusName', key: '1', width: 80, align: "center"},
-      {title: '发布人', dataIndex: 'createByName', key: '2', width: 80, align: "center"},
+      {title: '是否置顶', dataIndex: 'recordStatusName', key: 'recordStatusName', width: 80, align: "center"},
+      {title: '发布人', dataIndex: 'createByName', key: 'createByName', width: 80, align: "center"},
       {
-        title: '发布时间', dataIndex: 'createTime', key: '1', width: 120, customRender: ({record}) =>
+        title: '发布时间', dataIndex: 'createTime', key: 'createTime', align: "center", width: 120, customRender: ({record}) =>
           record.createTime == null ? "" :
             dayjs(record.createTime).format('YYYY-MM-DD')
       },

vue/src/views/system/menu/index.vue

@@ -84,8 +84,8 @@ const columns: TableColumnsType = [
   {title: '菜单名称', width: 250, dataIndex: 'menuName', key: 'menuName',},
   {title: '菜单编号', dataIndex: 'menuNo', key: 'menuNo', width: 100},
   {title: '菜单图标', dataIndex: 'icon', key: 'icon', width: 150, align: "center"},
-  {title: '是否显示', dataIndex: 'isVisible', key: 'isVisible', width: 100,customRender:({record})=>record.isVisible?"是":"否"},
-  {title: '排序', dataIndex: 'orderNo', key: 'orderNo', width: 100},
+  {title: '是否显示', dataIndex: 'isVisible', key: 'isVisible', align: "center", width: 100,customRender:({record})=>record.isVisible?"是":"否"},
+  {title: '排序', dataIndex: 'orderNo', key: 'orderNo', align: "center", width: 100},
   {
     title: '操作', key: 'operation', width: 100, align: "center"
   },

vue/src/views/system/role/index.vue

@@ -92,11 +92,11 @@ export default defineComponent({
         key: 'roleID',
         customRender: item => `${searchParamsState.rows * (searchParamsState.page - 1) + item.index + 1}`
       },
-      {title: '角色名称', dataIndex: 'name', key: 'name', width: 200},
-      {title: '用户类型', dataIndex: 'userTypeName', key: 'userTypeName', width: 120},
-      {title: '数据范围', dataIndex: 'dataRangeName', key: 'dataRangeName', width: 120},
+      {title: '角色名称', dataIndex: 'name', key: 'name', align: "center", width: 200},
+      {title: '用户类型', dataIndex: 'userTypeName', key: 'userTypeName', align: "center", width: 180},
+      {title: '数据范围', dataIndex: 'dataRangeName', key: 'dataRangeName', align: "center", width: 120},
       {title: '角色说明', dataIndex: 'description', key: 'description',},
-      {title: '操作', key: 'operation', fixed: 'right', width: 150, align: "center"},
+      {title: '操作', key: 'operation', fixed: 'right', width: 130, align: "center"},
     ];
     const pagination = computed(() => ({
       total: formState.total,

vue/src/views/system/users/index.vue

@@ -132,29 +132,15 @@
           customRender: (item) =>
             `${searchParamsState.limit * (searchParamsState.page - 1) + item.index + 1}`,
         },
-        { title: '用户名', dataIndex: 'Name', key: 'Name', width: 150 },
-        { title: '帐号', dataIndex: 'LoginID', key: 'LoginID', width: 150 },
-        {
-          title: '用户类型',
-          dataIndex: 'UserTypeName',
-          key: 'UserTypeName',
-          width: 150,
-        },
-        {
-          title: '所属区县/机构/驿站',
-          dataIndex: 'dataRangeNames',
-          key: 'dataRangeNames',
-          width: 150,
-        },
-        { title: '角色', dataIndex: 'roleName', key: 'roleName' },
-        {
-          title: '账号状态',
-          dataIndex: 'RecordStatus',
-          key: 'RecordStatus',
-          width: 150,
+        { title: '用户名', dataIndex: 'Name', key: 'Name', align: 'center', width: 150 },
+        { title: '帐号', dataIndex: 'LoginID', key: 'LoginID',align: 'center', width: 150 },
+        { title: '用户类型', dataIndex: 'UserTypeName', key: 'UserTypeName',align: 'center', width: 150,},
+        { title: '所属区县/机构/驿站', dataIndex: 'dataRangeNames', key: 'dataRangeNames',align: 'center', width: 150,},
+        { title: '角色', dataIndex: 'roleName', key: 'roleName',align: 'center', width: 180 },
+        { title: '账号状态', dataIndex: 'RecordStatus', key: 'RecordStatus',align: 'center', width: 110,
           customRender: ({ record }) => (record.RecordStatus == 1 ? '正常' : '禁用'),
         },
-        { title: '操作', key: 'operation', width: 250, align: 'center' },
+        { title: '操作', key: 'operation', width: 220, align: 'center' },
       ];
       const pagination = computed(() => ({
         total: formState.total,