bug修改

584911253@qq.com

2023-03-10 eb6cfd90fd89f11263146dc4c38069c8a4845fab

 src/views/maintenance/userManagement.vue

@@ -1,103 +1,142 @@
<template>
  <div class="userInfo_box">
    <My-bread
      :list="[
    <My-bread :list="[
        `${$t('operatManage.operatManage')}`,
        `${$t('userManage.userManage')}`,
      ]"
    ></My-bread>
      ]"></My-bread>
    <el-divider />
    <div class="inquire">
      <el-form ref="queryForm" :model="queryForm" :inline="true">
        <el-form-item prop="uname" :label="$t('userManage.userInfoObj.uname')">
          <el-input v-model="queryForm.uname" />
        </el-form-item>
        <el-form-item
          prop="depid"
          :label="$t('userManage.userInfoObj.depName')"
        >
          <el-cascader
            v-model="queryForm.depid"
            :options="treeOptions"
            filterable
            @change="handleChange"
            :show-all-levels="false"
            :props="{
              label: 'name',
              value: 'id',
              children: 'children',
              checkStrictly: true,
              emitPath: false,
            }"
          >
          </el-cascader>
        </el-form-item>
        <el-form-item>
          <el-button
            size="small"
            @click="queryInfo()"
            icon="el-icon-search"
            style="background: #409eff; border: 1px solid #409eff; color: white"
            >{{ $t('operatManage.ELM.search') }}
          </el-button>
        </el-form-item>
        <el-form-item>
          <el-button
            type="info"
            size="small"
            @click="resetInfo('queryForm')"
            icon="el-icon-refresh"
          >
            {{ $t('operatManage.ELM.reset') }}
          </el-button>
        </el-form-item>
        <br />
        <el-form-item>
          <el-button
            type="success"
            size="small"
            @click="showAddDialog"
            icon="el-icon-plus"
          >
            {{ $t('common.append') }}
          </el-button>
        </el-form-item>
        <el-form-item>
          <el-button
            type="danger"
            size="small"
            @click="deleteUserInfo"
            icon="el-icon-delete"
          >
            {{ $t('common.delete') }}
          </el-button>
        </el-form-item>
        <el-form-item v-show="setbatchFlag">
          <el-button
            size="small"
            @click="editPwd"
            type="warning"
            icon="el-icon-unlock"
            >{{ $t('common.changepassWord') }}
          </el-button>
        </el-form-item>

    <div
      class="inquire subpage_Div"
      ref="container"
    >
      <el-form
        ref="queryForm"
        :model="queryForm"
        :inline="true"
      >
        <div class="flex_box">
          <div style="margin-right: auto">
            <el-form-item
              prop="depid"
              :label="$t('userManage.userInfoObj.depName')"
            >
              <el-select
                :popper-append-to-body="false"
                v-model="queryForm.depName"
                size="small"
                placeholder="请选择"
                style="width: 200px"
              >
                <el-option
                  :value="queryForm.depid"
                  :label="queryForm.depName"
                  style="height: auto"
                >
                  <el-tree
                    ref="tree"
                    :data="treeOptions"
                    node-key="id"
                    :props="props"
                    @node-click="handleNodeClickto"
                  />
                </el-option>
              </el-select>
            </el-form-item>
            <el-form-item
                prop="uname"
                :label="$t('userManage.userInfoObj.uname')"
            >
              <el-input
                  v-model="queryForm.uname"
                  size="small"
                  :placeholder="$t('userManage.userInfoObj.unamePlaceholder')"
                  style="width: 200px"
              >
                <i slot="suffix" class="el-icon-search" @click="queryInfo"></i>
              </el-input>
            </el-form-item>
          </div>
          <div>
<!--            <el-form-item>-->
<!--              <el-button-->
<!--                type="primary"-->
<!--                size="small"-->
<!--                @click="queryInfo('queryForm')"-->
<!--                icon="el-icon-search"-->
<!--              >-->
<!--                {{ $t("operatManage.ELM.search") }}-->
<!--              </el-button>-->
<!--            </el-form-item>-->
            <el-form-item>
              <el-button
                  v-if="menuStatus.insert"
                  type="success"
                  size="small"
                  @click="showAddDialog"
                  icon="el-icon-plus"
              >
                {{ $t("common.append") }}
              </el-button>
            </el-form-item>
            <el-form-item v-show="setbatchFlag">
              <el-button
                v-if="menuStatus.update"
                size="small"
                @click="editPwd"
                type="warning"
                icon="el-icon-unlock"
              >{{ $t("common.changepassWord") }}
              </el-button>
            </el-form-item>
            <el-form-item>
              <el-button
                v-if="menuStatus.delete"
                type="danger"
                size="small"
                @click="deleteUserInfo"
                icon="el-icon-delete"
              >
                {{ $t("common.delete") }}
              </el-button>
            </el-form-item>
            <el-form-item>
              <el-button
                  type="info"
                  size="small"
                  @click="resetInfo('queryForm')"
                  icon="el-icon-refresh"
              >
                {{ $t("operatManage.ELM.reset") }}
              </el-button>
            </el-form-item>
          </div>
        </div>
      </el-form>
    </div>
    <div class="table_box">
    <div class="dividing-line"></div>
    <div
      class="table_box"
      :style="styleVar"
    >
      <el-table
        ref="filterTable"
        :data="tableData"
        border
        style="width: 100%"
        height="99%"
        border
        class="table_height"
        height="calc(100% - 45px)"
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55" />
        <el-table-column
          type="selection"
          width="55"
        />
        <el-table-column
          align="center"
          type="index"
          :label="$t('common.index')"
          width="70px"
          fixed
        />

        <el-table-column
