Surpriseplus
2022-10-17 da48c1c07e469212e0c79ceaf81aca51944bb88e
授权管里下各个页面布局修改
已修改6个文件
285 ■■■■■ 文件已修改
public/config/config.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/api.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/AuthorizationManagement/menuRoleAuthorization.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/AuthorizationManagement/roleMenuAuthorization.vue 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/AuthorizationManagement/roleResAuthorization.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/AuthorizationManagement/userRoleAuthorization.vue 213 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/config/config.js
@@ -1,5 +1,5 @@
const BASE_URL = 'http://192.168.20.55:12316';
//const BASE_URL = 'http://192.168.20.39:12316';
//const BASE_URL = 'http://192.168.20.55:12316';
const BASE_URL = 'http://192.168.20.39:12316';
var gisUrl = 'http://183.162.245.49:3301';
var ifreamUrl = 'http://192.168.20.39:12306/';
src/api/api.js
@@ -331,7 +331,7 @@
}
//资源管理-根据角色分页查询并返回记录数
export function resSelectCountForRole(params) {
  return request.get('/res/selectCountForRole', { params: params });
  return request.get('/res/selectByPageForRole', { params: params });
}
//角色菜单-根据角色ID+菜单ID分页查询并返回记录数
export function roleMenuAuthelectByPageForRole(params) {
src/views/AuthorizationManagement/menuRoleAuthorization.vue
@@ -80,10 +80,10 @@
      >
        <el-table-column type="selection" width="55"> </el-table-column>
        <el-table-column
          prop="authid"
          :label="$t('operatManage.UserRoleAuthorizationObj.serialNumber')"
        >
        </el-table-column>
          align="center"
          type="index"
          :label="$t('dataManage.styleObj.index')"
        />
        <el-table-column
          prop="authName"
          :label="$t('operatManage.UserRoleAuthorizationObj.name')"
@@ -115,10 +115,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')"
src/views/AuthorizationManagement/roleMenuAuthorization.vue
@@ -65,10 +65,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')"
@@ -185,10 +185,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')"
@@ -220,10 +220,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')"
src/views/AuthorizationManagement/roleResAuthorization.vue
@@ -63,10 +63,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')"
@@ -139,10 +139,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')"
@@ -179,10 +179,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')"
@@ -413,7 +413,7 @@
      if (data.code !== 200) {
        return this.$message.error('新增资源列表请求错误');
      }
      debugger;
      this.gridData = data.result;
      this.addcount = data.count;
    },
src/views/AuthorizationManagement/userRoleAuthorization.vue
@@ -1,27 +1,34 @@
<template>
  <div class="menuSettings_box">
    <div class="menuSettings_tree">
      <My-bread :list="[
      <My-bread
        :list="[
          `${$t('operatManage.operatManage')}`,
          `${$t('operatManage.UserRoleAuthorization')}`,
        ]"></My-bread>
        ]"
      ></My-bread>
      <el-divider />
      <div class="menuTreeBox">
        <el-tree :data="depList"
        <el-tree
          :data="depList"
                 :props="defaultProps"
                 :show-checkbox="true"
                 :check-on-click-node="true"
                 :check-strictly="true"
                 node-key="id"
                 @check="treeCheck"
                 ref="treeForm">
          ref="treeForm"
        >
        </el-tree>
      </div>
    </div>
    <div class="menuSettings_tree"
         style="margin-left: 10px; width: calc(50% - 172px)">
      <div style="
    <div
      class="menuSettings_tree"
      style="margin-left: 10px; width: calc(50% - 172px)"
    >
      <div
        style="
          font-size: 14px;
          color: #606266;
          line-height: 1;
@@ -29,42 +36,54 @@
          position: relative;
          top: 10px;
          margin-left: 10px;
        ">
        {{ $t("operatManage.UserRoleAuthorizationObj.RoleTable") }}
        "
      >
        {{ $t('operatManage.UserRoleAuthorizationObj.RoleTable') }}
      </div>
      <el-divider />
      <el-table :data="tableData"
      <el-table
        :data="tableData"
                style="width: 100%"
                @row-click="singleElection"
                highlight-current-row
                height="85%"
                :header-cell-style="{
          background: 'transparent',
        }">
        <el-table-column align="center"
                         width="55">
        }"
      >
        <el-table-column align="center" width="55">
          <template slot-scope="scope">
            <!-- 可以手动的修改label的值,从而控制选择哪一项 -->
            <el-radio class="radio"
            <el-radio
              class="radio"
                      v-model="templateSelection"
                      :label="scope.row.id">&nbsp;</el-radio>
              :label="scope.row.id"
              >&nbsp;</el-radio
            >
          </template>
        </el-table-column>
        <el-table-column prop="id"
                         :label="$t('operatManage.UserRoleAuthorizationObj.serialNumber')">
        </el-table-column>
        <el-table-column prop="name"
                         :label="$t('operatManage.UserRoleAuthorizationObj.name')">
        <el-table-column
          align="center"
          type="index"
          :label="$t('dataManage.styleObj.index')"
          width="70px"
        />
        <el-table-column
          prop="name"
          :label="$t('operatManage.UserRoleAuthorizationObj.name')"
        >
        </el-table-column>
      </el-table>
      <div style="text-align: center; margin-top: 20px">
        <el-pagination @size-change="handleSizeChange"
        <el-pagination
          @size-change="handleSizeChange"
                       @current-change="handleCurrentChange"
                       :current-page="listData.pageIndex"
                       :page-sizes="[10, 20, 30, 40]"
                       :page-size="userlistData.pageSize"
                       layout="total, sizes, prev, pager, next, jumper"
                       :total="count">
          :total="count"
        >
        </el-pagination>
      </div>
    </div>
