diff --git a/admin-client/.env.development b/admin-client/.env.development
index 0996528..57b1c6f 100644
--- a/admin-client/.env.development
+++ b/admin-client/.env.development
@@ -1,2 +1,2 @@
VUE_APP_BASE=/ #打包路径
-VITE_API_URL=http://192.168.195.30:91
\ No newline at end of file
+VITE_API_URL=http://localhost:901/
\ No newline at end of file
diff --git a/admin-client/dist/index.html b/admin-client/dist/index.html
index a15fb15..0f851b6 100644
--- a/admin-client/dist/index.html
+++ b/admin-client/dist/index.html
@@ -7,7 +7,7 @@
寰梦后台管理
-
+
diff --git a/admin-client/src/components.d.ts b/admin-client/src/components.d.ts
index 379a237..cf60ae0 100644
--- a/admin-client/src/components.d.ts
+++ b/admin-client/src/components.d.ts
@@ -40,6 +40,7 @@ declare module 'vue' {
AInputSearch: typeof import('ant-design-vue/es')['InputSearch']
ALayout: typeof import('ant-design-vue/es')['Layout']
ALayoutContent: typeof import('ant-design-vue/es')['LayoutContent']
+ ALayoutFooter: typeof import('ant-design-vue/es')['LayoutFooter']
ALayoutHeader: typeof import('ant-design-vue/es')['LayoutHeader']
ALayoutSider: typeof import('ant-design-vue/es')['LayoutSider']
AMenu: typeof import('ant-design-vue/es')['Menu']
@@ -81,6 +82,7 @@ declare module 'vue' {
AUploadDragger: typeof import('ant-design-vue/es')['UploadDragger']
BarChartTransverse: typeof import('./core/components/charts/BarChartTransverse.vue')['default']
ColumnSetting: typeof import('./core/components/curd/components/ColumnSetting.vue')['default']
+ copy: typeof import('./core/components/layouts/LayoutMode1 copy.vue')['default']
ExternalJump: typeof import('./core/components/ExternalJump.vue')['default']
FindBack: typeof import('./core/components/FindBack.vue')['default']
GenerateCron: typeof import('./core/components/GenerateCron.vue')['default']
@@ -103,6 +105,8 @@ declare module 'vue' {
LayoutMenuPc: typeof import('./core/components/layouts/LayoutMenuPc.vue')['default']
LayoutMenuSub: typeof import('./core/components/layouts/menus/LayoutMenuSub.vue')['default']
LayoutMode1: typeof import('./core/components/layouts/LayoutMode1.vue')['default']
+ LayoutMode2: typeof import('./core/components/layouts/LayoutMode2.vue')['default']
+ LayoutMode3: typeof import('./core/components/layouts/LayoutMode3.vue')['default']
LayoutSettings: typeof import('./core/components/layouts/LayoutSettings.vue')['default']
LayoutSider: typeof import('./core/components/layouts/LayoutSider.vue')['default']
LayoutTabs: typeof import('./core/components/layouts/LayoutTabs.vue')['default']
diff --git a/admin-client/src/core/components/layouts/Layout.vue b/admin-client/src/core/components/layouts/Layout.vue
index bdd432e..ff7de2c 100644
--- a/admin-client/src/core/components/layouts/Layout.vue
+++ b/admin-client/src/core/components/layouts/Layout.vue
@@ -1,11 +1,12 @@
-
+
diff --git a/admin-client/src/core/components/layouts/LayoutMode2.vue b/admin-client/src/core/components/layouts/LayoutMode2.vue
new file mode 100644
index 0000000..1069678
--- /dev/null
+++ b/admin-client/src/core/components/layouts/LayoutMode2.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/admin-client/src/core/components/layouts/LayoutMode3.vue b/admin-client/src/core/components/layouts/LayoutMode3.vue
new file mode 100644
index 0000000..d807b92
--- /dev/null
+++ b/admin-client/src/core/components/layouts/LayoutMode3.vue
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+ aa
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/admin-client/src/core/components/layouts/LayoutTabs.vue b/admin-client/src/core/components/layouts/LayoutTabs.vue
index 57002ce..34e3f47 100644
--- a/admin-client/src/core/components/layouts/LayoutTabs.vue
+++ b/admin-client/src/core/components/layouts/LayoutTabs.vue
@@ -70,10 +70,26 @@ const tabsTheme = computed(() => {
},
}"
>
-
-
+
+
- {{ translate(`menu.${item.meta.menuId}`, item.meta.title) }}
+ {{
+ translate(`menu.${item.meta.menuId}`, item.meta.title)
+ }}
@@ -81,7 +97,12 @@ const tabsTheme = computed(() => {
-
+
diff --git a/admin-client/src/views/Login.vue b/admin-client/src/views/Login.vue
index e7c62e8..1754430 100644
--- a/admin-client/src/views/Login.vue
+++ b/admin-client/src/views/Login.vue
@@ -42,8 +42,12 @@ async function check() {
const result = await LoginService.login(state.userName, state.userPassword);
loading.value = false;
if (result.code != 200) return;
+
+ console.log(result.data);
+
Tools.setAuthorization(result.data.token);
// router.push("/");
+
window.location.href = window.location.origin;
} catch (error) {
loading.value = false;
diff --git a/admin-client/src/views/apps/M_Songss/Index.vue b/admin-client/src/views/apps/M_Songss/Index.vue
index 5789206..9be9ce7 100644
--- a/admin-client/src/views/apps/M_Songss/Index.vue
+++ b/admin-client/src/views/apps/M_Songss/Index.vue
@@ -40,6 +40,7 @@ const refSearchForm = ref();
* 初始化
*/
onMounted(() => {
+ console.log('加载')
findList();
});
diff --git a/admin-client/vite.config.ts b/admin-client/vite.config.ts
index 620f2ef..ceb7c4a 100644
--- a/admin-client/vite.config.ts
+++ b/admin-client/vite.config.ts
@@ -39,7 +39,7 @@ export default defineConfig({
*/
base: process.env.VUE_APP_BASE, // process.env.NODE_ENV == "production" ? "/client/" : "/",
server: {
- port: 5501,
+ port: 501,
host: true,
proxy: {
"/api/v1": {
diff --git a/admin-server/MiaoYu.Api.Admin/appsettings.Development.json b/admin-server/MiaoYu.Api.Admin/appsettings.Development.json
index 8be13d3..e35ee4f 100644
--- a/admin-server/MiaoYu.Api.Admin/appsettings.Development.json
+++ b/admin-server/MiaoYu.Api.Admin/appsettings.Development.json
@@ -14,7 +14,7 @@
//"ConnectionString": "Server=localhost; port=3306; Database=hzy_admin_mysql_20230227; uid=root; pwd=123456; Convert Zero Datetime=False"
//// 连接字符串 - sqlserver
//"ConnectionString": "Server=192.168.195.2;Database=MiaoYu;User ID=zpc;Password=zpc;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;",
- "ConnectionString": "Server=192.168.195.2;Database=HZY;User ID=zpc;Password=zpc;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;"
+ "ConnectionString": "Server=192.168.1.17;Database=HZY;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;"
//// 连接字符串 - postgresql
//"ConnectionString": "User ID=postgres;Password=123456;Host=localhost;Port=5432;Database=hzy_microservices_pgsql_20230227;Pooling=true;TimeZone=Asia/Shanghai",
//// 连接字符串 - oracle
@@ -32,7 +32,7 @@
"Kestrel": {
"Endpoints": {
"Http": {
- "Url": "http://*:91"
+ "Url": "http://*:901"
}
}
}