From 969d9f5d7da66af409e270acf734b63dc1450dfc Mon Sep 17 00:00:00 2001
From: zhuqunfeng <zhu366437568@126.com>
Date: Tue, 11 Feb 2025 08:57:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=8F=8A=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table.vue                  |  577 +++++------
 src/components/amis/AmisComponent.vue     |  200 ++--
 src/components/layout/table/TbNavTabs.vue |   52 +-
 src/views/home/Home.vue                   |    7 +-
 src/views/lowcode/LcPages.vue             | 1060 +++++++++++----------
 src/views/system/Dict.vue                 |    8 +-
 src/views/system/Org.vue                  |   16 +-
 src/views/system/User.vue                 |   19 +-
 8 files changed, 1008 insertions(+), 931 deletions(-)

diff --git a/src/components/Table.vue b/src/components/Table.vue
index 57cab5e..2781d5d 100644
--- a/src/components/Table.vue
+++ b/src/components/Table.vue
@@ -1,292 +1,317 @@
 <script setup lang="ts">
-    import {reactive, toRefs, watch} from 'vue'
-    import common from '@/utils/common'
-    
-    const prop = defineProps({
-        loading: {
-            type: Boolean,
-            default: false
-        },
-        page: {
-            type: Object,
-            default:{
-                current: 1,
-                size: 10,
-                total: 0,
-            }
-        }, 
-        column: {
-            type: Object,
-            default: []
-        },
-        operation: {
-            type: Object,
-            default: {
-                isShow: false,
-                width: '220'
-            }
-        }, 
-        tableHeight: {
-            type: Number,
-            default: null
-        },
-        headerCellStyle: {
-            type: Object,
-            default:{color:'#606266', fontWeight: 700}
-        },
-        data: {
-            type: Array,
-            default: []
-        },
-    })
+import {reactive, toRefs, watch} from 'vue'
+import common from '@/utils/common'
+import {Sort, Setting} from '@element-plus/icons-vue'
 
