角色页面标题修改，用户列表字段修改

Administrator

2021-07-13 e4ca54e71efe08d9e7f9ffce719f44a216c889ab

角色页面标题修改，用户列表字段修改

 src/views/authority/role.vue

@@ -1,6 +1,7 @@
<template>
  <basic-container>
    <avue-crud :option="option"
    <avue-crud
      :option="option"
               :table-loading="loading"
               :data="data"
               ref="crud"
@@ -16,71 +17,91 @@
               @current-change="currentChange"
               @size-change="sizeChange"
               @refresh-change="refreshChange"
               @on-load="onLoad">
      @on-load="onLoad"
    >
      <template slot="menuLeft">
        <el-button type="danger"
        <el-button
          type="danger"
                   size="small"
                   icon="el-icon-delete"
                   v-if="permission.role_delete"
                   plain
                   @click="handleDelete">删 除
          @click="handleDelete"
          >删 除
        </el-button>
        <el-button size="small"
        <el-button
          size="small"
                   icon="el-icon-setting"
                   @click="handleRole"
                   v-if="userInfo.role_name.includes('admin')"
                   plain>权限设置
          plain
          >权限设置
        </el-button>
      </template>
    </avue-crud>
    <el-dialog title="角色权限配置"
    <el-dialog
      title="角色权限配置"
               append-to-body
               :visible.sync="box"
               width="345px">
      width="345px"
    >
      <el-tabs type="border-card">
        <el-tab-pane label="菜单权限">
          <el-tree :data="menuGrantList"
          <el-tree
            :data="menuGrantList"
                   show-checkbox
                   node-key="id"
                   ref="treeMenu"
                   :default-checked-keys="menuTreeObj"
                   :props="props">
            :props="props"
          >
          </el-tree>
        </el-tab-pane>
        <el-tab-pane label="数据权限">
          <el-tree :data="dataScopeGrantList"
          <el-tree
            :data="dataScopeGrantList"
                   show-checkbox
                   node-key="id"
                   ref="treeDataScope"
                   :default-checked-keys="dataScopeTreeObj"
                   :props="props">
            :props="props"
          >
          </el-tree>
        </el-tab-pane>
        <el-tab-pane label="接口权限">
          <el-tree :data="apiScopeGrantList"
          <el-tree
            :data="apiScopeGrantList"
                   show-checkbox
                   node-key="id"
                   ref="treeApiScope"
                   :default-checked-keys="apiScopeTreeObj"
                   :props="props">
            :props="props"
          >
          </el-tree>
        </el-tab-pane>
      </el-tabs>

      <span slot="footer"
            class="dialog-footer">
      <span slot="footer" class="dialog-footer">
        <el-button @click="box = false">取 消</el-button>
        <el-button type="primary"
                   @click="submit">确 定</el-button>
        <el-button type="primary" @click="submit">确 定</el-button>
      </span>
    </el-dialog>
  </basic-container>
</template>

<script>
  import {add, getList, getRole, getRoleTreeById, grant, grantTree, remove, update} from "@/api/system/role";
import {
  add,
  getList,
  getRole,
  getRoleTreeById,
  grant,
  grantTree,
  remove,
  update,
} from "@/api/system/role";
  import {mapGetters} from "vuex";
  import website from '@/config/website';