@@ -105,7 +144,6 @@
          prop="uname"
          width="150px"
          :label="$t('userManage.userInfoObj.uname')"
          fixed
        />
        <el-table-column
          align="center"
@@ -140,36 +178,31 @@
        <el-table-column
          align="center"
          prop="idcard"
          width="200px"
          :label="$t('userManage.userInfoObj.idcard')"
        /><el-table-column
        />
        <el-table-column
          align="center"
          prop="job"
          width="200px"
          :label="$t('userManage.userInfoObj.job')"
        />
        <el-table-column
          align="center"
          prop="edu"
          width="200px"
          :label="$t('userManage.userInfoObj.edu')"
        />
        <el-table-column
          align="center"
          prop="addr"
          width="200px"
          :label="$t('userManage.userInfoObj.addr')"
        />
        <el-table-column
          align="center"
          prop="email"
          width="200px"
          :label="$t('userManage.userInfoObj.email')"
        />
        <el-table-column
          align="center"
          prop="contact"
          width="200px"
          :label="$t('userManage.userInfoObj.contact')"
        />

@@ -179,43 +212,55 @@
          :label="$t('userManage.userInfoObj.status')"
        >
          <template slot-scope="scope">
            <el-tag v-if="scope.row.status == 0" type="success">正常</el-tag>
            <el-tag v-if="scope.row.status == 1" type="info">禁用</el-tag>
            <el-tag v-if="scope.row.status == 2" type="warning">删除</el-tag>
            <el-tag
              v-if="scope.row.status == 0"
              type="success"
            >正常</el-tag>
            <el-tag
              v-if="scope.row.status == 1"
              type="info"
            >禁用</el-tag>
            <el-tag
              v-if="scope.row.status == 2"
              type="warning"
            >删除</el-tag>
            <el-tag v-if="scope.row.status == 3">申请</el-tag>
            <el-tag v-if="scope.row.status == 4" type="danger">拒批</el-tag>
            <el-tag
              v-if="scope.row.status == 4"
              type="danger"
            >拒批</el-tag>
          </template>
        </el-table-column>
        <el-table-column
        <!-- <el-table-column
          align="center"
          prop="bak"
          width="200px"

          :label="$t('userManage.userInfoObj.bak')"
        />
        /> -->
        <el-table-column
          :label="$t('common.operate')"
          width="80px"
          fixed="right"
          v-if="menuStatus.update"
        >
          <template slot-scope="scope">
            <!-- <el-button type="primary" size="small">修改</el-button> -->
            <el-button
              type="warning"
              plain
              @click="editInfo(scope.row)"
              size="mini"
              >{{ $t('common.edit') }}</el-button
            >
              size="small"
            >{{ $t("common.update") }}</el-button>
          </template>
        </el-table-column>
      </el-table>
      <div style="margin-top: 25px" class="pagination_box">
      <div
        style="margin-top: 10px;"
        class="pagination_box"
      >
        <el-pagination
          @size-change="handleSizeChange"
          @current-change="handleCurrentChange"
          :current-page="currentPage"
          :page-sizes="[1, 2, 5, 10]"
          :page-sizes="[10, 20, 50, 100]"
          :page-size="pageSize"
          layout="total, sizes, prev, pager, next, jumper"
          :total="count"
@@ -223,9 +268,9 @@
        </el-pagination>
      </div>
    </div>

    <el-dialog
      width="910px"
      top="15vh"
      :title="
        behavior == '新增用户'
          ? `${$t('common.append')}`
@@ -233,12 +278,15 @@
      "
      :visible.sync="dialogFormVisible"
      :before-close="handleClose"
      :close-on-click-modal="false"
    >
     <div style="height: 500px; overflow: auto">
      <el-form
        :model="editForm"
        ref="editForm"
        :rules="rules"
        style="display: flex"

      >
        <div>
          <el-form-item
@@ -247,10 +295,16 @@
            v-if="behavior == '新增用户'"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.uid" autocomplete="off"></el-input>
            <div class="isNewUser" v-if="isNewUser">
            <el-input
              v-model="editForm.uid"
              autocomplete="off"
            ></el-input>
            <div
              class="isNewUser"
              v-if="isNewUser"
            >
              <img src="../../assets/img/success.png" />
              {{ $t('userManage.userInfoObj.uid') }}
              {{ $t("userManage.userInfoObj.uid") }}
            </div>
          </el-form-item>
          <el-form-item
