内容提交

whychdw

2021-12-16 f047da3e1d8d4037a7b2da79748eb5f4e5447224

内容提交

 src/assets/js/config.js

@@ -3,7 +3,7 @@
        label: '平台logo',
        des: '显示平台logo状态',
        fileName: 'gjdw',       // gjdw, nfdw, gjdx, qwh
        value: true,
        value: false,
    },
    uKey: {
        label: 'uKey',
@@ -44,6 +44,6 @@
    bigScreen: {
        label: '大屏数据展示',
        des: '首页显示大屏展示',
        value: true,
        value: false,
    },
};

 src/assets/js/const/const_user.js

New file
@@ -0,0 +1,52 @@
export default {
  type: [
    {
      label: '长期',
      value: 1
    },
    {
      label: '临时',
      value: 2
    }
  ],
  status: [
    {
      label: '激活',
      value: 1
    },
    {
      label: '休眠',
      value: 2
    },
    {
      label: '锁定',
      value: 3
    },
    {
      label: '连续登录失败锁定',
      value: 4
    },
    {
      label: '注销',
      value: 0
    },
  ],
  roleList: [
    {
      label: "领导层",
      value: 10
    },
    {
      label: "管理员",
      value: 0,
    },
    {
      label: "维护组长",
      value: 1,
    },
    {
      label: "维护组员",
      value: 2,
    },
  ]
}

 src/components/PwdChange.vue

