From 5e56b8acc14b0e8402e16bbf72ba65b6564d606a Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 12 Dec 2024 17:36:26 +0800
Subject: [PATCH 1/4] =?UTF-8?q?base:bx=E4=B8=BB=E9=A2=98=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/config/index.js b/src/config/index.js
index f4b827fc..d5feb0eb 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -50,7 +50,8 @@ const DEFAULT_CONFIG = {
 	LANG: 'zh-cn',
 
 	//主题颜色
-	COLOR: '#536DFE',
+	// COLOR: '#536DFE',//gx、gz、tkx
+	COLOR: '#0052d9',//bx
 
 	//是否加密localStorage, 为空不加密，可填写AES(模式ECB,移位Pkcs7)加密
 	LS_ENCRYPTION: '',

From af9d54c4241df73fc16cc6c54535b99c519f85f3 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 13 Dec 2024 13:39:45 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=20base=20=E5=8A=9F=E8=83=BD=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4=E4=BB=A5=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=90=8E=E7=AB=AF=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ops/menu.vue | 73 +++++++++++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 29 deletions(-)

diff --git a/src/views/ops/menu.vue b/src/views/ops/menu.vue
index 685cc34a..a49f1f08 100644
--- a/src/views/ops/menu.vue
+++ b/src/views/ops/menu.vue
@@ -5,45 +5,37 @@
         <el-button type="primary" icon="el-icon-plus" @click="addMenu"></el-button>
       </div>
       <div class="right-panel">
-        <el-input
-          v-model="query.search"
-          placeholder="名称/权限标识"
-          clearable
-          @keyup.enter="handleQuery"
-        ></el-input>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          @click="handleQuery"
-        ></el-button>
+        <el-input v-model="query.search" placeholder="名称/权限标识" clearable @keyup.enter="handleQuery"></el-input>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
       </div>
     </el-header>
     <el-main class="nopadding">
       <scTable ref="table" :isTree="true" :apiObj="apiObj" :params="params" :query="query" row-key="id"
         @selection-change="selectionChange" hidePagination @dataChange="updateOptions">
-        <!-- <el-table-column type="selection" width="50"></el-table-column> -->
         <el-table-column label="#" type="index" width="50"></el-table-column>
-        <el-table-column label="菜单名称" prop="name" min-width="200"></el-table-column>
-        <el-table-column label="类型" prop="type" min-width="200">
+        <el-table-column label="功能名" prop="name" width="200"></el-table-column>
+        <el-table-column label="类型" prop="type" width="80">
           <template #default="scope">
             <span>{{ types[scope.row.type] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="标识" prop="codes" min-width="200" :show-overflow-tooltip="true">
+        <el-table-column label="路由名" prop="route_name" width="100"></el-table-column>
+        <el-table-column label="图标" prop="icon" width="80"></el-table-column>
+        <el-table-column label="组件" prop="component" width="150" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="权限标识" prop="codes" min-width="100" :show-overflow-tooltip="true">
           <template #default="scope">
             <el-tag v-for="i in scope.row.codes" v-bind:key="i">{{ i }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="排序" prop="sort" min-width="200"></el-table-column>
+        <el-table-column label="排序" prop="sort" width="80"></el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="200">
           <template #default="scope">
             <el-button type="primary" size="small" @click="editMenu(scope.row, scope.$index)">编辑</el-button>
-            <el-button type="danger" size="small" @click="delMenu(scope.row.id)">删除</el-button>
-            <!--<el-popconfirm title="确定删除吗？" @confirm="delMenu(scope.row, scope.$index)">
-							<template #reference>
-								<el-button link size="small">删除</el-button>
-							</template>
-  </el-popconfirm>-->
+            <el-popconfirm title="确定删除吗？" @confirm="delMenu(scope.row, scope.$index)">
+              <template #reference>
+                <el-button type="danger" size="small">删除</el-button>
+              </template>
+            </el-popconfirm>
           </template>
         </el-table-column>
       </scTable>
@@ -58,11 +50,32 @@
           <el-radio :value="30">接口</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="名称" prop="name">
+      <el-form-item label="功能名" prop="name">
         <el-input v-model="addForm.name" clearable></el-input>
       </el-form-item>
-      <el-form-item label="标识">
-        <!-- <el-input v-model="codes" clearable style="width: 90%;"></el-input> -->
+      <span v-show="addForm.type != 30">
+        <el-form-item label="路由名" prop="route_name">
+          <el-input v-model="addForm.route_name" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="图标" prop="icon">
+          <el-input v-model="addForm.icon" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="路由地址" prop="path">
+          <el-input v-model="addForm.path" clearable></el-input>
+        </el-form-item>
+        <span v-show="addForm.type == 20">
+          <el-form-item label="组件地址" prop="component">
+            <el-input v-model="addForm.component" clearable></el-input>
+          </el-form-item>
+        </span>
+        <el-form-item label="是否隐藏" prop="is_hidden">
+          <el-switch v-model="addForm.is_hidden"></el-switch>
+        </el-form-item>
+        <el-form-item label="是否全屏" prop="is_fullpage">
+          <el-switch v-model="addForm.is_fullpage"></el-switch>
+        </el-form-item>
+      </span>
+      <el-form-item label="权限标识">
         <el-select v-model="addForm.codes" multiple filterable allow-create default-first-option
           :reserve-keyword="false" placeholder="权限标识(回车添加多个)" style="width: 100%">
           <el-option v-for="item in permCodes" :key="item" :label="item" :value="item" />
@@ -87,10 +100,12 @@
 <script>
 import { genTree } from "@/utils/verificate";
 const dForm = {
-        codes: [],
-        type: 10,
-        sort: 1,
-      };
+  codes: [],
+  type: 10,
+  sort: 1,
+  is_hidden: false,
+  is_fullpage: false,
+};
 export default {
   name: "dept",
   data() {

From 72994074d7011eaf41660178a3b9bdf6d0ab5045 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 13 Dec 2024 13:43:46 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat:=20base=20=E5=8A=9F=E8=83=BD=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4=E4=BB=A5=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=90=8E=E7=AB=AF=E8=B7=AF=E7=94=B12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ops/menu.vue | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/views/ops/menu.vue b/src/views/ops/menu.vue
index a49f1f08..4fcc3b21 100644
--- a/src/views/ops/menu.vue
+++ b/src/views/ops/menu.vue
@@ -22,6 +22,16 @@
         <el-table-column label="路由名" prop="route_name" width="100"></el-table-column>
         <el-table-column label="图标" prop="icon" width="80"></el-table-column>
         <el-table-column label="组件" prop="component" width="150" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="是否隐藏" width="80">
+          <template #default="scope">
+            <span v-show="scope.row.is_hidden">是</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否全屏" width="80">
+          <template #default="scope">
+            <span v-show="scope.row.is_fullpage">是</span>
+          </template>
+        </el-table-column>
         <el-table-column label="权限标识" prop="codes" min-width="100" :show-overflow-tooltip="true">
           <template #default="scope">
             <el-tag v-for="i in scope.row.codes" v-bind:key="i">{{ i }}</el-tag>
@@ -67,13 +77,14 @@
           <el-form-item label="组件地址" prop="component">
             <el-input v-model="addForm.component" clearable></el-input>
           </el-form-item>
+
+          <el-form-item label="是否隐藏" prop="is_hidden">
+            <el-switch v-model="addForm.is_hidden"></el-switch>
+          </el-form-item>
+          <el-form-item label="是否全屏" prop="is_fullpage">
+            <el-switch v-model="addForm.is_fullpage"></el-switch>
+          </el-form-item>
         </span>
-        <el-form-item label="是否隐藏" prop="is_hidden">
-          <el-switch v-model="addForm.is_hidden"></el-switch>
-        </el-form-item>
-        <el-form-item label="是否全屏" prop="is_fullpage">
-          <el-switch v-model="addForm.is_fullpage"></el-switch>
-        </el-form-item>
       </span>
       <el-form-item label="权限标识">
         <el-select v-model="addForm.codes" multiple filterable allow-create default-first-option

From 663423a708d9ddcc35a88ccf3a24114e2d3a4a61 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 13 Dec 2024 16:13:23 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20base=20=E4=BC=98=E5=8C=96menu?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ops/menu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ops/menu.vue b/src/views/ops/menu.vue
index 4fcc3b21..cc887988 100644
--- a/src/views/ops/menu.vue
+++ b/src/views/ops/menu.vue
@@ -20,7 +20,7 @@
           </template>
         </el-table-column>
         <el-table-column label="路由名" prop="route_name" width="100"></el-table-column>
-        <el-table-column label="图标" prop="icon" width="80"></el-table-column>
+        <el-table-column label="图标" prop="icon" width="150"></el-table-column>
         <el-table-column label="组件" prop="component" width="150" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="是否隐藏" width="80">
           <template #default="scope">