소스 검색

feat: 全部table添加sort排序&登录页样式修改

laiqi 1 년 전
부모
커밋
70a32f7fe2

+ 1 - 0
apps/web-ele/components.d.ts

@@ -2,6 +2,7 @@
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
+// biome-ignore lint: disable
 export {};
 
 /* prettier-ignore */

BIN
apps/web-ele/public/images/bg.webp


+ 6 - 5
apps/web-ele/src/views/coupon-manage/index.vue

@@ -68,16 +68,17 @@ const gridOptions: VxeGridProps<any> = {
   },
 
   columns: [
-    { title: '优惠券名称', field: 'couponmc' },
-    { title: '可用产品', field: 'couponproductids' },
+    { title: '优惠券名称', field: 'couponmc', sortable: true },
+    { title: '可用产品', field: 'couponproductids', sortable: true },
     {
       title: '是否可用',
       field: 'couponsfky',
+      sortable: true,
       slots: { default: 'couponsfky' },
     },
-    { title: '创建时间', field: 'couponcreatedate' },
-    { title: '创建人', field: 'couponcreateuser' },
-    { title: '更新时间', field: 'couponupdate' },
+    { title: '创建时间', field: 'couponcreatedate', sortable: true },
+    { title: '创建人', field: 'couponcreateuser', sortable: true },
+    { title: '更新时间', field: 'couponupdate', sortable: true },
     // { title: '优惠券更新人', field: 'couponupuser' },
     {
       title: '操作',

+ 8 - 8
apps/web-ele/src/views/customer-manage/index.vue

@@ -91,17 +91,17 @@ const gridOptions: VxeGridProps<any> = {
   },
 
   columns: [
-    { title: '用户id', field: 'usersid' },
-    { title: '微信openid', field: 'usersopenid' },
-    { title: '用户名称', field: 'usersname' },
-    { title: '用户性质', field: 'usersnature' },
-    { title: '用户类型', field: 'userstype' },
+    { title: '用户id', field: 'usersid', sortable: true },
+    { title: '微信openid', field: 'usersopenid', sortable: true },
+    { title: '用户名称', field: 'usersname', sortable: true },
+    { title: '用户性质', field: 'usersnature', sortable: true },
+    { title: '用户类型', field: 'userstype', sortable: true },
     // { title: '用户证件号码', field: 'usersidcardnumber' },
     // { title: '用户开户银行名称', field: 'usersbankname' },
     // { title: '用户开户银行账号', field: 'usersbanknumber' },
-    { title: '用户手机号', field: 'usersphone' },
-    { title: '用户邮箱', field: 'usersemail' },
-    { title: '用户地址', field: 'usersaddress' },
+    { title: '用户手机号', field: 'usersphone', sortable: true },
+    { title: '用户邮箱', field: 'usersemail', sortable: true },
+    { title: '用户地址', field: 'usersaddress', sortable: true },
     // { title: '用户联系手机号', field: 'userscontactphone' },
     // { title: '用户联系邮箱', field: 'userscontactemail' },
     // { title: '用户联系地址', field: 'userscontactaddress' },

+ 9 - 7
apps/web-ele/src/views/examine-manage/examine-coupon/index.vue

@@ -70,14 +70,15 @@ const gridOptions: VxeGridProps<any> = {
   },
 
   columns: [
-    { title: '优惠券ID', field: 'coupon2sid' },
-    { title: '优惠券代码', field: 'coupon2code' },
-    { title: '申请时间', field: 'coupon2adddatetime' },
-    { title: '审核时间', field: 'coupon2reviewdatetime' },
-    { title: '申请人ID', field: 'coupon2userid' },
+    { title: '优惠券ID', field: 'coupon2sid', sortable: true },
+    { title: '优惠券代码', field: 'coupon2code', sortable: true },
+    { title: '申请时间', field: 'coupon2adddatetime', sortable: true },
+    { title: '审核时间', field: 'coupon2reviewdatetime', sortable: true },
+    { title: '申请人ID', field: 'coupon2userid', sortable: true },
     {
       title: '优惠券状态',
       field: 'coupon2sype',
+      sortable: true,
       slots: {
         default: ({ row }) => {
           const type = row.coupon2sype as 0 | 1 | 2;
@@ -97,6 +98,7 @@ const gridOptions: VxeGridProps<any> = {
     {
       title: '使用状态',
       field: 'coupon2isused',
+      sortable: true,
       slots: {
         default: ({ row }) => {
           const type = row.coupon2isused as 0 | 1;
@@ -112,8 +114,8 @@ const gridOptions: VxeGridProps<any> = {
         },
       },
     },
-    { title: '可用产品', field: 'coupon2productids' },
-    { title: '关联主券ID', field: 'coupon2coupon1id' },
+    { title: '可用产品', field: 'coupon2productids', sortable: true },
+    { title: '关联主券ID', field: 'coupon2coupon1id', sortable: true },
     {
       title: '操作',
       field: 'action',

+ 21 - 5
apps/web-ele/src/views/examine-manage/examine-subsidy/index.vue

@@ -66,11 +66,27 @@ const gridOptions: VxeGridProps<any> = {
   },
 
   columns: [
-    { title: '补贴申请ID', field: 'subsidyapplicationsid' },
-    { title: '渠道商ID', field: 'subsidyapplicationsmerchantid' },
-    { title: '补贴金额', field: 'subsidyapplicationssubsidyamount' },
-    { title: '审批状态', field: 'subsidyapplicationsapprovalstatus' },
-    { title: '申请日期', field: 'subsidyapplicationsapplydate' },
+    { title: '补贴申请ID', field: 'subsidyapplicationsid', sortable: true },
+    {
+      title: '渠道商ID',
+      field: 'subsidyapplicationsmerchantid',
+      sortable: true,
+    },
+    {
+      title: '补贴金额',
+      field: 'subsidyapplicationssubsidyamount',
+      sortable: true,
+    },
+    {
+      title: '审批状态',
+      field: 'subsidyapplicationsapprovalstatus',
+      sortable: true,
+    },
+    {
+      title: '申请日期',
+      field: 'subsidyapplicationsapplydate',
+      sortable: true,
+    },
     {
       title: '操作',
       field: 'action',

+ 11 - 10
apps/web-ele/src/views/order-manage/index.vue

@@ -70,18 +70,19 @@ const gridOptions: VxeGridProps<any> = {
   },
 
   columns: [
-    { title: '订单号', field: 'ordersnumber' },
-    { title: '订单关联用户id', field: 'ordersuserid' },
-    { title: '订单关联产品id', field: 'ordersproductid' },
-    { title: '产品名称', field: 'ordersproductname' },
-    { title: '产品sn', field: 'ordersproductsn' },
-    { title: '订单总金额', field: 'orderstotalprice' },
-    { title: '订单优惠后金额', field: 'ordersdiscountprice' },
-    { title: '优惠金额', field: 'ordersyhprice' },
-    { title: '优惠卷id', field: 'orderscouponid' },
+    { title: '订单号', field: 'ordersnumber', sortable: true },
+    { title: '订单关联用户id', field: 'ordersuserid', sortable: true },
+    { title: '订单关联产品id', field: 'ordersproductid', sortable: true },
+    { title: '产品名称', field: 'ordersproductname', sortable: true },
+    { title: '产品sn', field: 'ordersproductsn', sortable: true },
+    { title: '订单总金额', field: 'orderstotalprice', sortable: true },
+    { title: '订单优惠后金额', field: 'ordersdiscountprice', sortable: true },
+    { title: '优惠金额', field: 'ordersyhprice', sortable: true },
+    { title: '优惠卷id', field: 'orderscouponid', sortable: true },
     {
       title: '订单状态',
       field: 'ordersorderstatus',
+      sortable: true,
       slots: {
         default: ({ row }) => {
           const type = row.ordersorderstatus as 0 | 1 | 2;
@@ -98,7 +99,7 @@ const gridOptions: VxeGridProps<any> = {
         },
       },
     },
-    { title: '下单时间', field: 'ordersorderdate' },
+    { title: '下单时间', field: 'ordersorderdate', sortable: true },
     {
       title: '操作',
       field: 'action',

+ 23 - 12
apps/web-ele/src/views/product-manage/index.vue

@@ -68,23 +68,34 @@ const gridOptions: VxeGridProps<any> = {
   },
 
   columns: [
-    { title: '机具类型', field: 'productsjjlx' },
-    { title: '产品名称', field: 'productsname' },
-    { title: '产品类别', field: 'productscategory' },
-    { title: '产品型号', field: 'productsmodel' },
+    { title: '机具类型', field: 'productsjjlx', sortable: true },
+    { title: '产品名称', field: 'productsname', sortable: true },
+    { title: '产品类别', field: 'productscategory', sortable: true },
+    { title: '产品型号', field: 'productsmodel', sortable: true },
     // { title: '产品sn号', field: 'productssn' },
-    { title: '品目', field: 'productspm' },
-    { title: '一级分类', field: 'productsfl1' },
-    { title: '二级分类', field: 'productsfl2' },
-    { title: '分档名称', field: 'productsfdmc' },
-    { title: '分档编号', field: 'productsfdbh' },
-    { title: '产品原价', field: 'productsprice', formatter: formatMoney },
-    { title: '中央补贴金额', field: 'productszybt', formatter: formatMoney },
+    { title: '品目', field: 'productspm', sortable: true },
+    { title: '一级分类', field: 'productsfl1', sortable: true },
+    { title: '二级分类', field: 'productsfl2', sortable: true },
+    { title: '分档名称', field: 'productsfdmc', sortable: true },
+    { title: '分档编号', field: 'productsfdbh', sortable: true },
+    {
+      title: '产品原价',
+      field: 'productsprice',
+      formatter: formatMoney,
+      sortable: true,
+    },
+    {
+      title: '中央补贴金额',
+      field: 'productszybt',
+      formatter: formatMoney,
+      sortable: true,
+    },
     {
       title: '特殊县中央补贴金额',
       field: 'productstsxzybt',
       formatter: formatMoney,
-      width: 150,
+      width: 170,
+      sortable: true,
     },
     { title: '创建时间', field: 'productsdate' },
     {

+ 6 - 6
apps/web-ele/src/views/scqy-manage/index.vue

@@ -68,12 +68,12 @@ const gridOptions: VxeGridProps<any> = {
   },
 
   columns: [
-    { title: '企业名称', field: 'scqyinfomc' },
-    { title: '企业地址', field: 'scqyinfoaddress' },
-    { title: '法人姓名', field: 'scqyinfofrmc' },
-    { title: '电子邮箱', field: 'scqyinfomail' },
-    { title: '销售联系人', field: 'scqyinfoxsmc' },
-    { title: '销售联系手机号', field: 'scqyinfoxsphone' },
+    { title: '企业名称', field: 'scqyinfomc', sortable: true },
+    { title: '企业地址', field: 'scqyinfoaddress', sortable: true },
+    { title: '法人姓名', field: 'scqyinfofrmc', sortable: true },
+    { title: '电子邮箱', field: 'scqyinfomail', sortable: true },
+    { title: '销售联系人', field: 'scqyinfoxsmc', sortable: true },
+    { title: '销售联系手机号', field: 'scqyinfoxsphone', sortable: true },
     {
       title: '操作',
       field: 'action',

+ 21 - 5
apps/web-ele/src/views/subsidy-manage/index.vue

@@ -66,11 +66,27 @@ const gridOptions: VxeGridProps<any> = {
   },
 
   columns: [
-    { title: '补贴申请ID', field: 'subsidyapplicationsid' },
-    { title: '渠道商ID', field: 'subsidyapplicationsmerchantid' },
-    { title: '补贴金额', field: 'subsidyapplicationssubsidyamount' },
-    { title: '审批状态', field: 'subsidyapplicationsapprovalstatus' },
-    { title: '申请日期', field: 'subsidyapplicationsapplydate' },
+    { title: '补贴申请ID', field: 'subsidyapplicationsid', sortable: true },
+    {
+      title: '渠道商ID',
+      field: 'subsidyapplicationsmerchantid',
+      sortable: true,
+    },
+    {
+      title: '补贴金额',
+      field: 'subsidyapplicationssubsidyamount',
+      sortable: true,
+    },
+    {
+      title: '审批状态',
+      field: 'subsidyapplicationsapprovalstatus',
+      sortable: true,
+    },
+    {
+      title: '申请日期',
+      field: 'subsidyapplicationsapplydate',
+      sortable: true,
+    },
     {
       title: '操作',
       field: 'action',

+ 5 - 4
apps/web-ele/src/views/system-manage/data-dictionary/index.vue

@@ -91,12 +91,13 @@ const gridOptions: VxeGridProps<any> = {
   },
 
   columns: [
-    { title: '配置名称', field: 'title' },
-    { title: '组名称', field: 'groupname' },
-    { title: '配置值', field: 'substance' },
+    { title: '配置名称', field: 'title', sortable: true },
+    { title: '组名称', field: 'groupname', sortable: true },
+    { title: '配置值', field: 'substance', sortable: true },
     {
       title: '状态',
       field: 'available',
+      sortable: true,
       slots: {
         default: ({ row }) => {
           const status = row.available;
@@ -113,7 +114,7 @@ const gridOptions: VxeGridProps<any> = {
         },
       },
     },
-    { title: '描述', field: 'describes' },
+    { title: '描述', field: 'describes', sortable: true },
     // {
     //   title: '前端可用',
     //   field: 'ispublic',

+ 8 - 6
apps/web-ele/src/views/system-manage/menu-manage/index.vue

@@ -93,11 +93,12 @@ const gridOptions: VxeGridProps<any> = {
   },
 
   columns: [
-    { title: '菜单名称', field: 'menu_name' },
+    { title: '菜单名称', field: 'menu_name', sortable: true },
     // { title: '菜单分类', field: 'menu_sort' },
     {
       title: '菜单类型',
       field: 'menu_type',
+      sortable: true,
       slots: {
         default: ({ row }) => {
           const type = row.menu_type;
@@ -121,13 +122,14 @@ const gridOptions: VxeGridProps<any> = {
         },
       },
     },
-    { title: '菜单标识', field: 'menu_key' },
-    { title: '路径', field: 'path' },
-    { title: '组件', field: 'component' },
-    { title: '图标', field: 'icon' },
+    { title: '菜单标识', field: 'menu_key', sortable: true },
+    { title: '路径', field: 'path', sortable: true },
+    { title: '组件', field: 'component', sortable: true },
+    { title: '图标', field: 'icon', sortable: true },
     {
       title: '状态',
       field: 'visible',
+      sortable: true,
       slots: {
         default: ({ row }) => {
           const status = row.visible;
@@ -144,7 +146,7 @@ const gridOptions: VxeGridProps<any> = {
         },
       },
     },
-    { title: '排序', field: 'order_num' },
+    { title: '排序', field: 'order_num', sortable: true },
     {
       title: '操作',
       field: 'action',

+ 7 - 6
apps/web-ele/src/views/system-manage/operation-logs/index.vue

@@ -97,12 +97,13 @@ const gridOptions: VxeGridProps<any> = {
   },
 
   columns: [
-    { title: '流水号', field: 'id' },
-    { title: '方法名', field: 'method' },
-    { title: '终端', field: 'terminal' },
+    { title: '流水号', field: 'id', sortable: true },
+    { title: '方法名', field: 'method', sortable: true },
+    { title: '终端', field: 'terminal', sortable: true },
     {
       title: '执行时间(ms)',
       field: 'extime',
+      sortable: true,
       slots: {
         default: ({ row }) => {
           const time = row.extime;
@@ -124,9 +125,9 @@ const gridOptions: VxeGridProps<any> = {
         },
       },
     },
-    { title: 'IP地址', field: 'ip' },
-    { title: '账号', field: 'account' },
-    { title: '生成时间', field: 'createtime' },
+    { title: 'IP地址', field: 'ip', sortable: true },
+    { title: '账号', field: 'account', sortable: true },
+    { title: '生成时间', field: 'createtime', sortable: true },
     {
       title: '操作',
       field: 'action',

+ 9 - 3
apps/web-ele/src/views/system-manage/role-manage/index.vue

@@ -86,12 +86,13 @@ const gridOptions: VxeGridProps<any> = {
 
   columns: [
     // { title: '角色ID', field: 'id', width: 80 },
-    { title: '角色名称', field: 'title', minWidth: 120 },
+    { title: '角色名称', field: 'title', minWidth: 120, sortable: true },
     // { title: '排序', field: 'group_sort', width: 80 },
     {
       title: '状态',
       field: 'available',
       width: 100,
+      sortable: true,
       slots: {
         default: ({ row }) => {
           return h(
@@ -106,8 +107,13 @@ const gridOptions: VxeGridProps<any> = {
         },
       },
     },
-    { title: '描述', field: 'details', minWidth: 150 },
-    { title: '创建时间', field: 'group_createdate', width: 160 },
+    { title: '描述', field: 'details', minWidth: 150, sortable: true },
+    {
+      title: '创建时间',
+      field: 'group_createdate',
+      width: 160,
+      sortable: true,
+    },
     // { title: '更新时间', field: 'group_update', width: 160 },
     {
       title: '操作',

+ 5 - 5
apps/web-ele/src/views/system-manage/user-manage/index.vue

@@ -102,14 +102,14 @@ const gridOptions: VxeGridProps<any> = {
         },
       },
     },
-    { title: '备注', field: 'accountbz' },
-    { title: '角色组', field: 'accountgrouplist' },
-    { title: '创建人', field: 'accountcreateuser' },
-    { title: '开通时间', field: 'accountcreatedate' },
+    { title: '备注', field: 'accountbz', sortable: true },
+    { title: '角色组', field: 'accountgrouplist', sortable: true },
+    { title: '创建人', field: 'accountcreateuser', sortable: true },
+    { title: '开通时间', field: 'accountcreatedate', sortable: true },
     // { title: '到期时间', field: 'accountenddate' },
     // { title: '更新时间', field: 'accountupdate' },
     // { title: '更新人', field: 'accountupuser' },
-    { title: '关联职员id', field: 'accountworkerid' },
+    { title: '关联职员id', field: 'accountworkerid', sortable: true },
     {
       title: '操作',
       field: 'action',

+ 10 - 10
apps/web-ele/src/views/system-manage/worker-manage/index.vue

@@ -77,20 +77,20 @@ const gridOptions: VxeGridProps<any> = {
 
   columns: [
     // { title: '职员id', field: 'worker_id' },
-    { title: '姓名', field: 'worker_xm' },
-    { title: '工号', field: 'worker_gh' },
-    { title: '类别', field: 'worker_lb' },
-    { title: '状态', field: 'worker_zt' },
+    { title: '姓名', field: 'worker_xm', sortable: true },
+    { title: '工号', field: 'worker_gh', sortable: true },
+    { title: '类别', field: 'worker_lb', sortable: true },
+    { title: '状态', field: 'worker_zt', sortable: true },
     // { title: '所属部门', field: 'worker_ssbm' },
     // { title: '二级部门', field: 'worker_ssbm2' },
-    { title: '岗位', field: 'worker_gw' },
-    { title: '联系地址', field: 'worker_lxdz' },
-    { title: '联系电话', field: 'worker_dh' },
-    { title: '邮箱', field: 'worker_email' },
+    { title: '岗位', field: 'worker_gw', sortable: true },
+    { title: '联系地址', field: 'worker_lxdz', sortable: true },
+    { title: '联系电话', field: 'worker_dh', sortable: true },
+    { title: '邮箱', field: 'worker_email', sortable: true },
     // { title: '紧急联系人', field: 'worker_jjlxr' },
     // { title: '紧急联系电话', field: 'worker_jjlxdh', width: 120 },
-    { title: '创建时间', field: 'worker_createdate' },
-    { title: '创建者', field: 'worker_create' },
+    { title: '创建时间', field: 'worker_createdate', sortable: true },
+    { title: '创建者', field: 'worker_create', sortable: true },
     // { title: '是否绑定微信', field: 'worker_iswxbind', width: 120 },
     {
       title: '操作',

+ 2 - 2
packages/@core/preferences/src/config.ts

@@ -3,7 +3,7 @@ import type { Preferences } from './types';
 const defaultPreferences: Preferences = {
   app: {
     accessMode: 'backend',
-    authPageLayout: 'panel-right',
+    authPageLayout: 'panel-center',
     checkUpdatesInterval: 1,
     colorGrayMode: false,
     colorWeakMode: false,
@@ -31,7 +31,7 @@ const defaultPreferences: Preferences = {
     styleType: 'normal',
   },
   copyright: {
-    companyName: 'Samool',
+    companyName: '达州市达川区农机化技术推广服务站',
     companySiteLink: '',
     date: '2025',
     enable: true,

+ 7 - 5
packages/effects/layouts/src/authentication/authentication.vue

@@ -101,7 +101,7 @@ const { authPanelCenter, authPanelLeft, authPanelRight, isDark } =
     <div v-if="authPanelCenter" class="flex-center relative w-full">
       <div class="login-background absolute left-0 top-0 size-full"></div>
       <AuthenticationFormView
-        class="md:bg-background shadow-primary/5 shadow-float w-full rounded-3xl pb-20 md:w-2/3 lg:w-1/2 xl:w-[36%]"
+        class="md:bg-background shadow-primary/5 shadow-float w-full rounded-3xl pb-20 md:w-2/3 lg:w-1/2 xl:w-[25%]"
       >
         <template v-if="copyright" #copyright>
           <slot name="copyright">
@@ -133,16 +133,18 @@ const { authPanelCenter, authPanelLeft, authPanelRight, isDark } =
 
 <style scoped>
 .login-background {
-  background: linear-gradient(
+  /* background: linear-gradient(
     154deg,
     #07070915 30%,
     hsl(var(--primary) / 30%) 48%,
     #07070915 64%
   );
-  filter: blur(100px);
+  filter: blur(100px); */
+  background: url('/images/bg.webp') no-repeat center center;
+  background-size: cover;
 }
 
-.dark {
+/* .dark {
   .login-background {
     background: linear-gradient(
       154deg,
@@ -152,5 +154,5 @@ const { authPanelCenter, authPanelLeft, authPanelRight, isDark } =
     );
     filter: blur(100px);
   }
-}
+} */
 </style>