-    const emit = defineEmits([
-        'onSizeChange','onCurrentChange','onSelectionChange','setCellColor',
-        'onButtonClick','onSwitchChange',
-    ])
-
-    const state = reactive({
-        maxHeight: window.innerHeight - 280,
-        tableHeight: prop.tableHeight,
-        headerCellStyle: prop.headerCellStyle,
-        size: 'default',
-        columns: prop.column.map((item:any) => {return item.prop}),
-        checkColAll: true,
-        isIndeterminate: true,
-        cellStyle: function(e:any){
-            let obj:any = {};
-            emit('setCellColor', e, (color = {}) =>{
-                obj = color;
-            });
-            return obj;
-        },
-    })
-    const {
-        maxHeight,tableHeight,headerCellStyle,cellStyle,size,columns,checkColAll,isIndeterminate 
-    } = toRefs(state)
-
-    const onSizeChange = (e:any) =>{
-        emit('onSizeChange', e)
+const prop = defineProps({
+  loading: {
+    type: Boolean,
+    default: false
+  },
+  page: {
+    type: Object,
+    default: {
+      current: 1,
+      size: 10,
+      total: 0,
     }
-    const onCurrentChange = (e:any) =>{
-        emit('onCurrentChange', e)
+  },
+  column: {
+    type: Object,
+    default: []
+  },
+  operation: {
+    type: Object,
+    default: {
+      isShow: false,
+      width: '220'
     }
+  },
+  tableHeight: {
+    type: Number,
+    default: null
+  },
+  headerCellStyle: {
+    type: Object,
+    default: {color: '#606266', fontWeight: 700}
+  },
+  data: {
+    type: Array,
+    default: []
+  },
+})
 
-    function onFind(arr:any,val:any){
-        if(!arr) return 'info';
-        return arr.find((item:any)=>{ return item.value == val}).label;
-    }
+const emit = defineEmits([
+  'onSizeChange', 'onCurrentChange', 'onSelectionChange', 'setCellColor',
+  'onButtonClick', 'onSwitchChange',
+])
 
-    function onCheckColAll(val:boolean){
-        const _columns = prop.column.map((item:any) => {return item.prop})
-        state.columns = val ? _columns : []
-        state.isIndeterminate = false
-    }
-    function onCheckedCol(value: string[]){
-        let checkedCount = value.length
-        state.checkColAll = checkedCount === prop.column.length
-        state.isIndeterminate = checkedCount > 0 && checkedCount < prop.column.length
-    }
+const state = reactive({
+  maxHeight: window.innerHeight - 280,
+  tableHeight: prop.tableHeight,
+  headerCellStyle: prop.headerCellStyle,
+  size: 'default',
+  columns: prop.column.map((item: any) => {
+    return item.prop
+  }),
+  checkColAll: true,
+  isIndeterminate: true,
+  cellStyle: function (e: any) {
+    let obj: any = {};
+    emit('setCellColor', e, (color = {}) => {
+      obj = color;
+    });
+    return obj;
+  },
+})
+const {
+  maxHeight, tableHeight, headerCellStyle, cellStyle, size, columns, checkColAll, isIndeterminate
+} = toRefs(state)
 
-    watch(columns, (newValue, oldValue) =>{
-        prop.column.filter((item:any) =>{
-            item.isShow = newValue.indexOf(item.prop) == -1;
-        })
-    })
+const onSizeChange = (e: any) => {
+  emit('onSizeChange', e)
+}
+const onCurrentChange = (e: any) => {
+  emit('onCurrentChange', e)
+}
+
+function onFind(arr: any, val: any) {
+  if (!arr) return 'info';
+  return arr.find((item: any) => {
+    return item.value == val
+  }).label;
+}
+
+function onCheckColAll(val: boolean) {
+  const _columns = prop.column.map((item: any) => {
+    return item.prop
+  })
+  state.columns = val ? _columns : []
+  state.isIndeterminate = false
+}
+
+function onCheckedCol(value: string[]) {
+  let checkedCount = value.length
+  state.checkColAll = checkedCount === prop.column.length
+  state.isIndeterminate = checkedCount > 0 && checkedCount < prop.column.length
+}
+
+watch(columns, (newValue) => {
+  prop.column.filter((item: any) => {
+    item.isShow = newValue.indexOf(item.prop) == -1;
+  })
+})
 
 </script>
 <template>
-    <div class="table-container">
-        <div class="search-wrap" v-if="$slots.search">
-            <el-space wrap>
-                <slot name="search"></slot>
-            </el-space>
-        </div>
-        <div class="table-wrap">
-            <div class="header">
-                <el-popover placement="bottom" :width="80" trigger="click">
-                    <template #reference>
-                        <el-button link>
-                            <el-icon :size="20"><Sort /></el-icon>
-                        </el-button>
-                    </template>
-                    <div>
-                        <el-radio-group v-model="size">
-                            <el-radio label="small">紧凑</el-radio>
-                            <el-radio label="default">默认</el-radio>
-                            <el-radio label="large">中等</el-radio>
-                        </el-radio-group>
-                    </div>
-                </el-popover>
-                <el-popover placement="bottom" :width="120" trigger="click">
-                    <template #reference>
-                        <el-button link>
-                            <el-icon :size="20"><Setting /></el-icon>
-                        </el-button>
-                    </template>
-                    <div>
-                        <el-checkbox v-model="checkColAll" :indeterminate="isIndeterminate" @change="onCheckColAll">全选/不选</el-checkbox>
-                        <el-scrollbar height="400px">
-                            <el-checkbox-group v-model="columns" @change="onCheckedCol" >
-                                <el-checkbox v-for="col in column" :key="col" :label="col.prop">{{col.label}}</el-checkbox>
-                            </el-checkbox-group>
-                        </el-scrollbar>
-                    </div>
-                </el-popover>
-            </div>
-            <el-table :data="data" border stripe :size="size" :height="tableHeight" :max-height="maxHeight" row-key="id" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-                v-loading="loading" :header-cell-style="headerCellStyle" :cell-style="cellStyle" 
-                @selection-change="$emit('onSelectionChange')" style="width: 100%;">
-                <template v-for="item in column" :key="item">
-                    <el-table-column v-if="!item.prop && !item.label && !item.isShow" :fixed="item.fixed" type="selection" width="45"></el-table-column>
-                    <!-- color值 -->
-                    <el-table-column v-else-if="item.type == 'color' && !item.isShow" 
-                        :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
-                        <template #default="scope">
-                            <span :style="{color: scope.row[item.prop]}">{{scope.row[item.prop]}}</span>
-                        </template>
-                    </el-table-column>
-                    <!-- icon图标 -->
-                    <el-table-column v-else-if="item.type == 'icon' && !item.isShow" 
-                        :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
-                        <template #default="scope">
-                            <el-icon :size="20">
-                                <component :is="scope.row[item.prop]"></component>
-                            </el-icon>
-                        </template>
-                    </el-table-column>
-                    <!-- el-statistic -->
-                    <el-table-column v-else-if="item.type == 'statistic' && !item.isShow" 
-                        :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
-                        <template #default="scope">
-                            <el-statistic :value="scope.row[item.prop]" 
-                            :precision="item.option.precision" 
-                            :formatter="item.option.formatter"
-                            :prefix="item.option.prefix" 
-                            :suffix="item.option.suffix"/>
-                        </template>
-                    </el-table-column>
-                    <!-- el-image -->
-                    <el-table-column v-else-if="item.type == 'image' && !item.isShow" 
-                        :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
-                        <template #default="scope">
-                            <el-image :src="scope.row[item.prop]" :preview-src-list="[scope.row[item.prop]]" preview-teleported fit="cover" style="width: 50px; height: 50px"/>
-                        </template>
-                    </el-table-column>
-                    <!-- el-rate -->
-                    <el-table-column v-else-if="item.type == 'rate' && !item.isShow" 
-                        :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
-                        <template #default="scope">
-                            <el-rate v-model="scope.row[item.prop]" disabled allow-half />
-                        </template>
-                    </el-table-column>
-                    <!-- el-tag -->
-                    <el-table-column v-else-if="item.type == 'tag' && !item.isShow" show-overflow-tooltip
-                        :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
-                        <template #default="scope">
-                            <el-tag :size="item.option.size" 
-                                :effect="item.option.effect" 
-                                :type="onFind(item.option.typeList, scope.row[item.prop])">
-                                {{scope.row[item.alias==null?item.prop:item.alias]}}    
-                            </el-tag>
-                        </template>
-                    </el-table-column>
-                    <!-- el-button -->
-                    <el-table-column v-else-if="item.type == 'button' && !item.isShow" show-overflow-tooltip
-                        :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
-                        <template #default="scope">
-                            <el-button @click="$emit('onButtonClick',scope.row)" :type="item.option.type" link :size="item.option.size">
-                                {{scope.row[item.alias==null?item.prop:item.alias]}}    
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                    <!-- el-switch -->
-                    <el-table-column v-else-if="item.type == 'switch' && !item.isShow" show-overflow-tooltip 
-                        :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
-                        <template #default="scope">
-                            <el-switch @change="$emit('onSwitchChange',scope.row)" :inline-prompt="!item.option.inlinePrompt"
-                                :active-value="item.option.activeValue" :active-color="item.option.activeColor" :active-text="item.option.activeText" 
-                                :inactive-value="item.option.inactiveValue" :inactive-color="item.option.inactiveColor" :inactive-text="item.option.inactiveText"
-                                :size="item.option.size"
-                                v-model="scope.row[item.prop]"
-                            ></el-switch>
-                        </template>
-                    </el-table-column>
-                    <!-- el-progress  -->
-                    <el-table-column v-else-if="item.type == 'progress' && !item.isShow" show-overflow-tooltip 
-                        :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
-                        <template #default="scope">
-                            <el-progress :percentage="scope.row[item.alias==null?item.prop:item.alias]" 
-                            :status="item.option.status"
-                            :color="item.option.color"/>
-                        </template>
-                    </el-table-column>
-                    <!-- 字典值  -->
-                    <el-table-column v-else-if="item.type == 'dict' && !item.isShow" 
-                        :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
-                        <template #default="scope">
-                            <span>{{common.getDictLabel(item.dictType, scope.row[item.prop])}}</span>
-                        </template>
-                    </el-table-column>
-                    <!-- 其他数据列 -->
-                    <el-table-column v-else-if="!item.isShow" show-overflow-tooltip 
-                        :prop="item.alias==null?item.prop:item.alias" 
-                        :label="item.label" 
-                        :align="item.align != null ? item.align : 'center'" 
-                        :width="item.width"
-                        :fixed="item.fixed"
-                        :formatter="item.function">
-                    </el-table-column>
-                </template>
-                <!-- 自定义插槽  -->
-                <el-table-column v-if="operation.isShow" fixed="right" label="操作" align="center" :width="operation.width">
-                    <template #default="scope">
-                        <slot name="column" v-bind:column="scope"></slot>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-        <div class="pagination-wrap" v-if="page">
-            <el-pagination @size-change="onSizeChange" @current-change="onCurrentChange"
-            layout="total, sizes, prev, pager, next, jumper"
-            :current-page="page.current"
-            :page-sizes="[10, 20, 50, 100]"
-            :page-size="page.size"
-            :total="page.total"/>
-        </div>
+  <div class="table-container">
+    <div class="search-wrap" v-if="$slots.search">
+      <el-space wrap>
+        <slot name="search"></slot>
+      </el-space>
     </div>
+    <div class="table-wrap">
+      <div class="header">
+        <el-popover placement="bottom" :width="80" trigger="click">
+          <template #reference>
+            <el-button link>
+              <el-icon :size="20">
+                <Sort/>
+              </el-icon>
+            </el-button>
+          </template>
+          <div>
+            <el-radio-group v-model="size">
+              <el-radio value="small">紧凑</el-radio>
+              <el-radio value="default">默认</el-radio>
+              <el-radio value="large">中等</el-radio>
+            </el-radio-group>
+          </div>
+        </el-popover>
+        <el-popover placement="bottom" :width="120" trigger="click">
+          <template #reference>
+            <el-button link>
+              <el-icon :size="20">
+                <Setting/>
+              </el-icon>
+            </el-button>
+          </template>
+          <div>
+            <el-checkbox v-model="checkColAll" :indeterminate="isIndeterminate" @change="onCheckColAll">全选/不选
+            </el-checkbox>
+            <el-scrollbar height="400px">
+              <el-checkbox-group v-model="columns" @change="onCheckedCol">
+                <el-checkbox v-for="col in column" :key="col" :label="col.label" :value="col.prop">{{ col.label }}
+                </el-checkbox>
+              </el-checkbox-group>
+            </el-scrollbar>
+          </div>
+        </el-popover>
+      </div>
+      <el-table :data="data" border stripe :size="size" :height="tableHeight" :max-height="maxHeight" row-key="id"
+                :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+                v-loading="loading" :header-cell-style="headerCellStyle" :cell-style="cellStyle"
+                @selection-change="$emit('onSelectionChange')" style="width: 100%;">
+        <template v-for="item in column" :key="item">
+          <el-table-column v-if="!item.prop && !item.label && !item.isShow" :fixed="item.fixed" type="selection"
+                           width="45"></el-table-column>
+          <!-- color值 -->
+          <el-table-column v-else-if="item.type == 'color' && !item.isShow"
+                           :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
+            <template #default="scope">
+              <span :style="{color: scope.row[item.prop]}">{{ scope.row[item.prop] }}</span>
+            </template>
+          </el-table-column>
+          <!-- icon图标 -->
+          <el-table-column v-else-if="item.type == 'icon' && !item.isShow"
+                           :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
+            <template #default="scope">
+              <el-icon :size="20">
+                <component :is="scope.row[item.prop]"></component>
+              </el-icon>
+            </template>
+          </el-table-column>
+          <!-- el-statistic -->
+          <el-table-column v-else-if="item.type == 'statistic' && !item.isShow"
+                           :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
+            <template #default="scope">
+              <el-statistic :value="scope.row[item.prop]"
+                            :precision="item.option.precision"
+                            :formatter="item.option.formatter"
+                            :prefix="item.option.prefix"
+                            :suffix="item.option.suffix"/>
+            </template>
+          </el-table-column>
+          <!-- el-image -->
+          <el-table-column v-else-if="item.type == 'image' && !item.isShow"
+                           :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
+            <template #default="scope">
+              <el-image :src="scope.row[item.prop]" :preview-src-list="[scope.row[item.prop]]" preview-teleported
+                        fit="cover" style="width: 50px; height: 50px"/>
+            </template>
+          </el-table-column>
+          <!-- el-rate -->
+          <el-table-column v-else-if="item.type == 'rate' && !item.isShow"
+                           :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
+            <template #default="scope">
+              <el-rate v-model="scope.row[item.prop]" disabled allow-half/>
+            </template>
+          </el-table-column>
+          <!-- el-tag -->
+          <el-table-column v-else-if="item.type == 'tag' && !item.isShow" show-overflow-tooltip
+                           :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
+            <template #default="scope">
+              <el-tag :size="item.option.size"
+                      :effect="item.option.effect"
+                      :type="onFind(item.option.typeList, scope.row[item.prop])">
+                {{ scope.row[item.alias == null ? item.prop : item.alias] }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <!-- el-button -->
+          <el-table-column v-else-if="item.type == 'button' && !item.isShow" show-overflow-tooltip
+                           :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
+            <template #default="scope">
+              <el-button @click="$emit('onButtonClick',scope.row)" :type="item.option.type" link
+                         :size="item.option.size">
+                {{ scope.row[item.alias == null ? item.prop : item.alias] }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <!-- el-switch -->
+          <el-table-column v-else-if="item.type == 'switch' && !item.isShow" show-overflow-tooltip
+                           :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
+            <template #default="scope">
+              <el-switch @change="$emit('onSwitchChange',scope.row)" :inline-prompt="!item.option.inlinePrompt"
+                         :active-value="item.option.activeValue" :active-color="item.option.activeColor"
+                         :active-text="item.option.activeText"
+                         :inactive-value="item.option.inactiveValue" :inactive-color="item.option.inactiveColor"
+                         :inactive-text="item.option.inactiveText"
+                         :size="item.option.size"
+                         v-model="scope.row[item.prop]"
+              ></el-switch>
+            </template>
+          </el-table-column>
+          <!-- el-progress  -->
+          <el-table-column v-else-if="item.type == 'progress' && !item.isShow" show-overflow-tooltip
+                           :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
+            <template #default="scope">
+              <el-progress :percentage="scope.row[item.alias==null?item.prop:item.alias]"
+                           :status="item.option.status"
+                           :color="item.option.color"/>
+            </template>
+          </el-table-column>
+          <!-- 字典值  -->
+          <el-table-column v-else-if="item.type == 'dict' && !item.isShow"
+                           :label="item.label" :align="item.align != null ? item.align : 'center'" :width="item.width">
+            <template #default="scope">
+              <span>{{ common.getDictLabel(item.dictType, scope.row[item.prop]) }}</span>
+            </template>
+          </el-table-column>
+          <!-- 其他数据列 -->
+          <el-table-column v-else-if="!item.isShow" show-overflow-tooltip
+                           :prop="item.alias==null?item.prop:item.alias"
+                           :label="item.label"
+                           :align="item.align != null ? item.align : 'center'"
+                           :width="item.width"
+                           :fixed="item.fixed"
+                           :formatter="item.function">
+          </el-table-column>
+        </template>
+        <!-- 自定义插槽  -->
+        <el-table-column v-if="operation.isShow" fixed="right" label="操作" align="center" :width="operation.width">
+          <template #default="scope">
+            <slot name="column" v-bind:column="scope"></slot>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="pagination-wrap" v-if="page">
+      <el-pagination @size-change="onSizeChange" @current-change="onCurrentChange"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     :current-page="page.current"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="page.size"
+                     :total="page.total"/>
+    </div>
+  </div>
 </template>
 <style scoped lang="scss">
-    .table-container{
-        .search-wrap{
-            // background: var(--bg1);
-            border: 1px solid var(--el-border-color);
-            border-radius: var(--el-border-radius-base);
-            padding: 1rem;
-        }
-        .table-wrap{
-            padding: 1rem 0;
-            .header{
-            float: right;
-            padding-bottom: 0.4rem;
-            }
-        }
-        .pagination-wrap{
-            padding-bottom: 0.2rem;
-            float: right;
-        }
-    }
+.table-container {
+  .search-wrap {
+    // background: var(--bg1);
+    border: 1px solid var(--el-border-color);
+    border-radius: var(--el-border-radius-base);
+    padding: 1rem;
+  }
 
-    .el-table__body-wrapper::-webkit-scrollbar {
-        width: 5px;
-        height: 1px;
-    }
-    .el-table__body-wrapper::-webkit-scrollbar-thumb {
-        background-color: #909399;
-        border-radius: 5px;
-    }
-    .el-table__body-wrapper::-webkit-scrollbar-track {
-        border-radius: 5px;
-        background: #ededed;
+  .table-wrap {
+    padding: 1rem 0;
+
+    .header {
+      float: right;
+      padding-bottom: 0.4rem;
     }
+  }
+
+  .pagination-wrap {
+    padding-bottom: 0.2rem;
+    float: right;
+  }
+}
+
+.el-table__body-wrapper::-webkit-scrollbar {
+  width: 5px;
+  height: 1px;
+}
+
+.el-table__body-wrapper::-webkit-scrollbar-thumb {
+  background-color: #909399;
+  border-radius: 5px;
+}
+
+.el-table__body-wrapper::-webkit-scrollbar-track {
+  border-radius: 5px;
+  background: #ededed;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/amis/AmisComponent.vue b/src/components/amis/AmisComponent.vue
index c849cc6..134f3a7 100644
--- a/src/components/amis/AmisComponent.vue
+++ b/src/components/amis/AmisComponent.vue
@@ -1,113 +1,115 @@
-<template> 
-    <div id="amisid" ref="boxRef"></div>
+<template>
+  <div id="amisid" ref="boxRef"></div>
 </template>
 <script setup lang="ts">
-    import {watch,ref} from "vue"
-    import {ElMessage} from 'element-plus'
-    import 'amis/sdk/sdk.js'
-    import 'amis/lib/themes/default.css'
-    import 'amis/sdk/color-picker.js'
-    import 'amis/sdk/rest.js'
-    // import {InputCity} from 'amis/esm/renderers/Form/InputCity.js'
-    // import {InputColor} from 'amis/esm/renderers/Form/InputColor.js'
-    import axios from 'axios'
-    import copy from 'copy-to-clipboard'
-    import {getToken} from '@/api/auth'
-    
+import {watch, ref} from "vue"
+import {ElMessage} from 'element-plus'
+import 'amis/sdk/sdk.js'
+import 'amis/lib/themes/default.css'
+import 'amis/sdk/color-picker.js'
+import 'amis/sdk/rest.js'
+import InputCity from 'amis/lib/renderers/Form/InputCity'
+import InputColor from 'amis/lib/renderers/Form/InputColor'
+import axios from 'axios'
+import copy from 'copy-to-clipboard'
+import {getToken} from '@/api/auth'
 
-    const props = defineProps({
-        formid: {
-            type: String,
-            default: () => {
-                return ''
-            }
+
+const props = defineProps({
+  formid: {
+    type: String,
+    default: () => {
+      return ''
+    }
+  },
+  formjson: {
+    type: Object,
+    default: () => {
+      return {}
+    }
+  }
+})
+
+// @ts-ignore
+const amis = amisRequire('amis/embed');
+const boxRef = ref(null)
+
+watch(() => props.formjson, (data) => {
+      if (Object.keys(data).length !== 0) {
+        onRendering(data)
+      }
+    }, {immediate: true, deep: true}
+)
+
+function onRendering(data: any) {
+  // let amisScoped = amis.embed('#amisid', data);
+  let theme = 'cxd'
+  let amisScoped = amis.embed(
+      '#amisid',
+      data,
+      {
+        updateLocation: (to, replace) => {
         },
-        formjson: {
-            type: Object,
-            default: () => {
-                return {}
-            }
-        }
-    })
-
-    // @ts-ignore
-    const amis = amisRequire('amis/embed');
-    const boxRef = ref(null)
-
-    watch(()=> props.formjson, (data)=>{
-            onRendering(data)
-        },
-        {immediate: true,deep: true}
-    )
-
-    function onRendering(data:any){
-        // let amisScoped = amis.embed('#amisid', data);
-        let theme = 'cxd'
-        let amisScoped = amis.embed( 
-            '#amisid',
-            data,
-            {
-                updateLocation: (to, replace) => {},
-            },
-            {
-                // 下面三个接口必须实现
-                fetcher: ({
+      },
+      {
+        // 下面三个接口必须实现
+        fetcher: ({
                     url, // 接口地址
                     method, // 请求方法 get、post、put、delete
                     data, // 请求数据
                     responseType,
                     config, // 其他配置
-                    headers ,// 请求头
+                    headers,// 请求头
                     updateLocation
-                }) => {
-                    config = config || {};
-                    config.withCredentials = true;
-                    
-                    // 设置接口地址
-                    config.baseURL = import.meta.env.VITE_APP_BASE_API;
-            
-                    responseType && (config.responseType = responseType);
-            
-                    if (config.cancelExecutor) {
-                        config.cancelToken = new (axios).CancelToken(
-                            config.cancelExecutor
-                        );
-                    }
-            
-                    config.headers = headers || {};
-                    
-                    // 设置token
-                    const isToken = (config.headers || {}).isToken === false
-                    if (getToken() && !isToken) {
-                        config.headers['token'] = getToken() 
-                    }
-            
-                    if (method !== 'post' && method !== 'put' && method !== 'patch') {
-                        if (data) {
-                            config.params = data;
-                        }
-                
-                        return (axios )[method](url, config);
-                    } else if (data && data instanceof FormData) {
-                        config.headers = config.headers || {};
-                        config.headers['Content-Type'] = 'multipart/form-data';
-                    } else if (data && typeof data !== 'string' && !(data instanceof Blob) && !(data instanceof ArrayBuffer)) {
-                        data = JSON.stringify(data);
-                        config.headers = config.headers || {};
-                        config.headers['Content-Type'] = 'application/json';
-                    }
-            
-                    return (axios )[method](url, data, config);
-                },
-                isCancel: (value) => (axios ).isCancel(value),
-                copy: content => {
-                    copy(content);
-                    ElMessage.success('内容已复制到粘贴板');
-                },
-                theme
+                  }) => {
+          config = config || {};
+          config.withCredentials = true;
+
+          // 设置接口地址
+          config.baseURL = import.meta.env.VITE_APP_BASE_API;
+
+          responseType && (config.responseType = responseType);
+
+          if (config.cancelExecutor) {
+            config.cancelToken = new (axios).CancelToken(
+                config.cancelExecutor
+            );
+          }
+
+          config.headers = headers || {};
+
+          // 设置token
+          const isToken = (config.headers || {}).isToken === false
+          if (getToken() && !isToken) {
+            config.headers['token'] = getToken()
+          }
+
+          if (method !== 'post' && method !== 'put' && method !== 'patch') {
+            if (data) {
+              config.params = data;
             }
-        )
-    }
+
+            return (axios)[method](url, config);
+          } else if (data && data instanceof FormData) {
+            config.headers = config.headers || {};
+            config.headers['Content-Type'] = 'multipart/form-data';
+          } else if (data && typeof data !== 'string' && !(data instanceof Blob) && !(data instanceof ArrayBuffer)) {
+            data = JSON.stringify(data);
+            config.headers = config.headers || {};
+            config.headers['Content-Type'] = 'application/json';
+          }
+
+          return (axios)[method](url, data, config);
+        },
+        isCancel: (value) => (axios).isCancel(value),
+        copy: content => {
+          copy(content);
+          ElMessage.success('内容已复制到粘贴板');
+        },
+        theme
+      }
+  )
+}
 </script>
 <style scoped>
 </style>
diff --git a/src/components/layout/table/TbNavTabs.vue b/src/components/layout/table/TbNavTabs.vue
index eabcd8b..4ab104d 100644
--- a/src/components/layout/table/TbNavTabs.vue
+++ b/src/components/layout/table/TbNavTabs.vue
@@ -85,33 +85,33 @@ function onCloseAllTab() {
 
 </script>
 <template>
-  <div class="tabs-menu">
-    <el-tabs type="card" v-model="tabsMenuValue" @tab-click="onTabMenuClick" @tab-remove="onTabMenuRemove">
-      <el-tab-pane v-for="item in tabsMenuList"
-                   :key="item.path"
-                   :path="item.path"
-                   :label="item.title"
-                   :name="item.path"
-                   :closable="item.close"
-                   @node-contextmenu="onTabMenuRemove">
-        <template #label>
-          <el-icon v-if="item.icon" style="vertical-align: middle;">
-            <component :is="item.icon"></component>
-          </el-icon>
-          <el-dropdown :id="item.path" trigger="contextmenu">
-            <span style="vertical-align: middle">{{ item.title }}</span>
-            <template #dropdown>
-              <el-dropdown-menu>
-                <el-dropdown-item icon="CircleCloseFilled" @click="onCloseCurrentTab">关闭当前</el-dropdown-item>
-                <el-dropdown-item icon="CircleClose" @click="onCloseOtherTab">关闭其他</el-dropdown-item>
-                <el-dropdown-item icon="CloseBold" @click="onCloseAllTab">关闭所有</el-dropdown-item>
-              </el-dropdown-menu>
-            </template>
-          </el-dropdown>
+  <el-tabs type="card"
+           v-model="tabsMenuValue"
+           addable
+           @tab-add="onTabMenuRemove"
+           @tab-click="onTabMenuClick"
+           @tab-remove="onTabMenuRemove">
+    <template #add-icon>
+      <el-dropdown>
+        <el-icon><ArrowDown /></el-icon>
+        <template #dropdown>
+          <el-dropdown-menu>
+            <el-dropdown-item icon="CircleCloseFilled" @click="onCloseCurrentTab">关闭当前</el-dropdown-item>
+            <el-dropdown-item icon="CircleClose" @click="onCloseOtherTab">关闭其他</el-dropdown-item>
+            <el-dropdown-item icon="CloseBold" @click="onCloseAllTab">关闭所有</el-dropdown-item>
+          </el-dropdown-menu>
         </template>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
+      </el-dropdown>
+    </template>
+    <el-tab-pane v-for="item in tabsMenuList"
+                 :key="item.path"
+                 :path="item.path"
+                 :label="item.title"
+                 :name="item.path"
+                 :closable="item.close"
+                 @node-contextmenu="onTabMenuRemove">
+    </el-tab-pane>
+  </el-tabs>
 </template>
 <style lang="scss">
 .tabs-menu {
diff --git a/src/views/home/Home.vue b/src/views/home/Home.vue
index 5901dd0..1fe071d 100644
--- a/src/views/home/Home.vue
+++ b/src/views/home/Home.vue
@@ -34,7 +34,7 @@
   <div class="home-container">
     <el-card shadow="never">
       <template #header>
-        <span>公告</span>
+        <span>简介</span>
       </template>
       <div>
         <div>
@@ -42,10 +42,9 @@
         </div>
         <div class="text">
           <el-space alignment="normal" direction="vertical">
-            <el-text tag="p">基于 SpringBoot2 + magic-api + Vue3 + Element Plus + amis3.0 快速开发管理系统</el-text>
-            <el-text tag="p">Tansci-Boot 是一个前后端分离后台管理系统， 前端集成 amis 低代码前端框架，后端集成 magic-api 的接口快速开发框架。包含基础权限、安全认证、以及常用的一些组件功能。项目易上手，技术更综合，能力更全面。</el-text>
+            <el-text tag="p">基于 SpringBoot2 + Vue3 + Element Plus + amis3.0 快速开发管理系统</el-text>
+            <el-text tag="p">SCFS-UI 是一个前后端分离后台管理系统， 前端集成 amis 低代码前端框架。包含基础权限、安全认证、以及常用的一些组件功能。项目易上手，技术更综合，能力更全面。</el-text>
             <el-text tag="p">amis 是一个低代码前端框架，它使用 JSON 配置来生成页面，可以减少页面开发工作量，极大提升效率。</el-text>
-            <el-text tag="p">magic-api 一个基于 Java 的接口快速开发框架，通过 magic-api 提供的 UI 界面完成编写接口，无需定义 Controller、Service、Dao、Mapper、XML、VO 等 Java 对象即可完成常见的 HTTP API 接口开发。</el-text>
           </el-space>
         </div>
       </div>
diff --git a/src/views/lowcode/LcPages.vue b/src/views/lowcode/LcPages.vue
index d9e8645..c15a6f5 100644
--- a/src/views/lowcode/LcPages.vue
+++ b/src/views/lowcode/LcPages.vue
@@ -1,552 +1,608 @@
 <script setup>
-    import {onMounted, reactive, getCurrentInstance, ref} from 'vue'
-    import {ElMessage,ElMessageBox} from 'element-plus'
-    import {getToken} from '@/api/auth'
-    import {page,save,update,bindMenu,del,batchDelete} from '@/api/lowcode/lcPages'
-    import {classifyList,classifySave,classifyUpdate,classifyDel} from '@/api/lowcode/lcPagesClassify'
-    import {list} from '@/api/system/menu'
+import {onMounted, reactive, getCurrentInstance, ref} from 'vue'
+import {ElMessage, ElMessageBox} from 'element-plus'
+import {getToken} from '@/api/auth'
+import {page, save, update, bindMenu, del, batchDelete} from '@/api/lowcode/lcPages'
+import {classifyList, classifySave, classifyUpdate, classifyDel} from '@/api/lowcode/lcPagesClassify'
+import {list} from '@/api/system/menu'
 
-    const { proxy } = getCurrentInstance()
-    const renameFormRef = ref()
-    const menuFormRef = ref()
-    const addFormRef = ref()
-    const classifyFormRef = ref()
-    const state = reactive({ 
-        loading: false,
-        search: {
-            parentId: null,
-            title: null,
-            classify: null,
-        },
-        selectIds: [],
-        page: {
-            current: 1,
-            size: 8,
-            total: 0,
-        },
-        data: [],
-        menuVisible: false,
-        menuList: [],
-        menuForm: {
-            id: '',
-            menuId: []
-        },
-        addVisible: false,
-        viewVisible: false,
-        operate: 0,
-        addForm: {
-            id: '',
-            title: '',
-            subtitle: '',
-            parentId: '0',
-            status: 0,
-            classify: '',
-            pageschema: '{}',
-            remarks: null
-        },
-        classifyData:[],
-        classifyOperate: 0,
-        classifyVisible: false,
-        classifyForm:{
-            name: "",
-            parentId: null,
-            remarks: null
-        }
+const {proxy} = getCurrentInstance()
+const renameFormRef = ref()
+const menuFormRef = ref()
+const addFormRef = ref()
+const classifyFormRef = ref()
+const state = reactive({
+  loading: false,
+  search: {
+    parentId: null,
+    title: null,
+    classify: null,
+  },
+  selectIds: [],
+  page: {
+    current: 1,
+    size: 8,
+    total: 0,
+  },
+  data: [],
+  menuVisible: false,
+  menuList: [],
+  menuForm: {
+    id: '',
+    menuId: []
+  },
+  addVisible: false,
+  viewVisible: false,
+  operate: 0,
+  addForm: {
+    id: '',
+    title: '',
+    subtitle: '',
+    parentId: '0',
+    status: 0,
+    classify: '',
+    pageschema: '{}',
+    remarks: null
+  },
+  classifyData: [],
+  classifyOperate: 0,
+  classifyVisible: false,
+  classifyForm: {
+    name: "",
+    parentId: null,
+    remarks: null
+  }
+})
+
+onMounted(() => {
+  onClassifyList()
+  onLcPages()
+})
+
+function onLcPages() {
+  state.loading = true
+  page(Object.assign(state.page, state.search)).then(res => {
+    state.loading = false;
+    state.data = res.result.records;
+    state.page.current = res.result.current;
+    state.page.size = res.result.size;
+    state.page.total = res.result.total;
+  })
+}
+
+function onSizeChange(e) {
+  state.page.size = e;
+  onLcPages();
+}
+
+function onCurrentChange(e) {
+  state.page.current = e;
+  onLcPages();
+}
+
+function onSearch() {
+  onLcPages()
+}
+
+function onRefresh() {
+  state.search = {
+    parentId: null,
+    title: null,
+    classify: null,
+  }
+  onLcPages();
+}
+
+function onPageClick(val) {
+  state.search.parentId = val.id
+  onLcPages()
+}
+
+function onPageDesign(val) {
+  let id = window.btoa(val.id + "," + getToken())
+  window.open(proxy.$global.editorUrl + '/gh-pages/index.html#/edit/0g?id=' + id, '_blank')
+}
+
+function onRename(val) {
+  state.addForm = {
+    id: val.id,
+    title: val.title,
+    subtitle: val.subtitle,
+    parentId: val.parentId,
+    remarks: val.remarks,
+    status: val.status,
+    classify: val.classify,
+    pageschema: val.pageschema,
+  }
+  state.operate = 1
+  state.addVisible = true;
+}
+
+function onDelete(val) {
+  ElMessageBox.confirm('此操作会永久删除, 是否继续?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    del(val.id).then((res) => {
+      ElMessage.success('操作成功!');
+      onLcPages()
     })
+  })
+}
 
-    onMounted(()=>{
-        onClassifyList()
-        onLcPages()
+function onBatchDelete() {
+  ElMessageBox.confirm('此操作会永久删除选中的所有数据, 是否继续?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    batchDelete({ids: state.selectIds}).then((res) => {
+      ElMessage.success('操作成功!');
+      onLcPages()
     })
+  })
+}
 
-    function onLcPages(){
-        state.loading = true
-        page(Object.assign(state.page,state.search)).then(res=>{
-            state.loading = false;
-            state.data = res.result.records;
-            state.page.current = res.result.current;
-            state.page.size = res.result.size;
-            state.page.total = res.result.total;
-        })
+function onContextMenu(val) {
+  list({isShow: 1}).then((res) => {
+    state.menuList = res.result;
+    let menuIds
+    if (Object.prototype.toString.call(val.menuIds) === '[object Array]') {
+      menuIds = val.menuIds
+    } else {
+      menuIds = val.menuIds ? [val.menuIds] : []
     }
+    state.menuForm = {
+      id: val.id,
+      menuId: menuIds
+    }
+    state.menuVisible = true
+  })
+}
 
-    function onSizeChange(e){
-        state.page.size = e;
-        onLcPages();
+function onContextMenuSubmit() {
+  ElMessageBox.confirm('此操作会将已绑定的菜单覆盖, 是否继续?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    menuFormRef.value.validate((valid) => {
+      if (valid) {
+        bindMenu({
+          id: state.menuForm.id,
+          menuIds: state.menuForm.menuId
+        }).then((res) => {
+          onLcPages()
+          state.menuForm = {}
+          state.menuVisible = false
+        }).catch(e =>
+            ElMessage.error(e.msg)
+        )
+      }
+    })
+  })
+}
+
+function onSelecting(id) {
+  let selectIds = []
+  state.data.forEach(item => {
+    let d = document.getElementById("page" + item.id);
+    if (item.checked || item.checked === 1) {
+      d.style.border = "1px solid #409EFF";
+      selectIds.push(item.id)
+    } else {
+      d.style.border = "1px solid #e4e7ed";
     }
-    function onCurrentChange(e){
-        state.page.current = e;
-        onLcPages();
+  })
+  state.selectIds = selectIds
+}
+
+function onSelectAll() {
+  if (state.selectIds && state.selectIds.length === state.data.length) {
+    state.data.forEach(item => {
+      item.checked = 0
+      let d = document.getElementById("page" + item.id);
+      d.style.border = "1px solid #e4e7ed";
+    })
+    state.selectIds = []
+  } else {
+    let selectIds = []
+    state.data.forEach(item => {
+      item.checked = 1
+      let d = document.getElementById("page" + item.id);
+      d.style.border = "1px solid #409EFF";
+      selectIds.push(item.id)
+    })
+    state.selectIds = selectIds
+  }
+}
+
+function onAdd() {
+  state.addForm = {
+    title: '',
+    subtitle: '',
+    parentId: state.search.parentId,
+    remarks: '',
+    status: 0,
+    classify: '',
+    pageschema: '{}'
+  }
+  state.operate = 0
+  state.addVisible = true;
+}
+
+function onAddSubmit() {
+  addFormRef.value.validate((valid) => {
+    if (valid) {
+      if (state.operate === 0) {
+        save(state.addForm).then((res) => {
+          onLcPages()
+          state.addVisible = false
+        }).catch(e =>
+            ElMessage.error(e.msg)
+        )
+      } else {
+        update(state.addForm).then((res) => {
+          onLcPages()
+          state.addVisible = false
+        }).catch(e =>
+            ElMessage.error(e.msg)
+        )
+      }
     }
-    function onSearch(){
-        onLcPages()
+  })
+}
+
+// =================分类=================
+function onClassifyList() {
+  classifyList().then(res => {
+    state.classifyData = res.result;
+  })
+}
+
+function onNodeClick(data) {
+  state.search.classify = data.id;
+  onSearch()
+}
+
+function onOperateChange(val, type) {
+  if (type === 1) {
+    state.classifyForm = {
+      id: '',
+      parentId: val.id,
+      name: '',
+      remarks: ''
     }
-    function onRefresh(){
-        state.search = {
+    state.classifyOperate = 0
+    state.classifyVisible = true;
+  } else if (type === 2) {
+    state.classifyForm = {
+      id: val.id,
+      parentId: val.parentId,
+      name: val.name,
+      remarks: val.remarks
+    }
+    state.classifyOperate = 1
+    state.classifyVisible = true;
+  } else {
+    state.operate = 0;
+    ElMessageBox.confirm('此操作将永久删除该菜单, 是否继续?', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }).then(() => {
+      classifyDel(val.id).then(res => {
+        if (res) {
+          ElMessage.success("删除成功!");
+          state.classifyForm = {
+            id: '',
             parentId: null,
-            title: null,
-            classify: null,
+            name: '',
+            remarks: ''
+          };
+          onClassifyList()
         }
-        onLcPages();
-    }
+      })
+    }).catch(e => {
+      console.log(e)
+    })
+  }
+}
 
-    function onPageClick(val){
-        state.search.parentId = val.id
-        onLcPages()
-    }
-
-    function onPageDesign(val){
-        let id = window.btoa(val.id+","+getToken())
-        window.open(proxy.$global.editorUrl + '/gh-pages/index.html#/edit/0g?id=' + id, '_blank')
-    }
-
-    function onRename(val){
-        state.addForm = {
-            id: val.id,
-            title: val.title,
-            subtitle: val.subtitle,
-            parentId: val.parentId,
-            remarks: val.remarks,
-            status: val.status,
-            classify: val.classify,
-            pageschema: val.pageschema,
-        }
-        state.operate = 1
-        state.addVisible = true;
-    }
-
-    function onDelete(val){
-        ElMessageBox.confirm('此操作会永久删除, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        }).then(() => {
-            del(val.id).then((res) => {
-                ElMessage.success('操作成功!');
-                onLcPages()
-            })
-        })
-    }
-    function onBatchDelete(){
-        ElMessageBox.confirm('此操作会永久删除选中的所有数据, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        }).then(() => {
-           batchDelete({ids: state.selectIds}).then((res) => {
-                ElMessage.success('操作成功!');
-                onLcPages()
-            })
-        })
-    }
-
-    function onContextMenu(val){
-        list({isShow: 1}).then((res) => {
-            state.menuList = res.result;
-            let menuIds
-          if(Object.prototype.toString.call(val.menuIds) === '[object Array]'){
-                menuIds = val.menuIds
-            } else {
-                menuIds = val.menuIds ? [val.menuIds] : []
-            }
-            state.menuForm = {
-                id: val.id,
-                menuId: menuIds
-            }
-            state.menuVisible = true
-        })
-    }
-    function onContextMenuSubmit(){
-        ElMessageBox.confirm('此操作会将已绑定的菜单覆盖, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        }).then(()=>{
-            menuFormRef.value.validate((valid) => {
-                if (valid) {
-                    bindMenu({
-                        id: state.menuForm.id, 
-                        menuIds: state.menuForm.menuId
-                    }).then((res) => {
-                        onLcPages()
-                        state.menuForm = {}
-                        state.menuVisible = false
-                    }).catch( e => 
-                        ElMessage.error(e.msg)
-                    )
-                }
-            })
-        })
-    }
-
-    function onSelecting(id){
-        let selectIds = []
-        state.data.forEach(item=>{
-            let d = document.getElementById("page" + item.id);
-            if(item.checked || item.checked === 1){
-                d.style.border="1px solid #409EFF";
-                selectIds.push(item.id) 
-            } else {
-                d.style.border="1px solid #e4e7ed";
-            }
-        })
-        state.selectIds = selectIds
-    }
-    function onSelectAll(){
-        if(state.selectIds && state.selectIds.length === state.data.length){
-            state.data.forEach(item=>{
-                item.checked = 0
-                let d = document.getElementById("page" + item.id);
-                d.style.border="1px solid #e4e7ed";
-            })
-            state.selectIds = []
-        } else {
-            let selectIds = []
-            state.data.forEach(item=>{
-                item.checked = 1
-                let d = document.getElementById("page" + item.id);
-                d.style.border="1px solid #409EFF";
-                selectIds.push(item.id)
-            })
-            state.selectIds = selectIds
-        }
-    }
-
-    function onAdd(){
-        state.addForm = {
-            title: '',
-            subtitle: '',
-            parentId: state.search.parentId,
-            remarks: '',
-            status: 0,
-            classify: '',
-            pageschema: '{}'
-        }
-        state.operate = 0
-        state.addVisible = true;
-    }
-
-    function onAddSubmit(){
-        addFormRef.value.validate((valid) => {
-            if (valid) {
-                if(state.operate === 0){
-                    save(state.addForm).then((res) => {
-                        onLcPages()
-                        state.addVisible = false
-                    }).catch( e => 
-                        ElMessage.error(e.msg)
-                    )
-                } else {
-                    update(state.addForm).then((res) => {
-                        onLcPages()
-                        state.addVisible = false
-                    }).catch( e => 
-                        ElMessage.error(e.msg)
-                    )
-                }
-            }
-        })
-    }
-
-    // =================分类=================
-    function onClassifyList(){
-        classifyList().then(res=>{
-            state.classifyData = res.result;
-        })
-    }
-
-    function onNodeClick(data){
-        state.search.classify = data.id;
-        onSearch()
-    }
-
-    function onOperateChange(val,type){
-        if(type === 1){
-            state.classifyForm = {
-                id: '',
-                parentId: val.id,
-                name: '',
-                remarks: ''
-            }
-            state.classifyOperate = 0
-            state.classifyVisible = true;
-        } else if(type === 2) {
-            state.classifyForm = {
-                id: val.id,
-                parentId: val.parentId,
-                name: val.name,
-                remarks: val.remarks
-            }
-            state.classifyOperate = 1
-            state.classifyVisible = true;
-        } else {
-            state.operate = 0;
-            ElMessageBox.confirm('此操作将永久删除该菜单, 是否继续?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                classifyDel(val.id).then(res=>{
-                    if(res){
-                        ElMessage.success("删除成功!");
-                        state.classifyForm = {
-                            id: '',
-                            parentId: null,
-                            name: '',
-                            remarks: ''
-                        };
-                        onClassifyList()
-                    }
-                })
-            }).catch(e=>{
-                console.log(e)
-            })
-        }
-    }
-
-    function onClassifySubmit(){
-        classifyFormRef.value.validate((valid) => {
-            if (valid) {
-                if(state.classifyOperate === 0){
-                    classifySave(state.classifyForm).then((res) => {
-                        onClassifyList()
-                        state.classifyVisible = false
-                    }).catch( e => 
-                        ElMessage.error(e.msg)
-                    )
-                } else {
-                    classifyUpdate(state.classifyForm).then((res) => {
-                        onClassifyList()
-                        state.classifyVisible = false
-                    }).catch( e => 
-                        ElMessage.error(e.msg)
-                    )
-                }
-            }
-        })
+function onClassifySubmit() {
+  classifyFormRef.value.validate((valid) => {
+    if (valid) {
+      if (state.classifyOperate === 0) {
+        classifySave(state.classifyForm).then((res) => {
+          onClassifyList()
+          state.classifyVisible = false
+        }).catch(e =>
+            ElMessage.error(e.msg)
+        )
+      } else {
+        classifyUpdate(state.classifyForm).then((res) => {
+          onClassifyList()
+          state.classifyVisible = false
+        }).catch(e =>
+            ElMessage.error(e.msg)
+        )
+      }
     }
+  })
+}
 
 </script>
 <template>
   <div class="lc-pages">
-        <div class="pages-classify">
-            <el-scrollbar height="45rem">
-                <el-tree :data="state.classifyData" :props="{children: 'children', label: 'name'}" highlight-current @node-click="onNodeClick" empty-text="暂无数据">
-                    <template #default="{ node, data }">
-                        <el-tooltip placement="right-start" effect="light" popper-class="classify-tooltip">
+    <div class="pages-classify">
+      <el-scrollbar height="45rem">
+        <el-tree :data="state.classifyData" :props="{children: 'children', label: 'name'}" highlight-current
+                 @node-click="onNodeClick" empty-text="暂无数据">
+          <template #default="{ node, data }">
+            <el-tooltip placement="right-start" effect="light" popper-class="classify-tooltip">
                             <span class="custom-tree-node">
                                 <el-icon v-if="data.icon" style="vertical-align: middle;padding-right:10px;">
                                     <component :is="data.icon"></component>
                                 </el-icon>
                                 <span>{{ node.label }}</span>
                             </span>
-                            <template #content>
-                                <el-button-group size="mini">
-                                    <el-button @click="onOperateChange(data,1)" icon="check"></el-button>
-                                    <el-button @click="onOperateChange(data,2)" icon="edit"></el-button>
-                                    <el-button @click="onOperateChange(data,3)" icon="delete"></el-button>
-                                </el-button-group>
-                            </template>
-                        </el-tooltip>
-                    </template>    
-                </el-tree>
-            </el-scrollbar>
-            <el-dialog v-model="state.classifyVisible" title="分类管理" :show-close="false" width="30%">
-                <el-form :model="state.classifyForm" ref="classifyFormRef" :rules="rules" label-width="60px" status-icon>
-                    <el-form-item v-show="state.classifyForm.parentId !== '0'" label="父级" prop="parentId" :rules="[{required: true, message: '请选择父级', trigger: 'blur'}]">
-                        <el-tree-select v-model="state.classifyForm.parentId" :data="state.classifyData" :props="{children: 'children', label: 'name'}" node-key="id" 
-                check-strictly :render-after-expand="false" :default-checked-keys="[state.classifyForm.parentId]" :default-expanded-keys="[state.classifyForm.parentId]" placeholder="请选父级" style="width:100%"/>
-                    </el-form-item>
-                     <el-form-item label="名称" prop="name" :rules="[{required: true, message: '请输入名称', trigger: 'blur'}]">
-                        <el-input v-model="state.classifyForm.name" placeholder="请输入名称" />
-                    </el-form-item>
-                </el-form>
-                <template #footer>
+              <template #content>
+                <el-button-group size="mini">
+                  <el-button @click="onOperateChange(data,1)" icon="check"></el-button>
+                  <el-button @click="onOperateChange(data,2)" icon="edit"></el-button>
+                  <el-button @click="onOperateChange(data,3)" icon="delete"></el-button>
+                </el-button-group>
+              </template>
+            </el-tooltip>
+          </template>
+        </el-tree>
+      </el-scrollbar>
+      <el-dialog v-model="state.classifyVisible" title="分类管理" :show-close="false" width="30%">
+        <el-form :model="state.classifyForm" ref="classifyFormRef" label-width="60px" status-icon>
+          <el-form-item v-show="state.classifyForm.parentId !== '0'" label="父级" prop="parentId"
+                        :rules="[{required: true, message: '请选择父级', trigger: 'blur'}]">
+            <el-tree-select v-model="state.classifyForm.parentId" :data="state.classifyData"
+                            :props="{children: 'children', label: 'name'}" node-key="id"
+                            check-strictly :render-after-expand="false"
+                            :default-checked-keys="[state.classifyForm.parentId]"
+                            :default-expanded-keys="[state.classifyForm.parentId]" placeholder="请选父级"
+                            style="width:100%"/>
+          </el-form-item>
+          <el-form-item label="名称" prop="name" :rules="[{required: true, message: '请输入名称', trigger: 'blur'}]">
+            <el-input v-model="state.classifyForm.name" placeholder="请输入名称"/>
+          </el-form-item>
+        </el-form>
+        <template #footer>
                 <span class="dialog-footer">
                     <el-button @click="state.classifyVisible = false">取消</el-button>
                     <el-button type="primary" @click="onClassifySubmit">确认</el-button>
                 </span>
-                </template>
-            </el-dialog>
-        </div>
-        <div class="pages-list">
-            <div class="pages-search">
-                <el-input v-model="state.search.title" placeholder="请输入标题搜索" style="width: 12%; margin-right: 1rem;"/>
-                <el-button @click="onRefresh" icon="RefreshRight" circle></el-button>
-                <el-button @click="onSearch" type="primary" icon="Search">查询</el-button>
-            </div>
-            <div class="pages-main">
-                <el-card shadow="never">
-                    <div class="main-operate">
-                        <el-button @click="onSelectAll()">全选</el-button>
-                        <el-button @click="onAdd()" type="primary">新增</el-button>
-                        <el-button @click="onBatchDelete()" :disabled="state.selectIds && state.selectIds.length === 0" type="danger">批量删除</el-button>
-                        <el-button v-if="state.search.parentId && state.search.parentId !== '0'" @click="onRefresh()" type="primary" icon="Back" style="float: right;">返回</el-button>
+        </template>
+      </el-dialog>
+    </div>
+    <div class="pages-list">
+      <div class="pages-search">
+        <el-input v-model="state.search.title" placeholder="请输入标题搜索" style="width: 12%; margin-right: 1rem;"/>
+        <el-button @click="onRefresh" icon="RefreshRight" circle></el-button>
+        <el-button @click="onSearch" type="primary" icon="Search">查询</el-button>
+      </div>
+      <div class="pages-main">
+        <el-card shadow="never">
+          <div class="main-operate">
+            <el-button @click="onSelectAll()">全选</el-button>
+            <el-button @click="onAdd()" type="primary">新增</el-button>
+            <el-button @click="onBatchDelete()" :disabled="state.selectIds && state.selectIds.length === 0"
+                       type="danger">批量删除
+            </el-button>
+            <el-button v-if="state.search.parentId && state.search.parentId !== '0'" @click="onRefresh()" type="primary"
+                       icon="Back" style="float: right;">返回
+            </el-button>
+          </div>
+          <div v-if="state.data" v-loading="state.loading" class="main-card">
+            <el-card v-for="item in state.data" :key="item" shadow="hover" :body-style="{ padding: '0px' }"
+                     :id="'page'+item.id" style="margin: 0.4rem;">
+              <template #header>
+                <div class="card-header">
+                  <el-text tag="b">{{ item.title }}</el-text>
+                  <el-checkbox @change="onSelecting()" v-model="item.checked" :true-value="1" :false-value="0"/>
+                </div>
+              </template>
+              <div @click="onPageClick(item)" class="card-content">
+                <el-icon v-if="!item.menuIds || item.menuIds.length === 0" size="100" color="#E6A23C">
+                  <Setting/>
+                </el-icon>
+                <el-icon v-else size="100" color="#67C23A">
+                  <UploadFilled/>
+                </el-icon>
+                <div class="content">
+                  <div class="content-item">
+                    <el-text truncated>{{ item.subtitle }}</el-text>
+                    <div>
+                      <el-tag v-if="item.status === 0" type="success" effect="light" round>已发布</el-tag>
+                      <el-tag v-else type="warning" effect="light" round>未发布</el-tag>
                     </div>
-                    <div v-if="state.data" v-loading="state.loading" class="main-card">
-                        <el-card v-for="item in state.data" :key="item" shadow="hover" :body-style="{ padding: '0px' }" :id="'page'+item.id" style="margin: 0.4rem;">
-                            <template #header>
-                                <div class="card-header">
-                                    <el-text tag="b">{{item.title}}</el-text>
-                                    <el-checkbox @change="onSelecting()" v-model="item.checked" :true-label="1" :false-label="0"/>
-                                </div>
-                            </template>
-                            <div @click="onPageClick(item)" class="card-content">
-                                <el-icon v-if="!item.menuIds || item.menuIds.length === 0" size="100" color="#E6A23C"><Setting /></el-icon>
-                                <el-icon v-else size="100" color="#67C23A"><UploadFilled /></el-icon>
-                                <div class="content">
-                                    <div class="content-item">
-                                        <el-text truncated>{{item.subtitle}}</el-text>
-                                        <div>
-                                            <el-tag v-if="item.status === 0" type="success" effect="light" round>已发布</el-tag>
-                                            <el-tag v-else type="warning" effect="light" round>未发布</el-tag>
-                                        </div>
-                                    </div>
-                                    <div>
-                                        <el-text truncated tag="sub" size="small" style="max-width:12rem;padding-top:0.4rem;font-size:12px;">{{item.remarks}}</el-text>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="card-footer">
-                                <el-button-group style="width:100%; display: flex;">
-                                <el-button @click="onPageDesign(item)" icon="Edit" style="width:100%; border-left: none;">设计页面</el-button>
-                                    <el-button @click="onRename(item)" icon="EditPen" style="width:100%">修改</el-button>
-                                    <el-button @click="onDelete(item)" icon="Delete" style="width:100%">删除</el-button>
-                                    <el-button @click="onContextMenu(item)" icon="Connection" style="width:100%; border-right: none;">关联菜单</el-button>
-                                </el-button-group>
-                            </div>
-                        </el-card>
-                    </div>
-                    <el-pagination v-if="state.data && state.data.length > 0" :current-page="state.page.current" :page-size="state.page.size" :total="state.page.total"
-                        layout="total, prev, pager, next, jumper"
-                        @size-change="onSizeChange"
-                        @current-change="onCurrentChange" style="margin-top: 1.2rem;"/>
-                    <div v-if="!state.data || state.data.length === 0">
-                        <el-empty description="暂无数据" />
-                    </div>
-                </el-card>
-                <el-dialog v-model="state.menuVisible" title="关联菜单" :show-close="false" width="30%">
-                    <el-form :model="state.menuForm" ref="menuFormRef" :rules="rules" label-width="60px" status-icon>
-                        <el-form-item label="菜单" prop="menuId" :rules="[{required: true, message: '请选择菜单', trigger: 'blur'}]">
-                            <el-tree-select v-model="state.menuForm.menuId" :data="state.menuList" :props="{children: 'children', label: 'chineseName'}" node-key="id" multiple :render-after-expand="false" :default-checked-keys="state.menuForm.menuId" :default-expanded-keys="state.menuForm.menuId" style="width:100%;"/>
-                        </el-form-item>
-                    </el-form>
-                    <template #footer>
+                  </div>
+                  <div>
+                    <el-text truncated tag="sub" size="small"
+                             style="max-width:12rem;padding-top:0.4rem;font-size:12px;">{{ item.remarks }}
+                    </el-text>
+                  </div>
+                </div>
+              </div>
+              <div class="card-footer">
+                <el-button-group style="width:100%; display: flex;">
+                  <el-button @click="onPageDesign(item)" icon="Edit" style="width:100%; border-left: none;">设计页面
+                  </el-button>
+                  <el-button @click="onRename(item)" icon="EditPen" style="width:100%">修改</el-button>
+                  <el-button @click="onDelete(item)" icon="Delete" style="width:100%">删除</el-button>
+                  <el-button @click="onContextMenu(item)" icon="Connection" style="width:100%; border-right: none;">
+                    关联菜单
+                  </el-button>
+                </el-button-group>
+              </div>
+            </el-card>
+          </div>
+          <el-pagination v-if="state.data && state.data.length > 0" :current-page="state.page.current"
+                         :page-size="state.page.size" :total="state.page.total"
+                         layout="total, prev, pager, next, jumper"
+                         @size-change="onSizeChange"
+                         @current-change="onCurrentChange" style="margin-top: 1.2rem;"/>
+          <div v-if="!state.data || state.data.length === 0">
+            <el-empty description="暂无数据"/>
+          </div>
+        </el-card>
+        <el-dialog v-model="state.menuVisible" title="关联菜单" :show-close="false" width="30%">
+          <el-form :model="state.menuForm" ref="menuFormRef" label-width="60px" status-icon>
+            <el-form-item label="菜单" prop="menuId"
+                          :rules="[{required: true, message: '请选择菜单', trigger: 'blur'}]">
+              <el-tree-select v-model="state.menuForm.menuId" :data="state.menuList"
+                       :props="{children: 'children', label: 'chineseName'}" node-key="id" multiple
+                       :render-after-expand="false" :default-checked-keys="state.menuForm.menuId"
+                       :default-expanded-keys="state.menuForm.menuId" style="width:100%;"/>
+            </el-form-item>
+          </el-form>
+          <template #footer>
                     <span class="dialog-footer">
                         <el-button @click="state.menuVisible = false">取消</el-button>
                         <el-button type="primary" @click="onContextMenuSubmit">确认</el-button>
                     </span>
-                    </template>
-                </el-dialog>
-                <el-dialog v-model="state.addVisible" title="新增页面" :show-close="false" width="40%">
-                    <el-form :model="state.addForm" ref="addFormRef" :rules="rules" label-width="100px" status-icon>
-                        <el-form-item label="页面名称" prop="title" :rules="[{required: true, message: '请输入名称', trigger: 'blur'}]">
-                            <el-input v-model="state.addForm.title" placeholder="请输入名称" />
-                        </el-form-item>
-                        <el-form-item label="页面标题" prop="subtitle" :rules="[{required: true, message: '请输入标题', trigger: 'blur'}]">
-                            <el-input v-model="state.addForm.subtitle" placeholder="请输入标题"/>
-                        </el-form-item>
-                        <el-form-item label="页面状态" prop="status" :rules="[{required: true, message: '请选择状态', trigger: 'blur'}]">
-                            <el-switch v-model="state.addForm.status" inline-prompt active-text="是" :active-value="0" inactive-text="否" :inactive-value="1"/>
-                        </el-form-item>
-                        <el-form-item label="页面分类" prop="status" :rules="[{required: true, message: '请选择分类', trigger: 'blur'}]">
-                        <el-tree-select v-model="state.addForm.classify" :data="state.classifyData" :props="{children: 'children', label: 'name'}" node-key="id" 
-                check-strictly :render-after-expand="false" :default-checked-keys="[state.addForm.classify]" :default-expanded-keys="[state.addForm.classify]" placeholder="请选父级" style="width:100%"/>
-                        </el-form-item>
-                        <el-form-item label="页面描述" prop="remarks">
-                            <el-input v-model="state.addForm.remarks" placeholder="请输入描述" type="textarea" :rows="2"/>
-                        </el-form-item>
-                    </el-form>
-                    <template #footer>
+          </template>
+        </el-dialog>
+        <el-dialog v-model="state.addVisible" title="新增页面" :show-close="false" width="40%">
+          <el-form :model="state.addForm" ref="addFormRef" label-width="100px" status-icon>
+            <el-form-item label="页面名称" prop="title"
+                          :rules="[{required: true, message: '请输入名称', trigger: 'blur'}]">
+              <el-input v-model="state.addForm.title" placeholder="请输入名称"/>
+            </el-form-item>
+            <el-form-item label="页面标题" prop="subtitle"
+                          :rules="[{required: true, message: '请输入标题', trigger: 'blur'}]">
+              <el-input v-model="state.addForm.subtitle" placeholder="请输入标题"/>
+            </el-form-item>
+            <el-form-item label="页面状态" prop="status"
+                          :rules="[{required: true, message: '请选择状态', trigger: 'blur'}]">
+              <el-switch v-model="state.addForm.status" inline-prompt active-text="是" :active-value="0"
+                         inactive-text="否" :inactive-value="1"/>
+            </el-form-item>
+            <el-form-item label="页面分类" prop="status"
+                          :rules="[{required: true, message: '请选择分类', trigger: 'blur'}]">
+              <el-tree-select v-model="state.addForm.classify" :data="state.classifyData"
+                              :props="{children: 'children', label: 'name'}" node-key="id"
+                              check-strictly :render-after-expand="false"
+                              :default-checked-keys="[state.addForm.classify]"
+                              :default-expanded-keys="[state.addForm.classify]" placeholder="请选父级"
+                              style="width:100%"/>
+            </el-form-item>
+            <el-form-item label="页面描述" prop="remarks">
+              <el-input v-model="state.addForm.remarks" placeholder="请输入描述" type="textarea" :rows="2"/>
+            </el-form-item>
+          </el-form>
+          <template #footer>
                     <span class="dialog-footer">
                         <el-button @click="state.addVisible = false">取消</el-button>
                         <el-button type="primary" @click="onAddSubmit">确认</el-button>
                     </span>
-                    </template>
-                </el-dialog>
-            </div>
-        </div>
+          </template>
+        </el-dialog>
+      </div>
+    </div>
   </div>
 </template>
-<style lang="scss" >
-    .classify-tooltip.is-light {
-        background: none !important;
-        border: none !important;
-        padding: 0 !important;
+<style lang="scss">
+.classify-tooltip.is-light {
+  background: none !important;
+  border: none !important;
+  padding: 0 !important;
+}
+
+.lc-pages {
+  display: flex;
+
+  .pages-classify {
+    border-right: 1px solid #e4e7ed;
+    margin: 0 1rem 0 1rem;
+    min-width: 12rem;
+
+    .el-tree-node:hover > .el-tree-node__content {
+      background-color: #fff !important;
+      color: var(--theme) !important;
     }
-    .lc-pages{
+
+    .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+      background-color: #fff !important;
+      color: var(--theme) !important;
+    }
+
+
+  }
+
+  .pages-list {
+    width: 100%;
+
+    .pages-search {
+      display: flex;
+    }
+
+    .pages-main {
+      padding-top: 1rem;
+
+      .main-operate {
+        padding-bottom: 1rem;
+      }
+
+      .main-card {
         display: flex;
-        .pages-classify{
-            border-right: 1px solid #e4e7ed;
-            margin: 0 1rem 0 1rem;
-            min-width: 12rem;
-            .el-tree-node:hover>.el-tree-node__content{
-                background-color: #fff !important;
-                color: var(--theme) !important;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+
+        .el-card {
+          // flex: 0 0 24%;
+          :deep(.el-card__header) {
+            padding: 1rem;
+            border: none;
+          }
+
+          .card-header {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+          }
+
+          .card-content {
+            display: flex;
+            align-items: center;
+            font-size: 12px;
+            color: #606266;
+            padding: 0 0.4rem 1rem 0.4rem;
+            cursor: pointer;
+
+            .content {
+              width: 100%;
+              padding-left: 1.2rem;
+
+              .content-item {
+                display: flex;
+                justify-content: space-between;
+              }
             }
-            
-            .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content { 
-                background-color: #fff !important;
-                color: var(--theme) !important;
+          }
+
+          .card-footer {
+            .el-button {
+              border-bottom: none;
             }
 
-            
-        }
-        .pages-list{
-            width: 100%;
-            .pages-search{
-                display: flex;
+            .el-button-group > .el-button:first-child {
+              border-top-left-radius: 0;
             }
-            .pages-main{
-                padding-top: 1rem;
-                .main-operate{
-                    padding-bottom: 1rem;
-                }
-                .main-card{
-                    display: flex;
-                    flex-wrap: wrap;  
-                    justify-content: flex-start;
-                    .el-card{
-                        // flex: 0 0 24%;
-                        :deep(.el-card__header){
-                            padding: 1rem;
-                            border: none;
-                        }
-                        .card-header {
-                            display: flex;
-                            justify-content: space-between;
-                            align-items: center;
-                        }
-                        .card-content{
-                            display: flex;
-                            align-items: center;
-                            font-size: 12px;
-                            color: #606266;
-                            padding: 0 0.4rem 1rem 0.4rem;
-                            cursor: pointer;
-                            .content{
-                                width: 100%;
-                                padding-left: 1.2rem;
-                                .content-item{
-                                    display: flex;
-                                    justify-content: space-between;
-                                }
-                            }
-                        }
-                        .card-footer{
-                            .el-button{
-                                border-bottom: none;
-                            }
-                            .el-button-group>.el-button:first-child{
-                                border-top-left-radius: 0;
-                            }
-                            .el-button-group>.el-button:last-child {
-                                border-top-right-radius: 0;
-                            }
-                        }
-                    }
-                }
+
+            .el-button-group > .el-button:last-child {
+              border-top-right-radius: 0;
             }
+          }
         }
+      }
     }
+  }
+}
 </style>
diff --git a/src/views/system/Dict.vue b/src/views/system/Dict.vue
index 5e62d14..088d604 100644
--- a/src/views/system/Dict.vue
+++ b/src/views/system/Dict.vue
@@ -144,7 +144,7 @@
 
 <template>
   <div class="dict-container">
-    <Table :data="table.tableData" :column="table.tableTitle" :operation="table.operation" :page="false" :loading="table.loading">
+    <Table :data="table.tableData" :column="table.tableTitle" :operation="table.operation" :loading="table.loading">
       <template #search>
         <div><el-button @click="onAdd(null)" v-permission="'dict:save'" type="primary">添加</el-button></div>
       </template>
@@ -155,7 +155,7 @@
       </template>
     </Table>
     <el-dialog title="字典信息" v-model="form.dictVisible" :show-close="false" width="40%">
-      <el-form :model="form.dictForm" ref="formRef" :rules="rules" label-width="80px" status-icon>
+      <el-form :model="form.dictForm" ref="formRef" label-width="80px" status-icon>
         <el-row :gutter="20">
             <el-col :span="12">
                 <el-form-item label="分组名称" prop="groupName" :rules="[{required: true,message:'请输入分组名称',trigger: 'blur'}]">
@@ -165,8 +165,8 @@
             <el-col :span="12">
                 <el-form-item label="类型" prop="type" :rules="[{required: true,message:'请选择类型',trigger: 'blur'}]">
                     <el-radio-group v-model="form.dictForm.type">
-                        <el-radio :label="0">系统</el-radio>
-                        <el-radio :label="1">业务</el-radio>
+                        <el-radio :value="0">系统</el-radio>
+                        <el-radio :value="1">业务</el-radio>
                     </el-radio-group>
                 </el-form-item>
             </el-col>
diff --git a/src/views/system/Org.vue b/src/views/system/Org.vue
index 3bc45ca..5d0d731 100644
--- a/src/views/system/Org.vue
+++ b/src/views/system/Org.vue
@@ -14,8 +14,7 @@
     tableTitle: [
       {prop:'code',label:'组织编码',align:'left'},
       {prop:'name',label:'组织名称'},
-      {prop:'name',label:'组织名称'},
-      {prop:'sort',label:'排序'},
+      {prop:'sort',label:'组织级别'},
       {prop:'createTime',label:'创建时间'},
       {prop:'remarks',label:'描述'}
     ],
@@ -126,8 +125,8 @@
 </script>
 
 <template>
-  <div class="org-container">
-    <Table :data="table.tableData" :column="table.tableTitle" :operation="table.operation" :page="false" :loading="table.loading">
+  <div>
+    <Table :data="table.tableData" :column="table.tableTitle" :operation="table.operation" :loading="table.loading">
       <template #search>
         <div><el-button @click="onAdd(null)" v-permission="'org:save'" type="primary">添加</el-button></div>
       </template>
@@ -138,7 +137,7 @@
       </template>
     </Table>
     <el-dialog title="组织信息" v-model="form.orgVisible" :show-close="false" width="40%">
-      <el-form :model="form.orgForm" ref="formRef" :rules="rules" label-width="80px" status-icon>
+      <el-form :model="form.orgForm" ref="formRef" label-width="80px" status-icon>
         <el-form-item label="名称" prop="name" :rules="[{required: true,message:'请输入名称',trigger: 'blur'}]">
           <el-input v-model="form.orgForm.name" placeholder="请输入名称" style="width: 100%"/>
         </el-form-item>
@@ -157,9 +156,4 @@
       </template>
     </el-dialog>
   </div>
-</template>
-<style lang="scss" scoped>
-  .org-container{
-
-  }
-</style>
\ No newline at end of file
+</template>
\ No newline at end of file
diff --git a/src/views/system/User.vue b/src/views/system/User.vue
index a6bef61..b5e6702 100644
--- a/src/views/system/User.vue
+++ b/src/views/system/User.vue
@@ -1,14 +1,13 @@
 <script setup lang="ts">
-  import {onMounted, reactive, ref, unref} from 'vue'
+  import {onMounted, reactive, ref} from 'vue'
   import {ElMessage, ElMessageBox} from 'element-plus'
   import type {FormInstance} from 'element-plus'
   import Table from '@/components/Table.vue'
   import {page,save,update,del,roleList} from '@/api/system/user'
-  
+
   const searchForm = reactive({
     username: null
   })
-
   const table = reactive({
     loading: false,
     page: {
@@ -158,6 +157,8 @@
     form.userForm = {
       id: val.column.row.id,
       username: val.column.row.username,
+      password: '',
+      rePassword: '',
       nickname: val.column.row.nickname,
       type: val.column.row.type,
       phone: val.column.row.phone,
@@ -232,7 +233,7 @@
       </template>
     </Table>
     <el-dialog title="用户信息" v-model="form.userVisible" :show-close="false" width="50%">
-        <el-form :model="form.userForm" ref="formRef" :rules="rules" label-width="80px" status-icon>
+        <el-form :model="form.userForm" ref="formRef" label-width="80px" status-icon>
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="名称" prop="username" :rules="[
@@ -264,16 +265,16 @@
             <el-col :span="12">
               <el-form-item label="类型" prop="type" :rules="[{required: true,message:'请选择类型',trigger: 'blur'}]">
                 <el-radio-group v-model="form.userForm.type">
-                  <el-radio :label="1">管理员</el-radio>
-                  <el-radio :label="2">普通用户</el-radio>
+                  <el-radio :value="1">管理员</el-radio>
+                  <el-radio :value="2">普通用户</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="性别" prop="gender">
                 <el-radio-group v-model="form.userForm.gender">
-                  <el-radio :label="0">男</el-radio>
-                  <el-radio :label="1">女</el-radio>
+                  <el-radio :value="0">男</el-radio>
+                  <el-radio :value="1">女</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -306,7 +307,7 @@
             <el-col :span="12">
               <el-form-item label="角色" prop="roleId" :rules="[{required: true,message:'请选择角色',trigger: 'change'}]">
                 <el-select v-model="form.userForm.roleId" placeholder="请选角色" style="width: 100%">
-                  <el-option v-for="item in form.roleList" :key="item.id" :label="item.name" :value="item.id" />
+                  <el-option v-for="item in form.roleList" :key="item['id']" :label="item['name']" :value="item['id']" />
                 </el-select>
               </el-form-item>
             </el-col>