Parcourir la source

优化基础设置

wulei il y a 3 mois
Parent
commit
664726d6ff

+ 3 - 3
snowy-admin-web/src/config/index.js

@@ -43,10 +43,10 @@ const DEFAULT_CONFIG = {
 	SNOWY_MODULE_UNFOLD_OPEN: true,
 
 	// 是否开启多标签
-	SNOWY_LAYOUT_TAGS_OPEN: true,
+	SNOWY_LAYOUT_TAGS_OPEN: false,
 
 	// 是否开启展示面包屑
-	SNOWY_BREADCRUMB_OPEN: false,
+	SNOWY_BREADCRUMB_OPEN: true,
 
 	// 顶栏是否应用主题色
 	SNOWY_TOP_HEADER_THEME_COLOR_OPEN: false,
@@ -64,7 +64,7 @@ const DEFAULT_CONFIG = {
 	SNOWY_FOOTER_COPYRIGHT_OPEN: false,
 
 	// 圆角风格
-	SNOWY_ROUNDED_CORNER_STYLE_OPEN: false,
+	SNOWY_ROUNDED_CORNER_STYLE_OPEN: true,
 
 	// 语言
 	LANG: 'zh-cn',

+ 1 - 1
snowy-admin-web/src/views/auth/login/login.vue

@@ -8,7 +8,7 @@
 					target="_blank"
 					@click="handleLink"
 				>
-					<img :alt="sysBaseConfig.SNOWY_SYS_NAME" :src="sysBaseConfig.SNOWY_SYS_LOGO" />
+					<img :alt="sysBaseConfig.SNOWY_SYS_NAME" src="/img/logo.png" />
 				</a>
 			</div>
 		</div>

+ 11 - 8
snowy-admin-web/src/views/biz/org/form.vue

@@ -28,6 +28,9 @@
 			<a-form-item label="机构名称:" name="name">
 				<a-input v-model:value="formData.name" placeholder="请输入机构名称" allow-clear />
 			</a-form-item>
+			<a-form-item label="机构地址:" name="name">
+				<a-input v-model:value="formData.address" placeholder="请输入门店地址" allow-clear />
+			</a-form-item>
 			<a-form-item label="机构分类:" name="category">
 				<a-select
 					v-model:value="formData.category"
@@ -39,14 +42,14 @@
 			<a-form-item label="排序:" name="sortCode">
 				<a-input-number class="xn-wd" v-model:value="formData.sortCode" :max="100" />
 			</a-form-item>
-			<a-form-item label="指定主管:" name="directorId">
-				<xn-user-selector
-					:org-tree-api="selectorApiFunction.orgTreeApi"
-					:user-page-api="selectorApiFunction.userPageApi"
-					:radio-model="true"
-					v-model:value="formData.directorId"
-				/>
-			</a-form-item>
+<!--			<a-form-item label="指定主管:" name="directorId">-->
+<!--				<xn-user-selector-->
+<!--					:org-tree-api="selectorApiFunction.orgTreeApi"-->
+<!--					:user-page-api="selectorApiFunction.userPageApi"-->
+<!--					:radio-model="true"-->
+<!--					v-model:value="formData.directorId"-->
+<!--				/>-->
+<!--			</a-form-item>-->
 		</a-form>
 		<template #footer>
 			<a-button class="xn-mr8" @click="onClose">关闭</a-button>

+ 11 - 8
snowy-admin-web/src/views/sys/org/form.vue

@@ -28,6 +28,9 @@
 			<a-form-item label="组织名称:" name="name">
 				<a-input v-model:value="formData.name" placeholder="请输入组织名称" allow-clear />
 			</a-form-item>
+			<a-form-item label="组织地址:" name="address">
+				<a-input v-model:value="formData.address" placeholder="请输入组织地址" allow-clear />
+			</a-form-item>
 			<a-form-item label="组织分类:" name="category">
 				<a-select
 					v-model:value="formData.category"
@@ -39,14 +42,14 @@
 			<a-form-item label="排序:" name="sortCode">
 				<a-input-number class="xn-wd" v-model:value="formData.sortCode" :max="100" />
 			</a-form-item>
-			<a-form-item label="指定主管:" name="directorId">
-				<xn-user-selector
-					:org-tree-api="selectorApiFunction.orgTreeApi"
-					:user-page-api="selectorApiFunction.userPageApi"
-					:radio-model="true"
-					v-model:value="formData.directorId"
-				/>
-			</a-form-item>
+<!--			<a-form-item label="指定主管:" name="directorId">-->
+<!--				<xn-user-selector-->
+<!--					:org-tree-api="selectorApiFunction.orgTreeApi"-->
+<!--					:user-page-api="selectorApiFunction.userPageApi"-->
+<!--					:radio-model="true"-->
+<!--					v-model:value="formData.directorId"-->
+<!--				/>-->
+<!--			</a-form-item>-->
 		</a-form>
 		<template #footer>
 			<a-button class="xn-mr8" @click="onClose">关闭</a-button>

+ 7 - 2
snowy-admin-web/src/views/sys/org/index.vue

@@ -90,14 +90,19 @@
 			title: '组织名称',
 			dataIndex: 'name'
 		},
+		{
+			title: '组织地址',
+			dataIndex: 'address'
+		},
 		{
 			title: '分类',
-			dataIndex: 'category'
+			dataIndex: 'category',
+			width: 100
 		},
 		{
 			title: '排序',
 			dataIndex: 'sortCode',
-			width: 100
+			width: 80
 		},
 		{
 			title: '操作',

+ 4 - 0
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/entity/BizOrg.java

@@ -52,6 +52,10 @@ public class BizOrg extends CommonEntity {
     @Schema(description = "名称")
     private String name;
 
+    /** 地址 */
+    @Schema(description = "地址")
+    private String address;
+
     /** 编码 */
     @Schema(description = "编码")
     private String code;

+ 4 - 0
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/entity/SysOrg.java

@@ -52,6 +52,10 @@ public class SysOrg extends CommonEntity {
     @Schema(description = "名称")
     private String name;
 
+    /** 地址 */
+    @Schema(description = "地址")
+    private String address;
+
     /** 编码 */
     @Schema(description = "编码")
     private String code;

+ 1 - 1
snowy-web-app/src/main/resources/application-local.properties

@@ -16,7 +16,7 @@ spring.datasource.dynamic.strict=true
 # redis configuration
 #########################################
 spring.data.redis.host=127.0.0.1
-spring.data.redis.database=4
+spring.data.redis.database=1
 spring.data.redis.port=6379
 spring.data.redis.password=3893461
 spring.data.redis.timeout=10s