import website from "@/config/website";

  export default {
    data() {
@@ -89,7 +110,7 @@
        box: false,
        props: {
          label: "title",
          value: "key"
        value: "key",
        },
        menuGrantList: [],
        dataScopeGrantList: [],
@@ -104,7 +125,7 @@
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        total: 0,
        },
        option: {
          tip: false,
@@ -128,12 +149,12 @@
                {
                  required: true,
                  message: "请输入角色名称",
                  trigger: "blur"
                }
              ]
                trigger: "blur",
              },
            ],
            },
            {
              label: "所属保安单位",
            label: "所属单位",
              prop: "tenantId",
              type: "tree",
              dicUrl: "/api/blade-system/tenant/select",
@@ -143,15 +164,17 @@
              span: 24,
              props: {
                label: "tenantName",
                value: "tenantId"
              value: "tenantId",
              },
              hide: !website.tenantMode,
              search: website.tenantMode,
              rules: [{
            rules: [
              {
                required: true,
                message: "请输入所属保安单位",
                trigger: "click"
              }]
                trigger: "click",
              },
            ],
            },
            {
              label: "角色别名",
@@ -162,9 +185,9 @@
                {
                  required: true,
                  message: "请输入角色别名",
                  trigger: "blur"
                }
              ]
                trigger: "blur",
              },
            ],
            },
            {
              label: "上级角色",
@@ -174,15 +197,15 @@
              hide: true,
              span: 24,
              props: {
                label: "title"
              label: "title",
              },
              rules: [
                {
                  required: false,
                  message: "请选择上级角色",
                  trigger: "click"
                }
              ]
                trigger: "click",
              },
            ],
            },
            {
              label: "角色排序",
@@ -193,13 +216,13 @@
                {
                  required: true,
                  message: "请输入角色排序",
                  trigger: "blur"
                }
              ]
            }
          ]
                trigger: "blur",
        },
        data: []
            ],
          },
        ],
      },
      data: [],
      };
    },
    computed: {
@@ -209,28 +232,27 @@
          addBtn: this.vaildData(this.permission.role_add, false),
          viewBtn: this.vaildData(this.permission.role_view, false),
          delBtn: this.vaildData(this.permission.role_delete, false),
          editBtn: this.vaildData(this.permission.role_edit, false)
        editBtn: this.vaildData(this.permission.role_edit, false),
        };
      },
      ids() {
        let ids = [];
        this.selectionList.forEach(ele => {
      this.selectionList.forEach((ele) => {
          ids.push(ele.id);

        });
        return ids.join(",");
      },
      idsArray() {
        let ids = [];
        this.selectionList.forEach(ele => {
      this.selectionList.forEach((ele) => {
          ids.push(ele.id);
        });
        return ids;
      }
    },
    },
    methods: {
      initData(roleId){
        getRoleTreeById(roleId).then(res => {
      getRoleTreeById(roleId).then((res) => {
          const column = this.findObject(this.option.column, "parentId");
          column.dicData = res.data.data;
        });
@@ -243,42 +265,48 @@
          this.box = false;
          this.$message({
            type: "success",
            message: "操作成功!"
          message: "操作成功!",
          });
          this.onLoad(this.page);
        });
      },
      rowSave(row, done, loading) {
        add(row).then(() => {
      add(row).then(
        () => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
            message: "操作成功!",
          });
          done();
        }, error => {
        },
        (error) => {
          window.console.log(error);
          loading();
        });
        }
      );
      },
      rowUpdate(row, index, done, loading) {
        update(row).then(() => {
      update(row).then(
        () => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
            message: "操作成功!",
          });
          done();
        }, error => {
        },
        (error) => {
          window.console.log(error);
          loading();
        });
        }
      );
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        type: "warning",
        })
          .then(() => {
            return remove(row.id);
@@ -287,7 +315,7 @@
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            message: "操作成功!",
            });
          });
      },
@@ -323,12 +351,11 @@
        this.menuTreeObj = [];
        this.dataScopeTreeObj = [];
        this.apiScopeTreeObj = [];
        grantTree()
          .then(res => {
      grantTree().then((res) => {
            this.menuGrantList = res.data.data.menu;
            this.dataScopeGrantList = res.data.data.dataScope;
            this.apiScopeGrantList = res.data.data.apiScope;
            getRole(this.ids).then(res => {
        getRole(this.ids).then((res) => {
              this.menuTreeObj = res.data.data.menu;
              this.dataScopeTreeObj = res.data.data.dataScope;
              this.apiScopeTreeObj = res.data.data.apiScope;
@@ -344,7 +371,7 @@
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        type: "warning",
        })
          .then(() => {
            return remove(this.ids);
@@ -353,7 +380,7 @@
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            message: "操作成功!",
            });
            this.$refs.crud.toggleSelection();
          });
@@ -369,12 +396,16 @@
      },
      onLoad(page, params = {}) {
        this.loading = true;
        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
      getList(
        page.currentPage,
        page.pageSize,
        Object.assign(params, this.query)
      ).then((res) => {
          this.data = res.data.data;
          this.loading = false;
          this.selectionClear();
        });
      }
    }
    },
  },
  };
</script>

 src/views/desk/notice.vue

@@ -1,6 +1,7 @@
<template>
  <basic-container>
    <avue-crud :option="option"
    <avue-crud
      :option="option"
               :table-loading="loading"
               :data="data"
               :page.sync="page"
@@ -17,19 +18,26 @@
               @current-change="currentChange"
               @size-change="sizeChange"
               @refresh-change="refreshChange"
               @on-load="onLoad">
      @on-load="onLoad"
    >
      <template slot="menuLeft">
        <el-button type="danger"
        <el-button
          type="danger"
                   size="small"
                   icon="el-icon-delete"
                   plain
                   v-if="permission.notice_delete"
                   @click="handleDelete">删 除
          @click="handleDelete"
          >删 除
        </el-button>
      </template>
      <template slot-scope="{row}"
                slot="category">
      <template slot-scope="{ row }" slot="category">
        <el-tag>{{row.categoryName}}</el-tag>
      </template>
      <template slot-scope="{ type, size, row }" slot="menu">
        <el-button :size="size" :type="type" @click="handleDelete"
          >附件上传
        </el-button>
      </template>
    </avue-crud>
  </basic-container>