@@ -72,7 +91,8 @@
      <!-- <div class="title_box">
        <h4>详细信息</h4>
      </div> -->
      <div style="
      <div
        style="
          font-size: 14px;
          color: #606266;
          line-height: 1;
@@ -82,92 +102,115 @@
          margin-left: 10px;
          display: flex;
          align-items: center;
        ">
        "
      >
        <span>
          {{ $t("operatManage.UserRoleAuthorizationObj.userTable") }}</span>
        <div class="btn"
             style="margin-left: auto">
          <el-button type="primary"
          {{ $t('operatManage.UserRoleAuthorizationObj.userTable') }}</span
        >
        <div class="btn" style="margin-left: auto">
          <el-button
            type="primary"
                     icon="el-icon-circle-plus-outline"
                     size="small"
                     :disabled="roleid == null ? true : false"
                     @click="adduser">{{ $t("operatManage.UserRoleAuthorizationObj.Added") }}</el-button>
          <el-button type="danger"
            @click="adduser"
            >{{ $t('operatManage.UserRoleAuthorizationObj.Added') }}</el-button
          >
          <el-button
            type="danger"
                     icon="el-icon-delete"
                     size="small"
                     @click="deletesUser"
                     :disabled="roleid == null ? true : false">{{ $t("operatManage.UserRoleAuthorizationObj.delete") }}</el-button>
            :disabled="roleid == null ? true : false"
            >{{ $t('operatManage.UserRoleAuthorizationObj.delete') }}</el-button
          >
        </div>
      </div>
      <el-divider class="divider" />
      <el-table :data="usertableData"
      <el-table
        :data="usertableData"
                stripe
                style="width: 100%"
                height="85%"
                @selection-change="handleSelectionChange"
                :header-cell-style="{
          background: 'transparent',
        }">
        <el-table-column type="selection"
                         width="55"> </el-table-column>
        <el-table-column prop="id"
                         :label="$t('operatManage.UserRoleAuthorizationObj.serialNumber')">
        </el-table-column>
        <el-table-column prop="uname"
                         :label="$t('operatManage.UserRoleAuthorizationObj.name')">
        }"
      >
        <el-table-column type="selection" width="55"> </el-table-column>
        <el-table-column
          align="center"
          type="index"
          :label="$t('dataManage.styleObj.index')"
        />
        <el-table-column
          prop="uname"
          :label="$t('operatManage.UserRoleAuthorizationObj.name')"
        >
        </el-table-column>
      </el-table>
      <div style="margin-top: 20px; text-align: center"
           class="pagination_box">
        <el-pagination @size-change="userhandleSizeChange"
      <div style="margin-top: 20px; text-align: center" class="pagination_box">
        <el-pagination
          @size-change="userhandleSizeChange"
                       @current-change="userhandleCurrentChange"
                       :current-page="userlistData.pageIndex"
                       :page-sizes="[10, 20, 30, 40]"
                       :page-size="userlistData.pageSize"
                       layout="total, sizes, prev, pager, next, jumper"
                       :total="usercount">
          :total="usercount"
        >
        </el-pagination>
      </div>
    </div>
    <el-dialog :title="$t('operatManage.UserRoleAuthorizationObj.Added')"
               :visible.sync="dialogTableVisible">
      <el-table :data="gridData"
    <el-dialog
      :title="$t('operatManage.UserRoleAuthorizationObj.Added')"
      :visible.sync="dialogTableVisible"
    >
      <el-table
        :data="gridData"
                height="40vh"
                @selection-change="addhandleSelectionChange">
        <el-table-column type="selection"
                         width="55"> </el-table-column>
        <el-table-column prop="id"
                         :label="$t('operatManage.UserRoleAuthorizationObj.serialNumber')">
        </el-table-column>
        <el-table-column prop="uname"
                         :label="$t('operatManage.UserRoleAuthorizationObj.name')">
        @selection-change="addhandleSelectionChange"
      >
        <el-table-column type="selection" width="55"> </el-table-column>
        <el-table-column
          align="center"
          type="index"
          :label="$t('dataManage.styleObj.index')"
        />
        <el-table-column
          prop="uname"
          :label="$t('operatManage.UserRoleAuthorizationObj.name')"
        >
        </el-table-column>
      </el-table>
      <div style="margin-top: 20px; text-align: center"
           class="pagination_box">
        <el-pagination @size-change="addhandleSizeChange"
      <div style="margin-top: 20px; text-align: center" class="pagination_box">
        <el-pagination
          @size-change="addhandleSizeChange"
                       @current-change="addhandleCurrentChange"
                       :current-page="addlistData.pageIndex"
                       :page-sizes="[10, 20, 30, 40]"
                       :page-size="addlistData.pageSize"
                       layout="total, sizes, prev, pager, next, jumper"
                       :total="addcount">
          :total="addcount"
        >
        </el-pagination>
      </div>
      <div slot="footer"
           class="dialog-footer">
        <el-button @click="dialogTableVisible = false">{{ $t("dataManage.dictionaryManageObj.cancel") }}</el-button>
        <el-button type="primary"
                   @click="addConfirm">{{ $t("dataManage.dictionaryManageObj.confirm") }}</el-button>
      <div slot="footer" class="dialog-footer">
        <el-button @click="dialogTableVisible = false">{{
          $t('dataManage.dictionaryManageObj.cancel')
        }}</el-button>
        <el-button type="primary" @click="addConfirm">{{
          $t('dataManage.dictionaryManageObj.confirm')
        }}</el-button>
      </div>
    </el-dialog>
  </div>