@@ -143,7 +143,7 @@
              this.$layer.msg("密码更新成功,请重新登录！");
              this.close();
            }else {
              this.$layer.msg("密码更新失败");
              this.$layer.msg(rs.msg);
            }
          }).catch(error=>{
            this.$layer.msg("网络请求异常，密码更新失败");

 src/pages/login.vue

@@ -39,7 +39,7 @@
          <el-form-item>
            <el-row :gutter="8">
              <el-col :span="14">
                <el-input class="input" placeholder="验证码" v-model="loginForm.verify"></el-input>
                <el-input class="input" placeholder="验证码" v-model="loginForm.verify" @keyup.enter.native.stop="onSubmit"></el-input>
              </el-col>
              <el-col :span="8">
                <v-sidentify :identifyCode="verifyCode" @click="changeVerifyCode"></v-sidentify>
@@ -187,6 +187,7 @@
import verifyComponent from "@/components/verifyComponent";
import randomString from "@/assets/js/tools/randomString";
import pwdChange from "@/components/PwdChange";
import const_user from "@/assets/js/const/const_user";

export default {
  components: {
@@ -233,6 +234,8 @@
      pwd: {
        show: false,
      },
      userType: const_user.type,
      userStatus: const_user.status
    };
  },
  created() {

 src/pages/userMager/addEdit.vue

@@ -114,6 +114,30 @@
              </el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="用户类型:" class="table-cell">
            <el-select
              v-model="formData.type"
              size="mini"
              placeholder="请选择用户类型"
              class="width_140">
              <el-option
                v-for="item in type"
                :key="item.value"
                :label="item.label"
                :value="item.value">
              </el-option>
            </el-select>
          </el-form-item>
          <div class="clear"></div>
          <el-form-item label="过期时间:" class="table-cell" v-if="formData.type==2">
            <el-date-picker
                v-model="expirationTime"
                type="datetime"
                size="mini"
                :start-placeholder="startTime"
                placeholder="选择日期时间">
            </el-date-picker>
          </el-form-item>
        </div>
        <!-- <div class="clear" v-if="status == 'edit'"></div> -->
        <!-- <el-form-item label="身份证号:" class="table-cell">
@@ -202,6 +226,7 @@
</template>
<script>
import { searchProvince } from "../../assets/js/api";
import const_user from "@/assets/js/const/const_user";
export default {
  // name:'addEdit',
  props: ["status", "opt", "index", "seft"],
@@ -210,24 +235,10 @@
      dialog: false,
      UDepartmentList: [],
      UJobGroupList: [],
      URoleList: [
        {
          label: "领导层",
          value: 10
        },
        {
          label: "管理员",
          value: 0,
        },
        {
          label: "维护组长",
          value: 1,
        },
        {
          label: "维护组员",
          value: 2,
        },
      ],
      URoleList: const_user.roleList,
      type: const_user.type,
      expirationTime: new Date(),
      startTime: new Date().format("yyyy-MM-dd hh:mm:ss"),
      formData: {
        UId: this.opt.UId || 0,
        Upassword: this.opt.Upassword || "",
@@ -253,6 +264,9 @@
        UMobilephone: this.opt.UMobilephone || "",
        UEmployeeId: this.opt.UEmployeeId || "",
        uRole: 0,
        type: 1,
        status: 1,
        expirationTime: null,
      },
      rules: {
        UName: [
@@ -398,6 +412,11 @@
    addUser(data) {
      let vm = this;
      data.USnId = data.Upassword;
      if(data.type == 1) {
        data.expirationTime = null;
      }else {
        data.expirationTime = new Date(this.expirationTime).format("yyyy-MM-dd hh:mm:ss");
      }
      vm.$apis.userMager.userInfo
        .add(data)
        .then((res) => {

 src/pages/userMager/userInfo.vue

@@ -17,6 +17,7 @@
                <el-table-column prop="USex" align="center" label="性别" :min-width="80"></el-table-column>
                <!-- <el-table-column prop="UProTitle" width="90px" align="center"  label="职称"></el-table-column>
                    <el-table-column prop="UAuthority" width="100px" align="center"  label="权限描述"></el-table-column> -->

                <el-table-column prop="UJobGroup" align="center" label="工作班组" :min-width="120"></el-table-column>
                <!-- <el-table-column prop="UDuties" width="90px" align="center"  label="工作职责"></el-table-column>
                    <el-table-column prop="UTasks" width="90px" align="center"  label="工作内容"></el-table-column> -->
@@ -26,6 +27,19 @@
                    </template>
                </el-table-column>
                <el-table-column prop="URoleText" :min-width="120" align="center" label="用户角色"></el-table-column>
                <el-table-column prop="typeText" :min-width="120" align="center" label="用户类型">
                  <template slot-scope="scope">
                    <el-tag type="success" size="mini" v-if="scope.row.type == 1">{{ scope.row.typeText }}</el-tag>
                    <el-tag type="danger" size="mini" v-if="scope.row.type == 2">{{ scope.row.typeText }}</el-tag>
                  </template>
                </el-table-column>
                <el-table-column prop="expirationTime" :min-width="180" align="center" label="过期日期"></el-table-column>
                <el-table-column prop="statusText" :min-width="120" align="center" label="用户状态">
                  <template slot-scope="scope">
                    <el-tag type="success" size="mini" v-if="scope.row.status == 1">{{ scope.row.statusText }}</el-tag>
                    <el-tag type="danger" size="mini" v-else>{{ scope.row.statusText }}</el-tag>
                  </template>
                </el-table-column>
                <!-- <el-table-column prop="UNote" width="90px" align="center"  label="备注"></el-table-column> -->
                <el-table-column prop="UId" align="center" label="权限组"></el-table-column>
                <el-table-column prop="cztime" fixed="right" width="180px" align="center" label="操作">
@@ -35,7 +49,6 @@
                        <el-button :disabled="!isCanEdit" type="danger" size="mini"
                            @click="deleteUser(scope.$index, scope.row)">删除</el-button>
                    </template>

                </el-table-column>
            </el-table>
        </div>
@@ -77,14 +90,19 @@
        export_json_to_excel
    } from '../../assets/js/excel/Export2Excel.js'
    import {
        isHasPermit
      getLabelByValue,
      isHasPermit
    } from "@/assets/js/tools";
    import const_user from "@/assets/js/const/const_user";
    export default {
        data() {
            let permits = this.$store.state.user.permits;
            let isCanEdit = isHasPermit('usr_edit_permit', permits);
            return {
                isCanEdit: isCanEdit,
                userType: const_user.type,
                userStatus: const_user.status,
                userRoles: const_user.roleList,
                currentPage: 1,
                pagesize: 10,
                totalNum: 0,
@@ -204,6 +222,7 @@
                let searchParams = "bup.page.pageCurr=" + vm.currentPage + "&bup.page.pageSize=" + vm.pagesize

                vm.$apis.userMager.userInfo.search(searchParams).then(res => {
                    console.log(res);
                    // 关闭等待框
                    this.$layer.close(loading);
                    let rs = JSON.parse(res.data.result);
@@ -218,26 +237,17 @@
                            vm.totalNum = 0;
                        }
                    }
                    this.userList = data;
                    this.userList.map(item => {
                        switch (item.uRole) {
                            case 0:
                                item.URoleText = '管理员'
                                break;
                            case 1:
                                item.URoleText = '维护组长'
                                break;
                            case 2:
                                item.URoleText = '维护组员'
                                break;
                            case 10:
                              item.URoleText = '领导层';
                              break;
                        }
                    })
                    console.log(this.userList)
                }).catch(error => {

                    this.userList = data.map(item => {
                      item.URoleText = getLabelByValue(item.uRole, this.userRoles);
                      item.typeText = getLabelByValue(item.type, this.userType);
                      item.statusText = getLabelByValue(item.status, this.userStatus);
                      return item;
                    });
                    console.log(data);
                    console.log(this.userList);
                }).catch(error => {
                    console.log(error);
                });
            },
            // 弹窗取消