Merge remote-tracking branch 'origin/master'

xing

2023-02-26 ba5e65e7bda57e18bd0dcf65d1d9596f967e0ae0

 src/views/AuthorizationManagement/roleMenuAuthorization.vue

@@ -2,7 +2,7 @@
  <div class="menuSettings_box">
    <!-- 角色，单位 -->
    <div class="menuSettings_tree">
      <div class="content_box subpage_Div">
      <div class="content_box subpage_Div content-border">
        <My-bread :list="[
            `${$t('operatManage.operatManage')}`,
            `${$t('operatManage.RoleMenuAuthorization')}`,
@@ -73,7 +73,7 @@
          </el-table-column>
        </el-table>
      </div>
      <div class="content_box subpage_Div">
      <div class="content_box subpage_Div content-border">
        <div style="
            font-size: 14px;
            color: #216fe6;
@@ -104,14 +104,14 @@
        </el-tree>

      </div>
      <div class="content_box subpage_Div">
      <div class="content_box subpage_Div content-border">
        <div style="
            font-size: 14px;
            color: #216fe6;
            line-height: 1;
            cursor: text;
            position: relative;
            top: 5px;
            top: 0px;
            margin-left: 10px;
            display: flex;
            align-items: center;
@@ -547,9 +547,10 @@
//@import url(); 引入公共css类
.menuSettings_box {
  //height: 98%;
  height: 100%;

  height: calc(100% - 20px);
  width: 98%;
  padding: 0 0.5%;
  padding: 10px 0.5%;

  .menuSettings_tree {
    display: flex;