@@ -308,7 +362,10 @@
            :label="$t('userManage.userInfoObj.username')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.uname" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.uname"
              autocomplete="off"
            ></el-input>
          </el-form-item>
          <el-form-item
            prop="sex"
@@ -316,6 +373,7 @@
            :label-width="formLabelWidth"
          >
            <el-select
              :popper-append-to-body="false"
              v-model="editForm.sex"
              clearable
              :placeholder="$t('userManage.userInfoObj.pleaseSelect')"
@@ -334,18 +392,43 @@
            :label="$t('userManage.userInfoObj.nativePlace')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.natives" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.natives"
              autocomplete="off"
            ></el-input>
          </el-form-item>
          <el-form-item
            prop="depid"
            :label-width="formLabelWidth"
            :label="$t('userManage.userInfoObj.depName')"
          >
            <el-cascader
            <el-select
              :popper-append-to-body="false"
              v-model="editForm.depid"
              placeholder="请选择"
              @focus="setOptionWidth"
            >
              <el-option
                :value="editForm.depid"
                :label="editForm.depName"
                :style="{ width: selectOptionWidth, height: selectheight }"
              >
                <el-tree
                  ref="editcaderHandle"
                  :data="treeOptions"
                  :default-expand-all="defaultexpand"
                  node-key="id"
                  :props="defaultProps"
                  @node-click="handeditChange"
                />
              </el-option>
            </el-select>
            <!-- <el-cascader
              v-model="editForm.depid"
              :options="treeOptions"
              filterable
              clearable
              ref="editcaderHandle"
              @change="editChange"
              :show-all-levels="false"
              :props="{
@@ -356,14 +439,17 @@
                emitPath: false,
              }"
            >
            </el-cascader>
            </el-cascader> -->
          </el-form-item>
          <el-form-item
            prop="idcard"
            :label="$t('userManage.userInfoObj.identityCard')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.idcard" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.idcard"
              autocomplete="off"
            ></el-input>
          </el-form-item>
        </div>
        <div style="width: 45%">
@@ -372,35 +458,50 @@
            :label="$t('userManage.userInfoObj.job')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.job" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.job"
              autocomplete="off"
            ></el-input>
          </el-form-item>
          <el-form-item
            prop="edu"
            :label="$t('userManage.userInfoObj.edu')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.edu" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.edu"
              autocomplete="off"
            ></el-input>
          </el-form-item>
          <el-form-item
            prop="addr"
            :label="$t('userManage.userInfoObj.addr')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.addr" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.addr"
              autocomplete="off"
            ></el-input>
          </el-form-item>
          <el-form-item
            prop="email"
            :label="$t('userManage.userInfoObj.email')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.email" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.email"
              autocomplete="off"
            ></el-input>
          </el-form-item>
          <el-form-item
            prop="contact"
            :label="$t('userManage.userInfoObj.contact')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.contact" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.contact"
              autocomplete="off"
            ></el-input>
          </el-form-item>
          <el-form-item
            prop="status"
@@ -408,6 +509,7 @@
            :label-width="formLabelWidth"
          >
            <el-select
              :popper-append-to-body="false"
              v-model="editForm.status"
              clearable
              :placeholder="$t('userManage.userInfoObj.pleaseSelect')"
