From ba5e65e7bda57e18bd0dcf65d1d9596f967e0ae0 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期日, 26 二月 2023 12:25:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/maintenance/menuSettings.vue | 62 +++++++++++++++----------------
1 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/src/views/maintenance/menuSettings.vue b/src/views/maintenance/menuSettings.vue
index c5ce763..005b9d5 100644
--- a/src/views/maintenance/menuSettings.vue
+++ b/src/views/maintenance/menuSettings.vue
@@ -22,12 +22,10 @@
>
</el-tree>
</div>
-
</div>
<div class="right_menu subpage_Div">
-
- <div style="display:flex;justify-content:space-between;align-items: center;padding-bottom: 14px">
- <el-breadcrumb separator="/">
+ <div style="display:flex;justify-content:right;align-items: center;padding-bottom: 14px">
+ <el-breadcrumb separator="/" style="display: none">
<el-breadcrumb-item :to="{ path: '/' }">{{
$t('dataManage.dictionaryManageObj.particulars')
}}</el-breadcrumb-item>
@@ -84,7 +82,7 @@
:model="itemdetail"
ref="itemdetail"
:rules="rules"
- style="position: relative;"
+ label-width="130px"
>
<el-form-item
prop="enName"
@@ -109,16 +107,16 @@
autocomplete="off"
></el-input>
</el-form-item>
- <el-form-item
- :label="$t('operatManage.menuSetObj.icon')"
- :label-width="formLabelWidth"
- >
- <el-input
- v-model="itemdetail.icon"
- :placeholder="$t('operatManage.menuSetObj.iconHolder')"
- autocomplete="off"
- ></el-input>
- </el-form-item>
+<!-- <el-form-item-->
+<!-- :label="$t('operatManage.menuSetObj.icon')"-->
+<!-- :label-width="formLabelWidth"-->
+<!-- >-->
+<!-- <el-input-->
+<!-- v-model="itemdetail.icon"-->
+<!-- :placeholder="$t('operatManage.menuSetObj.iconHolder')"-->
+<!-- autocomplete="off"-->
+<!-- ></el-input>-->
+<!-- </el-form-item>-->
<el-form-item
prop="isShow"
:label="$t('operatManage.menuSetObj.isShow')"
@@ -194,22 +192,21 @@
:placeholder="$t('operatManage.menuSetObj.bakHolder')"
></el-input>
</el-form-item>
- <div
- style="margin-left: 100px"
- v-if="menuStatus.update"
- >
- <el-button
- size="small"
- type="primary"
- @click="updMenu('itemdetail')"
- >{{ $t('common.confirm') }}</el-button>
- <el-button
- size="small"
- type="info"
- @click="reset('itemdetail')"
- >{{
- $t('common.cancel')
- }}</el-button>
+ <div v-if="menuStatus.update">
+ <el-form-item>
+ <el-button
+ size="small"
+ type="primary"
+ @click="updMenu('itemdetail')"
+ >{{ $t('common.confirm') }}</el-button>
+ <el-button
+ size="small"
+ type="info"
+ @click="reset('itemdetail')"
+ >{{
+ $t('common.cancel')
+ }}</el-button>
+ </el-form-item>
</div>
</el-form>
</div>
@@ -888,6 +885,7 @@
border-radius: 5px;
padding: 1%;
overflow-y: auto;
+ border-right: 1px solid #dcdfe6;
}
.right_menu {
width: 80%;
@@ -897,7 +895,7 @@
overflow: auto;
.form_box {
box-sizing: border-box;
- padding-top: 20px;
+ padding-top: 22px;
width: 100%;
.el-input {
width: 400px;
--
Gitblit v1.9.3