</template>
<script>
import MyBread from "../../components/MyBread.vue";
import MyBread from '../../components/MyBread.vue';
import {
  queryDepTree,
  select_Role_ByPageAndCount,
@@ -175,7 +218,7 @@
  roleUserdeletes,
  userselectByPageForRole,
  roleUserinserts,
} from "../../api/api";
} from '../../api/api';
export default {
  //import引入的组件需要注入到对象中才能使用
  components: {
@@ -199,18 +242,18 @@
      usercount: 0,
      tableData: [],
      //   当前选择的行的id
      templateSelection: "",
      templateSelection: '',
      //   当前选择的行的数据
      checkList: [],
      defaultProps: {
        children: "children",
        label: "name",
        children: 'children',
        label: 'name',
      },
      oriData: [], //原始树数据
      depList: [], //el树数据
      backUpData: {},
      formLabelWidth: "170px",
      formLabelWidth: '170px',
      listData: {
        pageIndex: 1,
        pageSize: 10,
@@ -224,10 +267,10 @@
  },
  methods: {
    addConfirm () {
      this.$confirm("确定是否新增", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      this.$confirm('确定是否新增', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
      })
        .then(async () => {
          let arr = [];
@@ -236,11 +279,11 @@
          });
          const data = await roleUserinserts(arr);
          if (data.code !== 200) {
            return this.$message.error("新增失败");
            return this.$message.error('新增失败');
          }
          this.$message({
            type: "success",
            message: "新增成功!",
            type: 'success',
            message: '新增成功!',
          });
          this.dialogTableVisible = false;
          this.getuserList();
@@ -259,11 +302,11 @@
      });
      const data = await roleUserdeletes({ ids: arr.toString() });
      if (data.code !== 200) {
        return this.$message.error("删除失败");
        return this.$message.error('删除失败');
      }
      this.$message({
        message: "删除成功",
        type: "success",
        message: '删除成功',
        type: 'success',
      });
      this.getuserList();
    },
@@ -319,7 +362,7 @@
      const data = await queryDepTree();
      if (data.code !== 200) {
        return this.$message.error("请求单位报错");
        return this.$message.error('请求单位报错');
      }
      this.depList = this.treeData(data.result);
    },
@@ -328,7 +371,7 @@
      return cloneData.filter((father) => {
        // 循环所有项
        let branchArr = cloneData.filter((child) => father.id == child.pid); // 对比ID,分别上下级菜单,并返回数据
        branchArr.length > 0 ? (father.children = branchArr) : ""; // 给父级添加一个children属性,并赋值
        branchArr.length > 0 ? (father.children = branchArr) : ''; // 给父级添加一个children属性,并赋值
        return father.pid == 0; // 返回一级菜单
      });
    },
@@ -358,7 +401,7 @@
      this.addlistData.debid = this.debid;
      const data = await userselectByPageForRole(this.addlistData);
      if (data.code !== 200) {
        return this.$message.error("新增用户列表请求错误");
        return this.$message.error('新增用户列表请求错误');
      }
      this.gridData = data.result;
      this.addcount = data.count;
@@ -367,7 +410,7 @@
    async getuserList () {
      const data = await roleUserselectByPageForRole(this.userlistData);
      if (data.code !== 200) {
        return this.$message.error("用户列表请求错误");
        return this.$message.error('用户列表请求错误');
      }
      this.usertableData = data.result;
      this.usercount = data.count;
@@ -376,7 +419,7 @@
    async getRole () {
      const data = await select_Role_ByPageAndCount(this.listData);
      if (data.code !== 200) {
        return this.$message.error("用户角色请求错误");
        return this.$message.error('用户角色请求错误');
      }
      this.tableData = data.result;
      this.count = data.count;