Merge remote-tracking branch 'origin/master'

tangzy

2021-11-16 3da442cd47a206d0edffb4606d07c305f9d54cd9

Merge remote-tracking branch 'origin/master'

 src/store/modules/user.js

@@ -266,7 +266,7 @@
    },
    SET_USER_INFO: (state, userInfo) => {
      if (validatenull(userInfo.avatar)) {
        userInfo.avatar = "/img/bg/img-logo.png";
        userInfo.avatar = "http://223.82.109.183:2081/zhba/upload/picture/mrtx.png";
      }
      state.userInfo = userInfo;
      setStore({ name: 'userInfo', content: state.userInfo })

 src/views/accreditationRecords/accreditationRecords.vue

@@ -38,7 +38,7 @@
          size="small"
          plain
          icon="el-icon-download"
          v-if="permission.accreditationRecords_export"
          v-if="permission.accreditationRecords_export || check"
          @click="handleExport"
          >保安员证信息导出
        </el-button>
@@ -91,6 +91,7 @@
export default {
  data() {
    return {
      check:false,
      form: {},
      query: {},
      questionBankSearch: {},
@@ -317,6 +318,18 @@
  mounted() {
    this.getDeptInfo(this.userInfo.dept_id);
  },
  created(){
      if (this.userInfo.role_name == "公安管理员") {
      //判断是否为市局管理员
      if(this.userInfo.jurisdiction=="1372091709474910209"){
          this.check = true;
          // this.vaildData(this.permission.accreditationRecords_paper_delete, false);
      }else{
        this.check = false;
        // this.vaildData(null, false);
      }
    }
  },
  methods: {
    //获取当前用户部门信息
    getDeptInfo(deptId) {

 src/views/accreditationRecords/accreditationRecordsPaper.vue

@@ -24,11 +24,11 @@
    >
      <template slot="menuLeft">
        <el-button
          style="display: none"
          style="display:none"
          type="danger"
          size="small"
          icon="el-icon-delete"
          v-if="permission.notice_delete"
          v-if="permission.accreditationRecords_paper_delete || check"
          plain
          @click="handleDelete"
          >删 除
@@ -38,7 +38,7 @@
          size="small"
          plain
          icon="el-icon-download"
          v-if="permission.accreditationRecords_paper_export"
          v-if="permission.accreditationRecords_paper_export || check"
          @click="handleExport"
          >制证信息导出
        </el-button>
@@ -46,7 +46,7 @@
              type="primary"
              size="small"
              plain
              v-if="permission.accreditationRecords_batch_audit"
              v-if="permission.accreditationRecords_batch_audit  || check"
              icon="el-icon-collection-tag"
              @click="handleSecurityAudit"
              >批量审批
@@ -79,7 +79,7 @@
        <el-button
          :type="type"
          :size="size"
          v-if="permission.accreditationRecords_audit"
          v-if="permission.accreditationRecords_audit || check"
          icon="el-icon-folder-checked"
          @click="handleAudit(row)"
          >审核
@@ -197,6 +197,7 @@
export default {
  data() {
    return {
      check:false,
      certificateYear: null,
      certificateMonth: null,
      certificateFlag: false,
@@ -576,10 +577,7 @@
    permissionList() {
      return {
        addBtn: this.vaildData(null, false),
        viewBtn: this.vaildData(
          this.permission.accreditationRecords_paper_view,
          false
        ),
        viewBtn: this.vaildData(this.permission.accreditationRecords_paper_view, false),
        delBtn: this.vaildData(null, false),
        editBtn: this.vaildData(null, false),
      };
@@ -606,6 +604,16 @@
      this.questionBankSearch["userType"] = 7;
      this.questionBankSearch["auditStatus"] = 2;
    }
    if (this.userInfo.role_name == "公安管理员") {
      //判断是否为市局管理员
      if(this.userInfo.jurisdiction=="1372091709474910209"){
          this.check = true;
          // this.vaildData(this.permission.accreditationRecords_paper_delete, false);
      }else{
        this.check = false;
        // this.vaildData(null, false);
      }
    }
  },
  methods: {
    //获取当前用户部门信息

 src/views/securityGuard/securityGuard.vue

@@ -2296,7 +2296,7 @@
// 抬头名字
.security_m_l_titleName {
  position: absolute;
  top: 45px;
  top: 35px;
  left: 121px;
  right: 0;
  line-height: 45px;
@@ -2304,7 +2304,7 @@
}

//发证时间
$timeTop: 312px; //整体高度
$timeTop: 310px; //整体高度
//年
.security_m_l_titlepaperTimenian {
  position: absolute;
@@ -2332,7 +2332,7 @@
//证件编号
.security_m_l_downsecuritynumber {
  position: absolute;
  top: 386px; //整体高度
  top: 384px; //整体高度
  left: 145px;
}

@@ -2341,7 +2341,7 @@
$centerLeft: 458px;
.security_m_r_o_right {
  position: absolute;
  top: $downTop + $lineHigeht * 0-2px;
  top: $downTop + $lineHigeht * 0-12px;
  left: $centerLeft;
  // width: $rightWidth;
}
@@ -2349,7 +2349,7 @@
// 生日
.security_m_r_o_rightbirthday {
  position: absolute;
  top: $downTop + $lineHigeht * 1-4px;
  top: $downTop + $lineHigeht * 1-14px;
  left: $centerLeft;
  // width: $rightWidth;
}
@@ -2357,7 +2357,7 @@
// 地址
.security_m_r_o_rightaddress {
  position: absolute;
  top: $downTop + $lineHigeht * 2 -6px;
  top: $downTop + $lineHigeht * 2 -16px;
  left: $centerLeft;
  width: 185px;
}
@@ -2365,7 +2365,7 @@
// 身份证
.security_m_r_o_rightcardid {
  position: absolute;
  top: $downTop + $lineHigeht * 4 +10px;
  top: $downTop + $lineHigeht * 4 +0px;
  left: $centerLeft;
  // width: $rightWidth;
}

 src/views/trainExam/modifiedGrades.vue

@@ -52,7 +52,7 @@
                            <el-button :type="type"
                                       :size="size"
                                       icon="el-icon-folder-checked"
                                       v-if="permission.score_audit_check"
                                       v-if="permission.score_audit_check || check"
                                       @click="handleAudit(row)">审核
                            </el-button>
                        </template>
@@ -152,6 +152,7 @@
                editBtn: true,
                addBtn: false,
                selection: false,
                check:false,
                // 导出按钮
                // excelBtn: true,
                // excelBtnText: "成绩导出",
@@ -468,7 +469,16 @@

        };
    },
    created () { },
    created(){
      if (this.userInfo.role_name == "公安管理员") {
        //判断是否为市局管理员
        if(this.userInfo.jurisdiction=="1372091709474910209"){
            this.check = true;
        }else{
            this.check = false;
        }
      }
    },
    mounted () { },
    computed: {
        ...mapGetters(["userInfo", "permission"]),
@@ -553,8 +563,11 @@
                        //如果是培训公司管理员
                        params["trainUnitId"] = that.userInfo.dept_id;
                    }
                    if (this.userInfo.role_name == "公安管理员") {
                        //如果是公安管理员
                        params["jurisdiction"] = this.userInfo.jurisdiction;
                    }
                    that.questionBankLoading = false;
                    params["examType"] = 2;
                    getList(
                        page.currentPage,
                        page.pageSize,