@@ -48,21 +56,22 @@
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        total: 0,
        },
        selectionList: [],
        option: {
          height: 'auto',
        height: "auto",
          calcHeight: 30,
          dialogWidth: 950,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          border: true,
        border: false,
          index: true,
          viewBtn: true,
          selection: true,
          excelBtn: true,
        excelBtn: false,
        menuWidth: 320,
          dialogClickModal: false,
          column: [
            {
@@ -71,11 +80,13 @@
              span: 24,
              row: true,
              search: true,
              rules: [{
            rules: [
              {
                required: true,
                message: "请输入通知标题",
                trigger: "blur"
              }]
                trigger: "blur",
              },
            ],
            },
            {
              label: "通知类型",
@@ -83,17 +94,19 @@
              dicUrl: "/api/blade-system/dict/dictionary?code=notice",
              props: {
                label: "dictValue",
                value: "dictKey"
              value: "dictKey",
              },
              dataType: "number",
              slot: true,
              prop: "category",
              search: true,
              rules: [{
            rules: [
              {
                required: true,
                message: "请输入通知类型",
                trigger: "blur"
              }]
                trigger: "blur",
              },
            ],
            },
            {
              label: "通知时间",
@@ -107,11 +120,13 @@
              editDisplay: false,
              viewDisplay: false,
              search: true,
              rules: [{
            rules: [
              {
                required: true,
                message: "请输入通知时间",
                trigger: "blur"
              }]
                trigger: "blur",
              },
            ],
            },
            {
              label: "通知日期",
@@ -119,30 +134,32 @@
              type: "date",
              format: "yyyy-MM-dd hh:mm:ss",
              valueFormat: "yyyy-MM-dd hh:mm:ss",
              rules: [{
            rules: [
              {
                required: true,
                message: "请输入通知日期",
                trigger: "click"
              }]
                trigger: "click",
              },
            ],
            },
            {
              label: "通知内容",
              prop: "content",
              component: 'AvueUeditor',
            component: "AvueUeditor",
              options: {
                action: '/api/blade-resource/oss/endpoint/put-file',
              action: "/api/blade-resource/oss/endpoint/put-file",
                props: {
                  res: "data",
                  url: "link",
                }
              },
              },
              hide: true,
              minRows: 6,
              span: 24,
            }
          ]
        },
        data: []
        ],
      },
      data: [],
      };
    },
    computed: {
@@ -152,49 +169,55 @@
          addBtn: this.vaildData(this.permission.notice_add, false),
          viewBtn: this.vaildData(this.permission.notice_view, false),
          delBtn: this.vaildData(this.permission.notice_delete, false),
          editBtn: this.vaildData(this.permission.notice_edit, false)
        editBtn: this.vaildData(this.permission.notice_edit, false),
        };
      },
      ids() {
        let ids = [];
        this.selectionList.forEach(ele => {
      this.selectionList.forEach((ele) => {
          ids.push(ele.id);
        });
        return ids.join(",");
      }
    },
    },
    methods: {
      rowSave(row, done, loading) {
        add(row).then(() => {
      add(row).then(
        () => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
            message: "操作成功!",
          });
          done();
        }, error => {
        },
        (error) => {
          window.console.log(error);
          loading();
        });
        }
      );
      },
      rowUpdate(row, index, done, loading) {
        update(row).then(() => {
      update(row).then(
        () => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
            message: "操作成功!",
          });
          done();
        }, error => {
        },
        (error) => {
          window.console.log(error);
          loading();
        });
        }
      );
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        type: "warning",
        })
          .then(() => {
            return remove(row.id);
@@ -203,7 +226,7 @@
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            message: "操作成功!",
            });
          });
      },
@@ -232,7 +255,7 @@
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        type: "warning",
        })
          .then(() => {
            return remove(this.ids);
@@ -241,14 +264,14 @@
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            message: "操作成功!",
            });
            this.$refs.crud.toggleSelection();
          });
      },
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getNotice(this.form.id).then(res => {
        getNotice(this.form.id).then((res) => {
            this.form = res.data.data;
          });
        }
@@ -273,20 +296,20 @@
            ...params,
            releaseTime_datege: releaseTimeRange[0],
            releaseTime_datelt: releaseTimeRange[1],
            ...this.query
          ...this.query,
          };
          values.releaseTimeRange = null;
        }
        this.loading = true;
        getList(page.currentPage, page.pageSize, values).then(res => {
      getList(page.currentPage, page.pageSize, values).then((res) => {
          const data = res.data.data;
          this.page.total = data.total;
          this.data = data.records;
          this.loading = false;
          this.selectionClear();
        });
      }
    }
    },
  },
  };
</script>


 src/views/system/user.vue

@@ -300,7 +300,7 @@
          },
          {
            label: "所属组织机构",
            prop: "tenantName",
            prop: "deptName",
            slot: true,
            display: false,
          },