From 2475c65a3c091cee4fe48f49e0f53697403750df Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 17 八月 2022 19:55:34 +0800
Subject: [PATCH] 冲突
---
src/views/system/menu/component/menuDialog.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/views/system/menu/component/menuDialog.vue b/src/views/system/menu/component/menuDialog.vue
index 0830adb..ae7afd9 100644
--- a/src/views/system/menu/component/menuDialog.vue
+++ b/src/views/system/menu/component/menuDialog.vue
@@ -30,7 +30,7 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="菜单图标">
- <el-input placeholder="请输入菜单图标" v-model.trim="ruleForm.meta.icon" type="all" />
+ <!-- <el-input placeholder="请输入菜单图标" v-model.trim="ruleForm.meta.icon" type="all" />-->
<IconSelector placeholder="请输入菜单图标" v-model="ruleForm.meta.icon" type="all" />
</el-form-item>
</el-col>
@@ -168,7 +168,6 @@
btnPower: ''
};
} else {
- debugger;
state.buttonName = '修改';
state.title = '修改菜单';
state.ruleForm = JSON.parse(JSON.stringify(value));
--
Gitblit v1.9.2