From 075d457dc7e0d6e6f38490f73631a44a2f2aacee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Thu, 19 Oct 2023 16:10:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=97=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/application/settings.py        |  3 +++
 web/.env.development                   |  2 +-
 web/package.json                       |  1 +
 web/src/views/system/columns/index.vue | 14 +++++++-------
 web/src/views/system/role/crud.tsx     |  2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/backend/application/settings.py b/backend/application/settings.py
index 9e39c04..f59140f 100644
--- a/backend/application/settings.py
+++ b/backend/application/settings.py
@@ -44,6 +44,9 @@ DEBUG = locals().get("DEBUG", True)
 ALLOWED_HOSTS = locals().get("ALLOWED_HOSTS", ["*"])
 
 # Application definition
+CUSTOM_APPS = [
+    "dvadmin.system",
+]
 
 INSTALLED_APPS = [
     "django.contrib.auth",
diff --git a/web/.env.development b/web/.env.development
index c200ba4..dc36b29 100644
--- a/web/.env.development
+++ b/web/.env.development
@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 本地环境接口地址
-VITE_API_URL = 'http://huge-dream.natapp1.cc/'
+VITE_API_URL = 'http://127.0.0.1:8001'
 
 # 是否启用按钮权限
 VITE_PM_ENABLED = true
diff --git a/web/package.json b/web/package.json
index 6bb8ef9..31afb85 100644
--- a/web/package.json
+++ b/web/package.json
@@ -44,6 +44,7 @@
 		"splitpanes": "^3.1.5",
 		"tailwindcss": "^3.2.7",
 		"ts-md5": "^1.3.1",
+		"upgrade": "^1.1.0",
 		"vue": "^3.2.45",
 		"vue-clipboard3": "^2.0.0",
 		"vue-cropper": "^1.0.8",
diff --git a/web/src/views/system/columns/index.vue b/web/src/views/system/columns/index.vue
index cd7722e..21a7817 100644
--- a/web/src/views/system/columns/index.vue
+++ b/web/src/views/system/columns/index.vue
@@ -1,17 +1,17 @@
 <template>
 	<fs-page class="columns">
 		<el-row class="columns-el-row" :gutter="10">
-			<el-col :span="4">
+			<el-col :span="6">
 				<div class="columns-box columns-left">
 					<ItemCom title="角色" type="role" showPagination @fetchData="fetchRoleData" @itemClick="handleClick" />
 				</div>
 			</el-col>
-      <el-col :span="4">
-        <div class="columns-box columns-left">
-          <ItemCom title="菜单" type="menu" showPagination @fetchData="fetchMenuData" @itemClick="handleClick" />
-        </div>
-      </el-col>
-			<el-col :span="6">
+<!--      <el-col :span="4">-->
+<!--        <div class="columns-box columns-left">-->
+<!--          <ItemCom title="菜单" type="menu" showPagination @fetchData="fetchMenuData" @itemClick="handleClick" />-->
+<!--        </div>-->
+<!--      </el-col>-->
+			<el-col :span="8">
 				<div class="columns-box columns-center">
 					<ItemCom title="模型表" type="model" label="showText" value="key" @fetchData="fetchModelData" @itemClick="handleClick" />
 				</div>
diff --git a/web/src/views/system/role/crud.tsx b/web/src/views/system/role/crud.tsx
index e9522af..b978785 100644
--- a/web/src/views/system/role/crud.tsx
+++ b/web/src/views/system/role/crud.tsx
@@ -50,7 +50,7 @@ export const createCrudOptions = function ({
 			rowHandle: {
 				//固定右侧
 				fixed: 'right',
-				width: 260,
+				width: 320,
 				buttons: {
 					view: {
 						show: true,