Merge branch 'master' of http://192.168.20.39:8989/r/LFWEB

lxl

2022-10-25 e5626382db6861bc6d73b33b4cfb40df3525dd5e

 src/views/AuthorizationManagement/roleResAuthorization.vue

@@ -19,6 +19,7 @@
          node-key="id"
          @check="treeCheck"
          ref="treeForm"
          :default-expanded-keys="[1]"
        >
        </el-tree>
      </div>
@@ -63,10 +64,10 @@
          </template>
        </el-table-column>
        <el-table-column
          prop="id"
          :label="$t('operatManage.UserRoleAuthorizationObj.serialNumber')"
        >
        </el-table-column>
          align="center"
          type="index"
          :label="$t('dataManage.styleObj.index')"
        />
        <el-table-column
          prop="name"
          :label="$t('operatManage.UserRoleAuthorizationObj.name')"
@@ -103,7 +104,9 @@
          align-items: center;
        "
      >
        <span> {{ $t('operatManage.UserRoleAuthorizationObj.ResTable') }}</span>
        <span>
          {{ $t('operatManage.UserRoleAuthorizationObj.userTable') }}</span
        >
        <div class="btn" style="margin-left: auto">
          <el-button
            type="primary"
@@ -137,10 +140,10 @@
      >
        <el-table-column type="selection" width="55"> </el-table-column>
        <el-table-column
          prop="id"
          :label="$t('operatManage.UserRoleAuthorizationObj.serialNumber')"
        >
        </el-table-column>
          align="center"
          type="index"
          :label="$t('dataManage.styleObj.index')"
        />
        <el-table-column
          prop="resName"
          :label="$t('operatManage.UserRoleAuthorizationObj.name')"
@@ -177,10 +180,10 @@
      >
        <el-table-column type="selection" width="55"> </el-table-column>
        <el-table-column
          prop="id"
          :label="$t('operatManage.UserRoleAuthorizationObj.serialNumber')"
        >
        </el-table-column>
          align="center"
          type="index"
          :label="$t('dataManage.styleObj.index')"
        />
        <el-table-column
          prop="name"
          :label="$t('operatManage.UserRoleAuthorizationObj.name')"
@@ -411,6 +414,7 @@
      if (data.code !== 200) {
        return this.$message.error('新增资源列表请求错误');
      }

      this.gridData = data.result;
      this.addcount = data.count;
    },