Merge branch 'wang' into test

.env.development

@@ -4,8 +4,8 @@ ENV = 'development'
 
 # 本地环境接口地址
 # VITE_API_URL = 'http://127.0.0.1:8000'
-# VITE_API_URL = 'http://192.168.1.225/'
- VITE_API_URL = 'http://192.168.1.22:8080/'
+VITE_API_URL = 'http://192.168.1.225/'
+# VITE_API_URL = 'http://192.168.1.25:8080/'
 # VITE_API_URL = 'http://amzads.zositechc.cn'
 
 # 是否启用按钮权限

components.d.ts

@@ -31,8 +31,12 @@ declare module 'vue' {
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
     ElCard: typeof import('element-plus/es')['ElCard']
+    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
+    ElCollapse: typeof import('element-plus/es')['ElCollapse']
+    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElContainer: typeof import('element-plus/es')['ElContainer']
@@ -43,6 +47,7 @@ declare module 'vue' {
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
     ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
+    ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElHeader: typeof import('element-plus/es')['ElHeader']
@@ -55,6 +60,7 @@ declare module 'vue' {
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
+    ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElProgress: typeof import('element-plus/es')['ElProgress']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
@@ -64,9 +70,13 @@ declare module 'vue' {
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
+    ElTable: typeof import('element-plus/es')['ElTable']
+    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
+    ElTag: typeof import('element-plus/es')['ElTag']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
+    ElUpload: typeof import('element-plus/es')['ElUpload']
     FileUploader: typeof import('./src/components/FileUploader/index.vue')['default']
     ForeignKey: typeof import('./src/components/foreignKey/index.vue')['default']
     IconSelector: typeof import('./src/components/iconSelector/index.vue')['default']

src/main.ts

@@ -5,8 +5,8 @@ import { directive } from '/@/utils/directive'
 import { i18n } from '/@/i18n'
 import other from '/@/utils/other'
 import '/@/assets/style/tailwind.css' // 先引入tailwind css, 以免element-plus冲突
-// import ElementPlus from 'element-plus'
-// import 'element-plus/dist/index.css'
+import ElementPlus from 'element-plus'
+import 'element-plus/dist/index.css'
 import 'element-plus/es/components/menu/style/css'	// element-plus按需导入会导致菜单样式出现问题 单独导入
 import '/@/theme/index.scss'
 import mitt from 'mitt'
@@ -39,7 +39,7 @@ import UTC from 'dayjs/plugin/utc'
 import Timezon from 'dayjs/plugin/timezone'
 import IsSameOrBefore from 'dayjs/plugin/isSameOrBefore'
 import 'dayjs/locale/zh-cn'
-import { ElementPlus } from '@element-plus/icons-vue';
+// import { ElementPlus } from '@element-plus/icons-vue';
 
 dayjs.extend(UTC)
 dayjs.extend(Timezon)
@@ -70,7 +70,7 @@ app.use(permission)
 // @ts-ignore
 app.use(pinia)
     .use(router)
-    // .use(ElementPlus, { i18n: i18n.global.t })
+    .use(ElementPlus, { i18n: i18n.global.t })
     .use(i18n).use(VueGridLayout).use(fastCrud).mount('#app')
 
 app.config.globalProperties.mittBus = mitt()

vite.config.ts

@@ -25,18 +25,18 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
       vue(),
       vueJsx(),
       // vueSetupExtend(),
-      AutoImport({
-        imports: [
-          'vue',
-          'vue-router',
-          'pinia'
-        ],
-        resolvers: [ElementPlusResolver()],
-        dts: 'src/auto-imports.d.ts', // 生成 TypeScript 声明文件
-      }),
-      Components({
-        resolvers: [ElementPlusResolver()],
-      }),
+      // AutoImport({
+      //   imports: [
+      //     'vue',
+      //     'vue-router',
+      //     'pinia'
+      //   ],
+      //   resolvers: [ElementPlusResolver()],
+      //   dts: 'src/auto-imports.d.ts', // 生成 TypeScript 声明文件
+      // }),
+      // Components({
+      //   resolvers: [ElementPlusResolver()],
+      // }),
       compression({
         algorithm: 'gzip', // 使用 gzip 压缩
         ext: '.gz', // 输出的文件扩展名