菜单问题修改

src/views/login/login.vue

@@ -142,7 +142,8 @@ export default {
               // window.location.href = `${this.reLocation}/#/`
               // this.$router.push({ path: `http://main.court.com${this.redirect || "/"}` });
               this.loading = false
-              this.$router.push('/welcome')
+              // this.$router.push('/welcome')
+              this.$router.push('/homePage/index')
             })
             .catch(() => {
               this.loading = false

src/views/system/menu/index.vue

@@ -146,14 +146,14 @@
           <el-col :span="24">
             <el-form-item label="菜单类型" prop="menuType">
               <el-radio-group v-model="form.menuType">
-                <el-radio label="m">目录</el-radio>
-                <el-radio label="c">菜单</el-radio>
-                <el-radio label="f">按钮</el-radio>
+                <el-radio label="M">目录</el-radio>
+                <el-radio label="C">菜单</el-radio>
+                <el-radio label="F">按钮</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item v-if="form.menuType !== 'f'" label="菜单图标">
+            <el-form-item v-if="form.menuType !== 'F'" label="菜单图标">
               <el-popover
                 placement="bottom-start"
                 width="460"
@@ -185,12 +185,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item v-if="form.menuType !== 'm'" label="权限标识">
+            <el-form-item v-if="form.menuType !== 'M'" label="权限标识">
               <el-input v-model.trim="form.perms" style="width: 95%" show-word-limit maxlength="50" placeholder="请权限标识" />
             </el-form-item>
           </el-col>
           <el-col :span="12" style="margin-right: 1px">
-            <el-form-item v-if="form.menuType !== 'f'" label="是否外链">
+            <el-form-item v-if="form.menuType !== 'F'" label="是否外链">
               <el-radio-group v-model="form.isFrame">
                 <el-radio label="0">是</el-radio>
                 <el-radio label="1">否</el-radio>
@@ -198,7 +198,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" style="margin-right: -1px">
-            <el-form-item v-if="form.menuType !== 'f'" label="是工作流">
+            <el-form-item v-if="form.menuType !== 'F'" label="是工作流">
               <el-radio-group v-model="form.isProcess">
                 <el-radio label="0">是</el-radio>
                 <el-radio label="1">否</el-radio>
@@ -206,15 +206,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.menuType !== 'f'" label="显示状态">
+            <el-form-item v-if="form.menuType !== 'F'" label="显示状态">
               <el-radio-group v-model="form.visible">
-                <el-radio label="0">显示</el-radio>
-                <el-radio label="1">隐藏</el-radio>
+                <el-radio label="1">显示</el-radio>
+                <el-radio label="0">隐藏</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.menuType !== 'f'" label="菜单状态">
+            <el-form-item v-if="form.menuType !== 'F'" label="菜单状态">
               <el-radio-group v-model="form.flag">
                 <el-radio label="1">启用</el-radio>
                 <el-radio label="0">停用</el-radio>
@@ -222,12 +222,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" style="width: 100%;">
-            <el-form-item v-if="form.menuType !== 'f'" label="路由地址" prop="path">
+            <el-form-item v-if="form.menuType !== 'F'" label="路由地址" prop="path">
               <el-input v-model.trim="form.path" style="width: 95%" show-word-limit maxlength="100" placeholder="请输入路由地址" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.menuType !== 'f' && form.isProcess==='0'" label="工作流">
+            <el-form-item v-if="form.menuType !== 'F' && form.isProcess==='0'" label="工作流">
               <el-select v-model="form.processId" clearable placeholder="请选择工作流">
                 <el-option
                   v-for="item in workFlows"
@@ -238,7 +238,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col v-if="form.menuType === 'c'" :span="12">
+          <el-col v-if="form.menuType === 'C'" :span="12">
             <el-form-item label="组件路径" prop="component">
               <el-input v-model.trim="form.component" show-word-limit maxlength="100" placeholder="请输入组件路径" />
             </el-form-item>
@@ -419,14 +419,14 @@ export default {
     },
     // 显示状态字典翻译
     visibleFormat(row, column) {
-      if (row.menuType === 'f') {
+      if (row.menuType === 'F') {
         return ''
       }
       return this.selectDictLabel(this.visibleOptions, row.visible)
     },
     // 菜单状态字典翻译
     statusFormat(row, column) {
-      if (row.menuType === 'f') {
+      if (row.menuType === 'F') {
         return ''
       }
       return this.selectDictLabel(this.statusOptions, row.flag)
@@ -444,7 +444,7 @@ export default {
         menuName: undefined,
         icon: undefined,
         processId: undefined,
-        menuType: 'm',
+        menuType: 'M',
         orderNum: undefined,
         isFrame: '1',
         visible: '0',

src/views/system/user/index.vue

@@ -43,14 +43,14 @@
           <el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
         </el-form-item>
         <el-form-item style="float: right">
-<!--          <el-button-->
-<!--            v-hasPermi="['sys:user:add']"-->
-<!--            style="padding: 8px 7px;"-->
-<!--            type="primary"-->
-<!--            size="small"-->
-<!--            icon="el-icon-plus"-->
-<!--            @click="handleFormAdd"-->
-<!--          >表单页新增模板</el-button>-->
+          <el-button
+            v-hasPermi="['sys:user:add']"
+            style="padding: 8px 7px;"
+            type="primary"
+            size="small"
+            icon="el-icon-plus"
+            @click="handleFormAdd"
+          >表单页新增模板</el-button>
           <el-button
             v-hasPermi="['sys:user:add']"
             style="padding: 8px 7px;"