@@ -426,43 +528,66 @@
            :label="$t('userManage.userInfoObj.remarks')"
            :label-width="formLabelWidth"
          >
            <el-input v-model="editForm.bak" autocomplete="off"></el-input>
            <el-input
              v-model="editForm.bak"
              autocomplete="off"
            ></el-input>
          </el-form-item>
        </div>
      </el-form>
      <div v-if="behavior == '修改信息'" slot="footer" class="dialog-footer">
        <el-button size="medium" type="info" @click="cancelEdit()">{{
          $t('common.reset')
       </div>
      <div
        v-if="behavior == '修改信息'"
        slot="footer"
        class="dialog-footer"
      >
        <el-button
          size="small"
          type="info"
          @click="cancelEdit()"
        >{{
          $t("common.reset")
        }}</el-button>
        <el-button
          size="medium"
          style="background: #409eff; border: 1px solid #409eff; color: white"
          size="small"
          type="primary"
          @click="sendEdit('editForm')"
          v-loading.fullscreen.lock="fullscreenLoading"
          >{{ $t('common.submit') }}</el-button
        >
        >{{ $t("common.submit") }}</el-button>
      </div>
      <div v-else slot="footer" class="dialog-footer">
        <el-button size="medium" type="info" @click="cancelAdd('editForm')">{{
          $t('common.reset')
      <div
        v-else
        slot="footer"
        class="dialog-footer"
      >
        <el-button
          size="small"
          type="info"
          @click="cancelAdd('editForm')"
        >{{
          $t("common.reset")
        }}</el-button>
        <el-button
          size="medium"
          style="background: #409eff; border: 1px solid #409eff; color: white"
          size="small"
          type="primary"
          @click="sendAdd('editForm')"
          v-loading.fullscreen.lock="fullscreenLoading"
          >{{ $t('common.submit') }}</el-button
        >
        >{{ $t("common.submit") }}</el-button>
      </div>
    </el-dialog>
    <el-dialog
      width="520px"
      top="30vh"
      :title="$t('common.changepassWord')"
      :visible.sync="resetPwd"
      :before-close="handleClose"
      :close-on-click-modal="false"
    >
      <el-form :model="pwdForm" ref="pwdForm" :rules="rules">

      <el-form
        :model="pwdForm"
        ref="pwdForm"
        :rules="rules"
        label-position="top"
      >
        <el-form-item
          prop="adminPwd"
          :label="$t('common.AdminPassword')"
@@ -473,6 +598,7 @@
            v-model="pwdForm.adminPwd"
            autocomplete="off"
            show-password
            style="width:85%"
          ></el-input>
        </el-form-item>
        <el-form-item
@@ -485,6 +611,7 @@
            v-model="pwdForm.newPwd"
            autocomplete="off"
            show-password
            style="width:85%"
          ></el-input>
        </el-form-item>
        <el-form-item
@@ -497,20 +624,28 @@
            v-model="pwdForm.checkPwd"
            autocomplete="off"
            show-password
            style="width:85%"
          ></el-input>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="medium" type="info" @click="cancelReset - 'pwdForm'">{{
          $t('common.reset')

      <div
        slot="footer"
        class="dialog-footer"
      >
        <el-button
          size="small"
          type="info"
          @click="cancelReset - 'pwdForm'"
        >{{
          $t("common.reset")
        }}</el-button>
        <el-button
          size="medium"
          style="background: #409eff; border: 1px solid #409eff; color: white"
          size="small"
          type="primary"
          @click="sendReset('pwdForm')"
          v-loading.fullscreen.lock="fullscreenLoading"
          >{{ $t('common.submit') }}</el-button
        >
        >{{ $t("common.submit") }}</el-button>
      </div>
    </el-dialog>
  </div>
@@ -518,8 +653,8 @@

<script>
var encrypt = new JSEncrypt();
import { mapActions } from 'vuex';
import MyBread from '../../components/MyBread.vue';
import { mapActions } from "vuex";
import MyBread from "../../components/MyBread.vue";
import {
  queryDepTree,
  queryPageUser,
@@ -529,7 +664,7 @@
  updatePwd,
  selectByUserid,
  userSelectForIsAdmin,
} from '../../api/api';
} from "../../api/api";
export default {
  //import引入的组件需要注入到对象中才能使用
  components: {
@@ -537,31 +672,38 @@
  },
  data() {
    let validName = (rule, value, callback) => {
      if (value === '' || value === null || value === undefined) {
        return callback(new Error('请输入密码'));
      if (value === "" || value === null || value === undefined) {
        return callback(new Error("请输入密码"));
      } else {
        callback();
      }
    };
    let validatePass = (rule, value, callback) => {
      if (value === '' || value === undefined) {
        callback(new Error('请再次输入密码'));
      if (value === "" || value === undefined) {
        callback(new Error("请再次输入密码"));
      } else if (value !== this.editForm.pwd) {
        callback(new Error('两次输入密码不一致!'));
        callback(new Error("两次输入密码不一致!"));
      } else {
        callback();
      }
    };
    let resetPass = (rule, value, callback) => {
      if (value === '' || value === undefined) {
        callback(new Error('请再次输入密码'));
      if (value === "" || value === undefined) {
        callback(new Error("请再次输入密码"));
      } else if (value !== this.pwdForm.newPwd) {
        callback(new Error('两次输入密码不一致!'));
        callback(new Error("两次输入密码不一致!"));
      } else {
        callback();
      }
    };
    return {
      props: {
        label: "name",
        value: "id",
        children: "children",
        checkStrictly: true,
        emitPath: false,
      },
      setbatchFlag: false,
      menuStatus: {
        delete: false,
@@ -573,102 +715,102 @@
      pageSize: 10,
      pageIndex: 1,
      defaultProps: {
        children: 'children',
        label: 'name',
        children: "children",
        label: "name",
      },
      queryForm: {
        uname: '',
        uname: "",
        depid: null,
        depName: '',
        depName: "",
      },
      tableData: [],
      fullscreenLoading: false,
      count: 0,
      formLabelWidth: '100px',
      formLabelWidth: "100px",
      dialogFormVisible: false,
      initialForm: '',
      behavior: '',
      initialForm: "",
      behavior: "",
      multipleSelection: [],
      resetPwd: false,
      editForm: {
        uid: '',
        uname: '',
        oldPwd: '',
        pwd: '',
        checkPass: '',
        uid: "",
        uname: "",
        oldPwd: "",
        pwd: "",
        checkPass: "",
        sex: null,
        natives: '',
        natives: "",
        depid: null,
        idcard: '',
        job: '',
        edu: '',
        addr: '',
        email: '',
        contact: '',
        idcard: "",
        job: "",
        edu: "",
        addr: "",
        email: "",
        contact: "",
        status: null,
        bak: '',
        salt: '',
        bak: "",
        salt: "",
      },
      pwdForm: {
        adminPwd: '',
        newPwd: '',
        checkPwd: '',
        adminPwd: "",
        newPwd: "",
        checkPwd: "",
        ids: [],
      },
      treeOptions: [],
      statusOpt: [
        {
          value: 0,
          label: '正常',
          label: "正常",
        },
        {
          value: 1,
          label: '禁用',
          label: "禁用",
        },
        {
          value: 2,
          label: '删除',
          label: "删除",
        },
        {
          value: 3,
          label: '申请',
          label: "申请",
        },
        {
          value: 4,
          label: '拒批',
          label: "拒批",
        },
      ],
      depList: [],
      sexOpt: [
        {
          value: 0,
          label: '女',
          label: "女",
        },
        {
          value: 1,
          label: '男',
          label: "男",
        },
        {
          value: -1,
          label: '未知',
          label: "未知",
        },
      ],
      rules: {
        uid: [
          { required: true, validator: validName, trigger: 'blur' },
          { required: true, validator: validName, trigger: "blur" },
          {
            trigger: 'blur',
            trigger: "blur",
            validator: (rule, value, callback) => {
              var reg = new RegExp(/^[a-zA-Z0-9_]{0,15}$/); //字符串正则表达式 4到14位（字母，数字，下划线，减号）
              if (!reg.test(value)) {
                callback(
                  new Error('账号必须由字母，数字或下划线,长度不得超过16位')
                  new Error("账号必须由字母，数字或下划线,长度不得超过16位")
                );
              } else {
                selectByUserid({ uid: value }).then((res) => {
                  if (res.result != null) {
                    this.isNewUser = false;
                    callback(new Error('账号已存在'));
                    callback(new Error("账号已存在"));
                  } else {
                    this.isNewUser = true;
                    callback();
@@ -681,16 +823,16 @@
        pwd: [
          {
            required: true,
            message: '请输入密码',
            message: "请输入密码",
            transform: (value) => value,
            trigger: 'blur',
            trigger: "blur",
          },
          {
            type: 'string',
            message: '请输入不包含空格的字符',
            trigger: 'blur',
            type: "string",
            message: "请输入不包含空格的字符",
            trigger: "blur",
            transform(value) {
              if (value && value.indexOf(' ') === -1) {
              if (value && value.indexOf(" ") === -1) {
                return value;
              } else {
                return false;
@@ -698,14 +840,14 @@
            },
          },
          {
            trigger: 'blur',
            trigger: "blur",
            validator: (rule, value, callback) => {
              var regex = new RegExp('');
              var regex = new RegExp("");
              var passwordreg =
                /^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W!@#$%^&*`~()\\-_+=,.?;<>]+$)(?![a-z0-9]+$)(?![a-z\W!@#$%^&*`~()\\-_+=,.?;<>]+$)(?![0-9\W!@#$%^&*`~()\\-_+=,.?;<>]+$)[a-zA-Z0-9\W!@#$%^&*`~()\\-_+=,.?;<>]{13,20}$/;
              if (!passwordreg.test(value)) {
                callback(
                  new Error('密码必须由数字、字母、特殊字符组合,请输入13-20位')
                  new Error("密码必须由数字、字母、特殊字符组合,请输入13-20位")
                );
              } else {
                callback();
@@ -714,21 +856,21 @@
          },
        ],
        checkPass: [
          { required: true, validator: validatePass, trigger: 'blur' },
          { required: true, validator: validatePass, trigger: "blur" },
        ],
        adminPwd: [{ validator: validName, trigger: 'blur' }],
        adminPwd: [{ validator: validName, trigger: "blur" }],
        newPwd: [
          {
            message: '请输入密码',
            message: "请输入密码",
            transform: (value) => value,
            trigger: 'blur',
            trigger: "blur",
          },
          {
            type: 'string',
            message: '请输入不包含空格的字符',
            trigger: 'blur',
            type: "string",
            message: "请输入不包含空格的字符",
            trigger: "blur",
            transform(value) {
              if (value && value.indexOf(' ') === -1) {
              if (value && value.indexOf(" ") === -1) {
                return value;
              } else {
                return false;
@@ -736,14 +878,14 @@
            },
          },
          {
            trigger: 'blur',
            trigger: "blur",
            validator: (rule, value, callback) => {
              var regex = new RegExp('');
              var regex = new RegExp("");
              var passwordreg =
                /^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W!@#$%^&*`~()\\-_+=,.?;<>]+$)(?![a-z0-9]+$)(?![a-z\W!@#$%^&*`~()\\-_+=,.?;<>]+$)(?![0-9\W!@#$%^&*`~()\\-_+=,.?;<>]+$)[a-zA-Z0-9\W!@#$%^&*`~()\\-_+=,.?;<>]{8,20}$/;
              if (!passwordreg.test(value)) {
                callback(
                  new Error('密码必须由数字、字母、特殊字符组合,请输入8-20位')
                  new Error("密码必须由数字、字母、特殊字符组合,请输入8-20位")
                );
              } else {
                callback();
@@ -751,18 +893,52 @@
            },
          },
        ],
        checkPwd: [{ validator: resetPass, trigger: 'blur' }],
        checkPwd: [{ validator: resetPass, trigger: "blur" }],
      },
      defaultProps: {
        children: "children",
        label: "name",
      },
      selectOptionWidth: "",
      selectheight: "auto",
      defaultexpand: false,
      tableHeight: 0,
      timer: 0,
      styleVar: {
        "height": "calc(100% - 109px)",
      },
    };
  },
  beforeDestroy() {
    this.timer && clearTimeout(this.timer);
    window.removeEventListener("resize", this.onResize);
  },
  methods: {
    ...mapActions(['login', 'getpublickey']),
    onResize() {
      this.timer && clearTimeout(this.timer);
      this.timer = setTimeout(() => {
        this.calHeight();
      }, 500);
    },
    calHeight() {
      this.$nextTick(() => {
        const rect = this.$refs.container.getBoundingClientRect();
        this.tableHeight = `${rect.height + 97}px`;
        this.styleVar["height"] = `calc(100% - ${rect.height + 30}px)`;
      });
    },
    ...mapActions(["login", "getpublickey"]),
    getUserInfo() {
      this.pageSize = 10;
      this.currentPage = 1;
      queryDepTree()
        .then((res) => {
          if (res.code == 200) {
            this.depList = this.treeData(res.result);
            this.treeOptions = this.treeData(res.result);
            this.queryForm.depName = this.depList[0].name;
            this.queryInfo.depid = this.depList[0].id;
            this.queryInfo();
          } else {
            this.$notify.error({
              title: res.code,
@@ -770,7 +946,7 @@
            });
          }
        })
        .catch((res) => {});
        .catch((res) => { });

      queryPageUser({
        pageIndex: 1,
@@ -787,26 +963,27 @@
            });
          }
        })
        .catch((res) => {});
        .catch((res) => { });
    },
    treeData(source) {
      let cloneData = JSON.parse(JSON.stringify(source)); // 对源数据深度克隆
      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; // 返回一级菜单
      });
    },
    //查询选择单位
    handleChange(value) {
      this.queryForm.depid = value;

    handleNodeClickto(data, node, nodeData) {
      this.queryForm.depid = data.code;
      this.queryForm.depName = data.name;
    },
    //搜索按钮
    queryInfo() {
      let searchData = {
        uname: this.queryForm.uname.trim(),
        depid: this.queryForm.depid,
        depcode: this.queryForm.depid,
        pageIndex: this.pageIndex,
        pageSize: this.pageSize,
      };
@@ -815,7 +992,6 @@
          this.tableData = res.result;
          this.count = res.count;
        } else {
          console.log('查询接口报错');
          this.$notify.error({
            title: res.code,
            message: res.result,
@@ -826,10 +1002,13 @@
    //重置按钮
    resetInfo(formName) {
      this.$refs[formName].resetFields();
      this.queryForm.depName = this.depList[0].name;
      this.queryInfo.depid = this.depList[0].id;
      this.queryInfo();
    },
    //新增按钮
    showAddDialog() {
      this.behavior = '新增用户';
      this.behavior = "新增用户";
      this.editForm = {};
      this.dialogFormVisible = true;
    },
@@ -855,8 +1034,8 @@
                if (res.code == 200) {
                  this.getUserInfo();
                  this.$message({
                    message: '添加成功',
                    type: 'success',
                    message: "添加成功",
                    type: "success",
                  });
                  this.editForm = {};
                  this.dialogFormVisible = false;
@@ -864,11 +1043,9 @@
              }, 500);
            })
            .catch((res) => {
              alert('修改失败，请重试！');
              this.fullscreenLoading = false;
            });
        } else {
          console.log('error submit!!');
          return false;
        }
      });
@@ -879,11 +1056,22 @@
    },
    //删除按钮
    deleteUserInfo() {
      this.$confirm('此操作将删除已选中的用户, 是否继续?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
      })
      var blackTheme;
      if (this.$store.state.themeflag == true) {
        blackTheme = {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning",
          customClass: "Black_theme",
        };
      } else {
        blackTheme = {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning",
        };
      }
      this.$confirm("此操作将删除已选中的用户, 是否继续?", "提示", blackTheme)
        .then(() => {
          var std = [];
          for (var i in this.multipleSelection) {
@@ -893,32 +1081,35 @@
            .then((res) => {
              if (res.code == 200) {
                this.$message({
                  type: 'success',
                  message: '删除成功!',
                  type: "success",
                  message: "删除成功!",
                });
                this.multipleSelection = [];
                this.getUserInfo();
              } else {
                this.$message.error('删除失败');
                this.$message.error("删除失败");
              }
            })
            .catch(() => {
              this.$message.error('删除失败');
              this.$message.error("删除失败");
              this.multipleSelection = [];
            });
        })
        .catch(() => {
          this.$message('已取消删除');
          this.$message("已取消删除");
        });
    },
    //重置密码
    editPwd() {


      var std = [];
      for (var i in this.multipleSelection) {
        std.push(this.multipleSelection[i].id);
      }

      if (std.length == 0) {
        alert('请先选择用户');
        alert("请先选择用户");
        return;
      }
      this.pwdForm.ids = std;
@@ -943,24 +1134,31 @@
              setTimeout(() => {
                this.fullscreenLoading = false;
                if (res.code == 200) {
                  this.getUserInfo();
                  this.$message({
                    message: '修改成功',
                    type: 'success',
                    message: "修改成功",
                    type: "success",
                  });
                  this.pwdForm = {
                    adminPwd: '',
                    newPwd: '',
                    checkPwd: '',
                    adminPwd: "",
                    newPwd: "",
                    checkPwd: "",
                    ids: [],
                  };
                  this.multipleSelection = [];
                  this.resetPwd = false;

                  this.getUserInfo();
                }
                else {
                  this.$message({
                    message: res.msg,
                    type: "error",
                  });
                }
              }, 500);
            })
            .catch((res) => {
              alert('修改失败，请重试！');
              alert("修改失败，请重试！");
              this.fullscreenLoading = false;
            });
        } else {
@@ -972,50 +1170,63 @@
    editInfo(row) {
      delete row.updateTime;
      delete row.updateUser;
      // row.pwd = '';
      this.initialForm = JSON.stringify(row);
      this.behavior = '修改信息';
      this.editForm = JSON.parse(JSON.stringify(row));

      this.initialForm = JSON.stringify(row);
      this.behavior = "修改信息";
      this.editForm = JSON.parse(JSON.stringify(row));
      this.dialogFormVisible = true;
    },
    //编辑选择单位
    editChange(value) {
      this.editForm.depid = value;
      this.$refs.editcaderHandle.dropDownVisible = false;
    },
    handeditChange(data, node, nodeData) {
      this.$set(this.editForm, "depid", data.id);
      this.$set(this.editForm, "depName", data.name);
      this.$set(this.editForm, "depcode", data.code);
      this.$refs.editcaderHandle.dropDownVisible = false;
    },
    //关闭弹出框
    handleClose(done) {
      this.$confirm('确认关闭？')
      var blackTheme;
      if (this.$store.state.themeflag == true) {
        blackTheme = {
          customClass: "Black_theme",
        };
      }

      this.$confirm("确认关闭？", blackTheme)
        .then((_) => {
          this.editForm = {
            uid: '',
            uname: '',
            oldPwd: '',
            pwd: '',
            checkPass: '',
            uid: "",
            uname: "",
            oldPwd: "",
            pwd: "",
            checkPass: "",
            sex: null,
            natives: '',
            natives: "",
            depid: null,
            idcard: '',
            job: '',
            edu: '',
            addr: '',
            email: '',
            contact: '',
            idcard: "",
            job: "",
            edu: "",
            addr: "",
            email: "",
            contact: "",
            status: null,
            bak: '',
            salt: '',
            bak: "",
            salt: "",
          };
          this.pwdForm = {
            adminPwd: '',
            newPwd: '',
            checkPwd: '',
            adminPwd: "",
            newPwd: "",
            checkPwd: "",
            ids: [],
          };

          done();
        })
        .catch((_) => {});
        .catch((_) => { });
    },
    //提交编辑
    sendEdit(formName) {
@@ -1039,8 +1250,8 @@
                if (res.code == 200) {
                  this.getUserInfo();
                  this.$message({
                    message: '修改成功',
                    type: 'success',
                    message: "修改成功",
                    type: "success",
                  });
                  this.editForm = {};
                  this.dialogFormVisible = false;
@@ -1048,11 +1259,11 @@
              }, 500);
            })
            .catch((res) => {
              alert('修改失败，请重试！');
              alert("修改失败，请重试！");
              this.fullscreenLoading = false;
            });
        } else {
          console.log('error submit!!');
          console.log("error submit!!");
          return false;
        }
      });
@@ -1076,13 +1287,13 @@
    },
    showPermsMenu(res) {
      switch (res.tag) {
        case '/delete':
        case "/delete":
          this.menuStatus.delete = true;
          break;
        case '/insert':
        case "/insert":
          this.menuStatus.insert = true;
          break;
        case '/update':
        case "/update":
          this.menuStatus.update = true;
          break;
      }
@@ -1095,12 +1306,20 @@
      }
      this.setbatchFlag = data.result;
    },
    setOptionWidth(event) {
      // 下拉框聚焦，设置弹框的宽度
      this.$nextTick(() => {
        this.selectOptionWidth = event.srcElement.offsetWidth + "px";
      });
    },
  },

  mounted() {
    this.getIsAdmin();
    this.getUserInfo();
    this.getpublickey();
    window.addEventListener("resize", this.onResize);
    this.calHeight()
  },
  created() {
    var val = this.$store.state.currentPerms;
@@ -1113,100 +1332,37 @@
  },
};
</script>
<style>
/deep/ .el-table__fixed-right {
  height: 100% !important;
}
</style>

<style lang="less" scoped>
//@import url(); 引入公共css类
.userInfo_box {
  border-radius: 10px;
  height: 100%;
  height: 98%;
  width: 98%;
  padding: 0.5%;

  box-sizing: border-box;
  .el-input {
    width: 300px;
  }
  .inquire {
    position: relative;
    height: 110px;
    overflow: auto;
    padding: 8px;
    margin-top: 20px;
    height: auto;

    //padding: 10px;
    //margin-top: 20px;

    border-radius: 5px;
    border: 1px solid rgb(202, 201, 204);
    margin-bottom: 20px;

    //margin-bottom: 20px;
    .el-form-item {
      margin: 5px;
    }
  }
  .table_box {
    height: 470px;
    padding: 10px;
    border-radius: 5px;
    border: 1px solid rgb(202, 201, 204);

    /*修改table 表体的背景颜色和文字颜色*/
    /deep/ .el-table {
      background-color: transparent;
  //  .table_height{
  //   //  max-height: 80%;

      th,
      td {
        background-color: transparent;
      }
      .el-table__expanded-cell {
        background-color: transparent !important;
      }

      // 表头背景色
      th.el-table__cell {
        background-color: #303030;
        color: #fff;
      }
      tr > td {
        background-color: #303030;
        color: #fff;
      }

      // hover效果
      tr:hover > td {
        background-color: rgba(255, 255, 255, 0.3) !important;
      }

      tbody tr:hover {
        background-color: rgba(255, 255, 255, 0.3) !important;
        // text-align: center;
      }

      // 滚动条宽高
      .el-table__body-wrapper::-webkit-scrollbar {
        width: 5px;
        height: 5px;
      }

      .el-table__body-wrapper::-webkit-scrollbar {
        width: 5px;
        /*滚动条宽度*/
        height: 5px;
        /*滚动条高度*/
      }
      /*定义滚动条轨道 内阴影+圆角*/
      .el-table__body-wrapper::-webkit-scrollbar-track {
        box-shadow: 0px 1px 3px #216fe6 inset;
        /*滚动条的背景区域的内阴影*/
        border-radius: 10px;
      }

      /*定义滑块 内阴影+圆角*/
      .el-table__body-wrapper::-webkit-scrollbar-thumb {
        box-shadow: 0px 1px 3px #216fe6 inset;
        border-radius: 6px;
        background-color: #216fe6;
      }
    }
  }
  //   min-height:70%;
  //  }
  .el-dialog {
    .el-form-item {
      margin-bottom: 20px;
@@ -1228,75 +1384,6 @@
      }
    }
  }
  /deep/.el-form-item__label {
    color: white;
  }
  /deep/.el-input__inner {
    background-color: transparent !important;
    border: 1px solid;
    color: white;
  }
  /deep/ .el-dialog {
    background: #303030;
  }
  /deep/.el-range-editor.is-active,
  .el-range-editor.is-active:hover,
  .el-select .el-input.is-focus .el-input__inner {
    border: 1px solid;
  }
  /deep/.el-dialog__title {
    color: white;
  }
  /deep/ .el-dialog__body {
    padding: 10px 0 0 0;
  }
  .pagination_box {
    margin-top: 20px;
    /deep/.el-input__inner {
      background-color: transparent !important;
      border: 1px solid;
      color: white;
    }
    /deep/.el-pagination__total {
      color: white;
    }
    /deep/.el-pagination__jump {
      color: white;
    }
    /deep/.el-pager li.active {
      color: #409eff;
    }
    /deep/.el-pager li {
      color: white;
      background: transparent;
    }
    /deep/.el-pager li {
      color: white;
    }
    /deep/.btn-prev {
      background: transparent;
    }
    /deep/.btn-next {
      background: transparent;
    }
  }
}
</style>
<style>
.el-select-dropdown {
  background: #303030;
  border-color: 1px solid;
}

.el-scrollbar__wrap {
  margin-bottom: -20px !important;
  margin-right: -20px !important;
}
.el-select-dropdown__item.hover,
.el-select-dropdown__item:hover {
  background: rgba(255, 255, 255, 0.3);
}
.el-select-dropdown__item {
  color: white !important;
}
</style>