Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

Administrator

2021-08-20 9f0421ca359101cfc56786b80cc5111932796da3

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

 public/favicon.png

 src/views/exam/performance.vue

@@ -64,7 +64,6 @@
                @click="handleImport"
                >实操成绩导入
              </el-button>
              
            </template>

            <template slot-scope="{ row }" slot="menu">
@@ -79,8 +78,6 @@
                >保安证打印
              </el-button>
            </template>


          </avue-crud>

          <el-dialog
@@ -380,11 +377,13 @@
              editDisplay: true,
              // 表单编辑时是否为查看模式
              editDetail: false,
              rules: [{
            rules: [
              {
                  required: true,
                  message: "请输入考试名称",
                  trigger: "blur"
              }]
                trigger: "blur",
              },
            ],
          },
          {
            label: "是否合格",
@@ -556,7 +555,7 @@
    },

    questionBankRowUpdate(row, index, done, loading) {
      debugger;
      // debugger;
      update({
        theoryGrade: row.theoryGrade,
        learnGrade: row.learnGrade,

 src/views/securityAnalysis/index.vue

@@ -74,11 +74,11 @@
        var d = [
          {
            value: a.bzc,
            name: "未审核",
            name: "审查情况正常",
          },
          {
            value: a.zc,
            name: "已审核",
            name: "审查情况异常",
          },
        ];

@@ -87,17 +87,17 @@
    },
    setEC1(d) {
      var option, data;
      if (d) {
      // if (d) {
        data = d;
      } else {
        data = [
          { value: 1048, name: "搜索引擎" },
          { value: 735, name: "直接访问" },
          { value: 580, name: "邮件营销" },
          { value: 484, name: "联盟广告" },
          { value: 300, name: "视频广告" },
        ];
      }
      // } else {
      //   data = [
      //     { value: 1048, name: "搜索引擎" },
      //     { value: 735, name: "直接访问" },
      //     { value: 580, name: "邮件营销" },
      //     { value: 484, name: "联盟广告" },
      //     { value: 300, name: "视频广告" },
      //   ];
      // }
      // console.log(data);
      option = {
        title: {
@@ -109,23 +109,25 @@
          trigger: "item",
        },
        legend: {
          orient: "vertical",
          left: "left",
          // orient: "vertical",
          // left: "left",
          x: "center",
          y: "90%",
        },
        series: [
          {
            // name: "访问来源",
            type: "pie",
            radius: "50%",
            // data: data,
            data: [
              { value: 1, name: "在逃人员" },
              { value: 3, name: "吸毒人员" },
              { value: 10, name: "刑释解教人员" },
              { value: 5, name: "社会闲散青少年" },
              { value: 11, name: "艾滋病人" },
              { value: 26, name: "其他人员" },
            ],
            data: data,
            // data: [
            //   { value: 1, name: "在逃人员" },
            //   { value: 3, name: "吸毒人员" },
            //   { value: 10, name: "刑释解教人员" },
            //   { value: 5, name: "社会闲散青少年" },
            //   { value: 11, name: "艾滋病人" },
            //   { value: 26, name: "其他人员" },
            // ],
            emphasis: {
              itemStyle: {
                shadowBlur: 10,
@@ -143,7 +145,7 @@
      var that = this;
      getinformationselectHold(this.deptid).then((res) => {
        var a = res.data.data[0];
        console.log(res);
        console.log(res, "持证情况");
        var d = [
          {
            value: a.wcz,
@@ -183,8 +185,10 @@
          trigger: "item",
        },
        legend: {
          orient: "vertical",
          left: "left",
          // orient: "vertical",
          // left: "left", x: "center",
          x: "center",
          y: "90%",
        },
        series: [
          {
@@ -255,11 +259,11 @@
        legend: {
          data: ["实操成绩", "理论成绩"],
        },
        toolbox: {
          feature: {
            saveAsImage: {},
          },
        },
        // toolbox: {
        //   feature: {
        //     saveAsImage: {},
        //   },
        // },
        grid: {
          left: "3%",
          right: "5%",
@@ -515,7 +519,7 @@
</script>

<style lang="scss">
$widths: 30%;
$widths: 20%;
.securityAnalysis {
  width: 100%;
  height: 100%;
@@ -528,7 +532,7 @@
  .securityAnalysiscenter,
  .securityAnalysisright {
    // border: 1px solid #000;
    width: 30%;
    width: 29%;
    height: 100%;
    box-sizing: border-box;
    display: flex;

 src/views/securityEquipment/car.vue

@@ -18,20 +18,20 @@
      >
        <template slot="menuLeft">
          <el-button
            type="success"
            size="small"
            plain
            icon="el-icon-upload2"
            @click="handleImport"
            >批量导入
          </el-button>
          <el-button
            type="danger"
            size="small"
            plain
            icon="el-icon-delete"
            @click="handleDelete"
            >删 除
          </el-button>
          <el-button
            type="success"
            size="small"
            plain
            icon="el-icon-upload2"
            @click="handleImport"
            >批量导入
          </el-button>
        </template>
      </avue-crud>
@@ -106,6 +106,7 @@
        tip: false,
        index: true,
        searchSize: "mini",
        border: true,
        searchMenuSpan: 6,
        height: 583,
        menuWidth: 160,

 src/views/securityEquipment/equipments.vue

@@ -18,20 +18,20 @@
      >
        <template slot="menuLeft">
          <el-button
            type="success"
            size="small"
            plain
            icon="el-icon-upload2"
            @click="handleImport"
            >批量导入
          </el-button>
          <el-button
            type="danger"
            size="small"
            plain
            icon="el-icon-delete"
            @click="handleDelete"
            >删 除
          </el-button>
          <el-button
            type="success"
            size="small"
            plain
            icon="el-icon-upload2"
            @click="handleImport"
            >批量导入
          </el-button>
        </template>
      </avue-crud>
@@ -109,6 +109,7 @@
        height: 583,
        index: true,
        menuWidth: 160,
        border: true,
        align: "center",
        selection: true,
        column: column,

 src/views/securityEquipment/gun.vue

@@ -56,6 +56,7 @@
        index: true,
        menuWidth: 160,
        align: "center",
        border: true,
        selection: true,
        column: column,
      },

 src/views/securityGuard/data.js

@@ -448,13 +448,32 @@
        label: "姓名",
        prop: "realName",
        search: true,
        searchSpan: 4,
    searchSpan: 3,
    width: 60,
        searchLabelWidth: 50,
        display: false
    },
    {
    label: "所属保安公司",
    searchLabelWidth: "110",
    // prop: "deptName",
    prop: "deptId",
    type: "tree",
    dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
    props: {
        label: "title",
        value: "id",
    },
    slot: true,
    searchSpan: 5,
    display: false,
    search: true,
    width: 260
},
{
        label: "性别",
        prop: "sex",
    width: 55,
        type: "select",
        dicData: [{
                label: "男",
@@ -471,17 +490,31 @@
        ],
        display: false
    },
{
    label: "身份证号码",
    prop: "cardid",
    search: true,
    searchLabelWidth: 90,
    searchSpan: 4,
    width: 140,

    display: false
},

    {
        label: "籍贯",
        prop: "nativeplace",
    hide: true,
        display: false
    },
    {
        label: "民族",
        prop: "nation",
    hide: true,
    width: 55,
        display: false
    },

    {
        label: "出生日期",
        prop: "birthday",
@@ -491,16 +524,23 @@
        display: false
    },
    {
    label: "年龄",
    prop: "age",
    width: 55,
    display: false
},
{
        label: "学历",
        prop: "education",
        display: false,
    width: 90,
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        type: "select",
        hide: true,
    // hide: true,
        rules: [{
            required: true,
            message: "请选择学历",
@@ -510,40 +550,39 @@
    {
        label: "联系电话",
        prop: "phone",
    width: 100,
        display: false
    },
    {
        label: "邮箱",
        prop: "email",
        display: false,
        width: 150
    label: "健康状态",
    prop: "healstats",
    display: false
},
{
    label: "保安证编号",
    prop: "securitynumber",
    search: true,
    searchLabelWidth: 90,
    width: 105,
    searchSpan: 4,
    addDisplay: false,
    editDisplay: false,
    // hide: true,
    },
    {
        label: "入职时间",
        prop: "rtime",
    hide: true,
        display: false
    },
    {
        label: "保安公司名称",
        searchLabelWidth: "110",
        // prop: "deptName",
        prop: "deptId",
        type: "tree",
        // dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
        props: {
            label: "title",
            value: "id",
        },
        slot: true,
        searchSpan: 6,
        display: false,
        search: true,
        width: 260
    },

    {
        label: "是否持证",
        prop: "hold",
        slot: true,
    search: true,
    searchSpan: 3,
    width: 69,
        display: false,
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
        props: {
@@ -557,6 +596,7 @@
            trigger: "blur"
        }],
    },

    // {
    //     label: "入职时间",
    //     prop: "rtime",
@@ -587,7 +627,9 @@
        },
        dataType: "number",
        display: false,
        searchSpan: 4,
    hide: true,
    searchSpan: 3,
    width: 80,
        search: true,
        rules: [{
            required: true,

 src/views/securityGuard/securityGuard.vue

@@ -378,9 +378,12 @@
        calcHeight: 80,
        tip: false,
        searchShow: true,

        indexWidth: 55,
        searchMenuSpan: 6,
        border: false,
        stripe: true,
        border: true,

        align: "center",
        index: true,
        delBtnText: "注销",
@@ -625,6 +628,10 @@
              {
                label: "政治面貌",
                prop: "politicaloutlook",
              },
              {
                label: "健康状态",
                prop: "healstats",
              },
              {
                label: "身高",
@@ -927,12 +934,8 @@
      userInfo: (state) => state.user.userInfo,
    }),
  },
  beforeCreate() {
    
  },
  created() {
 
  },
  beforeCreate() {},
  created() {},
  mounted() {
    // this.option.column[0].hide = true
    // 非保安单位模式默认加载管理组数据
@@ -1296,7 +1299,8 @@
            const column = that.findObject(that.option.column, "deptId");
            column.search = false;
            const deptColumn = that.findObject(that.option.group, "deptId");
            deptColumn.dicUrl = "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
            deptColumn.dicUrl =
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
            //禁止编辑
            deptColumn.disabled = true;
            deptColumn.value = that.userInfo.dept_id;
@@ -1307,15 +1311,22 @@
            params["jurisdiction"] = that.userInfo.jurisdiction;
            var columnDept = that.findObject(that.option.column, "deptId");
            columnDept.dicUrl = 
                "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction="+that.userInfo.jurisdiction
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
              that.userInfo.jurisdiction;
            var ColumnDeptUpdate = that.findObject(that.option.group, "deptId");
            ColumnDeptUpdate.dicUrl = 
                "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction="+that.userInfo.jurisdiction
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
              that.userInfo.jurisdiction;
          }else{
            var columnDept1 = that.findObject(that.option.column, "deptId");
            columnDept1.dicUrl = "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
            var ColumnDeptUpdate1 = that.findObject(that.option.group, "deptId");
            ColumnDeptUpdate1.dicUrl = "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
            columnDept1.dicUrl =
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
            var ColumnDeptUpdate1 = that.findObject(
              that.option.group,
              "deptId"
            );
            ColumnDeptUpdate1.dicUrl =
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
          }
 
          let values = {
@@ -1331,15 +1342,20 @@
          getList(page.currentPage, page.pageSize, values).then((res) => {
            const data = res.data.data;
            that.page.total = data.total;
            var d = data.records;
            var date = new Date();
            var datayear = date.getFullYear();
            for (const key in d) {
              var year = d[key].cardid.slice(6, 10);
              d[key]["age"] = +datayear - +year;
              // d[key].securitynumber = "赣洪202100009";
            }
            that.data = data.records;
            that.loading = false;
            that.selectionClear();
          });
        });
      });
      
 
      
    },
    platformRowUpdate(row, index, done, loading) {
      updatePlatform(row.id, row.userType, row.userExt).then(

 src/views/securityGuard/securityGuardRegistration.vue

@@ -480,7 +480,7 @@
            });
          });
          this.loading = false;
          debugger;
          //debugger;
          done();
        },
        (error) => {

 src/views/securityUnit/data.js

@@ -87,16 +87,16 @@
        label: "法定代表人",
        labelWidth: 160,
        prop: "representative",
        width: 80,
        width: 110,
        search: true,
        searchSpan: 4,
        searchLabelWidth: 100
    },
    {
        label: "法人电话",
        label: "法定代表人电话",
        labelWidth: 160,
        prop: "representativecell",
        width: 98,
        width: 120,
        // search: true,
        searchSpan: 4,
        searchLabelWidth: 100

 src/views/securityUnit/index.vue

@@ -36,16 +36,6 @@
            >新增</el-button
          >
          <el-button
            type="success"
            size="small"
            plain
            icon="el-icon-upload2"
            @click="handleImport1"
            >批量导入
          </el-button>
        </template>
        <template slot="menuLeft">
          <el-button
            type="danger"
            size="small"
            plain
@@ -53,6 +43,14 @@
            @click="handleDelete"
            >删 除
          </el-button>
          <el-button
            type="success"
            size="small"
            plain
            icon="el-icon-upload2"
            @click="handleImport1"
            >批量导入
          </el-button>
        </template>
      </avue-crud>
      <div class="lod" v-show="forms != -1">

 src/views/securityUnit/localCompany.vue

@@ -284,6 +284,7 @@
        searchMenuSpan: 6,
        height: 583,
        menuWidth: 220,
        border: true,
        align: "center",
        selection: true,
        column: column,

 src/views/securityUnit/securityTraining.vue

@@ -281,6 +281,8 @@
        // card: true,
        tip: false,
        searchSize: "mini",
        border: true,

        searchMenuSpan: 6,
        height: 583,
        menuWidth: 220,

 src/views/securityUnit/selfRecruitedSecurityGuard.vue

@@ -285,6 +285,8 @@
        height: 583,
        menuWidth: 220,
        align: "center",
        border: true,

        selection: true,
        column: column,
      },

 src/views/securityUnit/transRegionalcompany.vue

@@ -286,6 +286,8 @@
        height: 583,
        menuWidth: 220,
        align: "center",
        border: true,

        selection: true,
        column: column,
      },

 src/views/securityUnitChild/index.vue

@@ -56,20 +56,20 @@
        >
          <template slot="menuLeft">
            <el-button
              type="success"
              size="small"
              plain
              icon="el-icon-upload2"
              @click="handleImport"
              >批量导入
            </el-button>
            <el-button
              type="danger"
              size="small"
              plain
              icon="el-icon-delete"
              @click="handleDelete1"
              >删 除
            </el-button>
            <el-button
              type="success"
              size="small"
              plain
              icon="el-icon-upload2"
              @click="handleImport"
              >批量导入
            </el-button>
          </template>
        </avue-crud>
@@ -93,14 +93,6 @@
        >
          <template slot="menuLeft">
            <el-button
              type="success"
              size="small"
              plain
              icon="el-icon-upload2"
              @click="handleImport1"
              >批量导入
            </el-button>
            <el-button
              type="danger"
              size="small"
              plain
@@ -108,6 +100,14 @@
              @click="handleDelete2"
              >删 除
            </el-button>
            <el-button
              type="success"
              size="small"
              plain
              icon="el-icon-upload2"
              @click="handleImport1"
              >批量导入
            </el-button>
          </template>
        </avue-crud>
      </basic-container>

 src/views/talk/talk.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,14 +18,27 @@
               @current-change="currentChange"
               @size-change="sizeChange"
               @refresh-change="refreshChange"
               @on-load="onLoad">
      @on-load="onLoad"
    >
      <template slot-scope="{ disabled, size }" slot="realNameSearch">
        <el-input
          placeholder="姓名"
          :disabled="disabled"
          :size="size"
          style="width: 200px"
          v-on:input="inputs(findName)"
          v-model="findName"
        ></el-input>
      </template>
      <template slot="menuLeft">
        <el-button type="danger"
        <el-button
          type="danger"
                   size="small"
                   icon="el-icon-delete"
                   plain
                   v-if="permission.talk_delete"
                   @click="handleDelete">删 除
          @click="handleDelete"
          >删 除
        </el-button>
      </template>
    </avue-crud>
@@ -37,23 +51,27 @@

  export default {
    data() {
    var id = this.$store.getters.userInfo.dept_id;
    console.log(id);
      return {
      findName: "",
        form: {},
        query: {},
        loading: true,
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        total: 0,
        },
        selectionList: [],
        option: {
          height:'auto',
        height: "auto",
          calcHeight: 30,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          border: true,
        searchShowBtn: false,
          index: true,
          viewBtn: true,
          selection: true,
@@ -63,36 +81,44 @@
              label: "标题",
              prop: "title",
              search: true,
              rules: [{
            searchLabelWidth: 45,
            rules: [
              {
                required: true,
                message: "请输入标题",
                trigger: "blur"
              }]
                trigger: "blur",
              },
            ],
            },
            {
              label: "谈话对象",
              search: true,
              prop: "realName",
              type: "tree",
              props: {
                label: "realName",
                value: "id",
              },
              dicUrl: `/api/blade-user/selectInr?deptid=`+this.$store.getters.userInfo.dept_id,
              rules: [{
                required: true,
                message: "请输入谈话对象",
                trigger: "blur"
              }]
            search: true,
            // type: "tree",
            searchslot: true,
            // dicUrl: `/api/blade-user/selectInr?deptid=` + id,
            // props: {
            //   label: "realName",
            //   value: "id",
            // },
            // rules: [
            //   {
            //     required: true,
            //     message: "请输入谈话对象",
            //     trigger: "blur",
            //   },
            // ],
            },
            {
              label: "谈话内容",
              prop: "talkcontent",
              rules: [{
            rules: [
              {
                required: true,
                message: "请输入谈话内容",
                trigger: "blur"
              }]
                trigger: "blur",
              },
            ],
            },
            {
              label: "谈话时间",
@@ -100,33 +126,39 @@
              type: "date",
              format: "yyyy-MM-dd hh:mm:ss",
              valueFormat: "yyyy-MM-dd hh:mm:ss",
              rules: [{
            rules: [
              {
                required: true,
                message: "请输入谈话时间",
                trigger: "blur"
              }]
                trigger: "blur",
              },
            ],
            },
            {
              label: "结论",
              prop: "conclusion",
              rules: [{
            rules: [
              {
                required: true,
                message: "请输入结论",
                trigger: "blur"
              }]
                trigger: "blur",
              },
            ],
            },
            {
              label: "评价",
              prop: "evaluate",
              rules: [{
            rules: [
              {
                required: true,
                message: "请输入评价",
                trigger: "blur"
              }]
                trigger: "blur",
            },
          ]
            ],
        },
        data: []
        ],
      },
      data: [],
      };
    },
    computed: {
@@ -136,50 +168,61 @@
          addBtn: this.vaildData(this.permission.talk_add, false),
          viewBtn: this.vaildData(this.permission.talk_view, false),
          delBtn: this.vaildData(this.permission.talk_delete, false),
          editBtn: this.vaildData(this.permission.talk_edit, false)
        editBtn: this.vaildData(this.permission.talk_edit, false),
        };
      },
      ids() {
        let ids = [];
        this.selectionList.forEach(ele => {
      this.selectionList.forEach((ele) => {
          ids.push(ele.id);
        });
        return ids.join(",");
      }
    },
    },
    methods: {
    // searchChange(params, done) {
    //   console.log(params);
    //   done();
    // this.$message.success(JSON.stringify(params));
    // },
      rowSave(row, done, loading) {
        add(row).then(() => {
          row.deptid=this.$store.getters.userInfo.dept_id
      add(row).then(
        () => {
          row.deptid = this.$store.getters.userInfo.dept_id;
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
            message: "操作成功!",
          });
          done();
        }, error => {
        },
        (error) => {
          loading();
          window.console.log(error);
        });
        }
      );
      },
      rowUpdate(row, index, done, loading) {
        update(row).then(() => {
      update(row).then(
        () => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
            message: "操作成功!",
          });
          done();
        }, error => {
        },
        (error) => {
          loading();
          console.log(error);
        });
        }
      );
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        type: "warning",
        })
          .then(() => {
            return remove(row.id);
@@ -188,7 +231,7 @@
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            message: "操作成功!",
            });
          });
      },
@@ -200,7 +243,7 @@
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        type: "warning",
        })
          .then(() => {
            return remove(this.ids);
@@ -209,14 +252,14 @@
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            message: "操作成功!",
            });
            this.$refs.crud.toggleSelection();
          });
      },
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getDetail(this.form.id).then(res => {
        getDetail(this.form.id).then((res) => {
            this.form = res.data.data;
          });
        }
@@ -227,10 +270,14 @@
        this.onLoad(this.page);
      },
      searchChange(params, done) {
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
      console.log(params);
      // this.query = params;
      // this.page.currentPage = 1;
      // this.onLoad(this.page, params);
        done();
    },
    inputs(val) {
      console.log(val);
      },
      selectionChange(list) {
        this.selectionList = list;
@@ -250,17 +297,30 @@
      },
      onLoad(page, params = {}) {
        this.loading = true;
        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
      // console.log(1);
      getList(
        page.currentPage,
        page.pageSize,
        Object.assign(params, this.query)
      ).then((res) => {
          const data = res.data.data;
          this.page.total = data.total;
          this.data = data.records;
        console.log(this.data);
          this.loading = false;
          this.selectionClear();
        });
      }
    }
    },
  },
  };
</script>

<style>
<style lang="scss" scoped>
.avue-form__menu--center .el-button {
  float: left !important;
}

.avue-form__menu--center .el-button:nth-child(1) {
  margin-left: 30px !important;
}
</style>