Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterpris...

liuyg

2021-12-06 5a3ace296c010b5c11501dedf252e1c144cda9e2

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises_ys

 public/papers.html

@@ -140,8 +140,8 @@
        var examType = JSON.parse(getData("data")).examType;
        // console.log(JSON.parse(getData("data")), 111);

        // axios.get('http://223.82.109.183:2080/api/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
        axios.get('http://localhost:83/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
        axios.get('http://223.82.109.183:2088/api/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
            // axios.get('http://localhost:83/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
            var data = res.data.data;
            var str = `<span class="title">${data.examName}</span>
                    <span class="title">准考证信息</span>
@@ -189,7 +189,7 @@
                            <td>${data.examName}</td>
                            <td width="120px">保安员考试</td>
                            <td width="180px">${data.stringTime}</td>
                            <td>${data.examRoomNo}</td>
                            <td>${data.applyCode}</td>
                            <td></td>
                        </tr>


 public/papersApply.html

@@ -96,8 +96,8 @@
        var name = JSON.parse(getData("data")).name;
        // console.log(JSON.parse(getData("data")), 111);

        axios.get('http://223.82.109.183:2080/api/apply/getApplyDetailList?examId=' + id).then(function(res) {
            // axios.get('http://localhost:81/apply/getApplyDetailList?examId=' + id).then(function(res) {
        axios.get('http://223.82.109.183:2088/api/apply/getApplyDetailList?examId=' + id).then(function(res) {
            // axios.get('http://localhost:83/apply/getApplyDetailList?examId=' + id).then(function(res) {
            var data = res.data;
            var list = data.applyList;
            console.log(data, 123);

 src/api/securityAnalysis/securityAnalysis.js

@@ -60,7 +60,7 @@

export const getinformationstatistics = (deptid, jurisdiction) => { //保安员考试情况统计  只需要公司的deptid
    return request({
        url: '/api/examScore/score-statistics',
        url: '/api/examScore/score-stat',
        // url: 'http://192.168.0.109:81/information/selectExtype',
        method: 'get',
        params: {

 src/views/applydetailed/index.vue

@@ -69,7 +69,7 @@
          </avue-crud>

          <el-dialog
            title="清册数据导入"
            title="报名清册附件上传"
            append-to-body
            :visible.sync="excelBox"
            width="555px"

 src/views/applyexam/index.vue

@@ -435,10 +435,10 @@
        editBtn: false,
        addBtn: true,
        addBtnText: "报名信息新增",
        addTitle: "报名信息新增",
        selection: false,
        menu: true,
        // 导出按钮
        // excelBtn: true,
        viewBtn: true,

        // title: '题库',

 src/views/dispatch/dispatchChildoperable.vue

@@ -109,6 +109,7 @@
        cellBtn: false,
        delBtnText: "结束派遣",
        editBtnText: "更改派遣",
        editTitle: "更改派遣",
        addTitle: "记录添加",
        addBtnText: "记录添加",
        // addBtn: false,
@@ -346,6 +347,7 @@
        cellBtn: false,
        delBtnText: "结束派遣",
        editBtnText: "更改派遣",
        editTitle: "更改派遣",
        addTitle: "记录添加",
        addBtnText: "记录添加",
        // addBtn: false,

 src/views/exam/singleperformance.vue

@@ -30,6 +30,9 @@
            <template slot-scope="{ row }" slot="learnGrade">
              {{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
            </template>
            <template slot-scope="{ row }" slot="isExam">
              {{ row.isExam == -1 ? "" : row.isExam }}
            </template>
            <template slot-scope="{ row }" slot="theoryGrade">
              {{ row.learnGrade == -1 ? "" : row.theoryGrade }}
            </template>
@@ -283,6 +286,10 @@
                label: "考试中",
                value: 3,
              },
              {
                label: "",
                value: -1,
              },
            ],
            // 表单新增时是否禁止
            addDisabled: false,

 src/views/resource/attachCopyzb.vue

@@ -61,7 +61,7 @@
      </template>
    </avue-crud>
    <el-dialog
      title="附件管理"
      title="单位装备清单附件上传"
      append-to-body
      :visible.sync="attachBox"
      width="555px"

 src/views/securityAnalysis/child/certificate.vue

@@ -157,7 +157,7 @@
            ],
          },
          {
            label: "发证时间",
            label: "拿证时间",
            prop: "paperTime",
            disabled: true,
          },

 src/views/securityAnalysis/child/dispatch.vue

@@ -176,11 +176,11 @@
              },
            ],
          },
          // {
          //   label: " 派遣人数",
          //   prop: "num",
          //   labelWidth: 118,
          // },
          {
            label: "人员数量",
            prop: "num",
            labelWidth: 118,
          },
          {
            label: "合同开始时间",
            prop: "startTime",

 src/views/securityAnalysis/child/examination.vue

@@ -1,15 +1,13 @@
<template>
  <div class="certificateTJ">
    <avue-crud
      :option="option1"
        <avue-crud :option="option1"
      :data="data1"
      :page.sync="page1"
      :table-loading="loading1"
      @on-load="getPractitionersPageInfo"
      @search-change="searchChange"
      @search-reset="searchReset"
      @refresh-change="refreshChange"
    >
                   @refresh-change="refreshChange">
    </avue-crud>
  </div>
</template>

 src/views/securityAnalysis/index.vue

@@ -18,79 +18,71 @@
      <!-- 保安员审查情况统计
        <div>饼图</div> -->
      <!-- </div> -->
      <div class="examines" ref="ech1">
            <div class="examines"
                 ref="ech1">
        <!-- 保安员审查情况统计
        <div>饼图</div> -->
      </div>
      <div class="certificate" ref="ech2">
            <div class="certificate"
                 ref="ech2">
        <!-- 保安员持证情况统计
        <div>饼图</div> -->
      </div>
      <!-- <div class="czbut"></div> -->
    </div>
    <div class="securityAnalysiscenter">
      <div class="examination" ref="ech3">
            <div class="examination"
                 ref="ech3">
        <!-- 保安员考试情况统计
        <div>堆叠面积图</div> -->
      </div>
      <div class="dispatchUnit" ref="ech4">
            <div class="dispatchUnit"
                 ref="ech4">
        <!-- 派遣服务单位统计
        <div>柱状图</div> -->
      </div>
    </div>
    <div class="securityAnalysisright">
      <div class="dispatchSecurity" ref="ech5">
            <div class="dispatchSecurity"
                 ref="ech5">
        <!-- 保安派遣情况统计
        <div>饼图</div> -->
      </div>
      <div class="socialSecurity" ref="ech6">
            <div class="socialSecurity"
                 ref="ech6">
        <!-- 社保缴纳情况统计
        <div>饼图</div> -->
      </div>
    </div>
    <div>
      <el-dialog
        width="90%"
            <el-dialog width="90%"
        :title="titles"
        append-to-body
        :visible.sync="dialogVisible"
        top="9vh"
      >
        <situation
          :card="{ deptid: deptid, jurisdiction: jurisdiction }"
          v-if="sees == 1"
        >
                       top="9vh">
                <situation :card="{ deptid: deptid, jurisdiction: jurisdiction }"
                           v-if="sees == 1">
          <!-- 保安员审查情况统计 -->
        </situation>

        <certificate
          :card="{ deptid: deptid, jurisdiction: jurisdiction }"
          v-if="sees == 2"
        >
                <certificate :card="{ deptid: deptid, jurisdiction: jurisdiction }"
                             v-if="sees == 2">
          <!-- 保安员持证情况统计 -->
        </certificate>
        <examination
          :card="{ deptid: deptid, jurisdiction: jurisdiction }"
          v-if="sees == 3"
        >
                <examination :card="{ deptid: deptid, jurisdiction: jurisdiction }"
                             v-if="sees == 3">
          <!-- 保安员考试情况统计 -->
        </examination>
        <dispatch
          :card="{ deptId: deptid, jurisdiction: jurisdiction }"
          v-if="sees == 4"
        >
                <dispatch :card="{ deptId: deptid, jurisdiction: jurisdiction }"
                          v-if="sees == 4">
          <!-- 派遣服务单位 注意deptId  I为大写 -->
        </dispatch>
        <assignment
          :card="{ deptid: deptid, jurisdiction: jurisdiction }"
          v-if="sees == 5"
        >
                <assignment :card="{ deptid: deptid, jurisdiction: jurisdiction }"
                            v-if="sees == 5">
          <!-- 保安派遣情况 -->
        </assignment>
        <socialSecurity
          :card="{ deptid: deptid, jurisdiction: jurisdiction }"
          v-if="sees == 6"
        >
                <socialSecurity :card="{ deptid: deptid, jurisdiction: jurisdiction }"
                                v-if="sees == 6">
          <!-- 社保缴纳情况 -->
        </socialSecurity>
      </el-dialog>
@@ -271,6 +263,7 @@
        .then((res) => {
          var a = res.data.data;
          var b = that.changedata(a, "zc", "bzc", "情况正常", "情况异常");
                    console.log(b, 456)
          that.setEC1(b);
        })
        .catch((res) => {
@@ -479,120 +472,71 @@
      this.EC2.setOption(option);
    },
    getEC3() {
      var that = this;
      getinformationstatistics(this.deptid, this.jurisdiction).then((res) => {
        var a = res.data.data;
        // console.log(a, 22222222222222222222);
        // var a = res.data.data,
        //   s = [],
        //   l = [];
        // console.log(a); // 0 :理论 1：实操
        // for (var k in a[0]) {
        //   l.push(a[0][k]);
        //   s.push(a[1][k]);
        // }
        var l = a.llcj;
        var s = a.sccj;
        this.setEC3(s, l);
                var obj = [{ value: a[1], name: '已通过' }, { value: a[2], name: '未通过' }]
                this.setEC3(obj);
      });
    },
    setEC3(s, l) {
      var xd = [],
        sd = [],
        ld = [],
        that = this;
      for (var i = 0; i < 100; i++) {
        xd.push(i + "分");
      }
      // console.log(sd);
      var option = {
        setEC3 (d) {
            var option, data;
            data = d;
            option = {
        title: {
          text: "保安员考试情况统计",
          left: "center",
          top: 20,
        },
        tooltip: {
          trigger: "axis",
          axisPointer: {
            type: "cross",
            label: {
              backgroundColor: "#6a7985",
                    trigger: "item",
            },
          },
          // formatter(params) {
          //   console.log(params);
          //   var str = "";
          //   for (var x in params) {
          //     str += params[x].axisValue + ":" + params[x].data + "/n";
          //   }
          //   return str;
          // },
          formatter:
            "<span>实操成绩</span>({b0}) :  {c0}<span>人</span><br /><span>理论成绩</span>({b1}) :  {c1}<span>人</span>",
                legend: {
                    // orient: "vertical",
                    // left: "left",
                    x: "center",
                    y: "90%",
        },
        toolbox: this.gettoolbox("考试情况查询", "保安员考试情况明细", 3),
        legend: {
          data: ["实操成绩", "理论成绩"],
        },
        // toolbox: {
        //   feature: {
        //     saveAsImage: {},
                // grid: {
                //   // left: "3%",
                //   right: "5%",
                //   // bottom: "3%",
                //   // containLabel: true,
        //   },
        // },
        grid: {
          left: "3%",
          right: "5%",
          bottom: "3%",
          containLabel: true,
        },
        xAxis: [
          {
            type: "category",
            boundaryGap: false,
            // data: ["0~60分", "60~80分", "80~90分", "90~100分"],
            data: xd,
          },
        ],
        yAxis: [
          {
            type: "value",
          },
        ],
        series: [
          {
            name: "实操成绩",
            type: "line",
            stack: "总量",
            areaStyle: {},
            emphasis: {
              focus: "series",
            },
            // data: [1, 2, 3, 1],
                        // name: "访问来源",
                        type: "pie",
                        radius: "50%",
                        data: data,
            // data: [
            //   1, 0, 0, 0, 3, 2, 1, 0, 4, 0, 5, 0, 4, 0, 0, 9, 7, 0, 2, 0, 5, 0,
            //   0, 0, 7, 9, 0, 0, 7, 0, 5, 0, 7, 1, 0, 9, 2, 0, 0, 0, 3, 0, 0, 0,
            //   7, 9, 0, 0, 7, 0, 5, 0, 7, 24, 2, 9, 7, 37, 0, 3, 5, 0, 0, 0, 7,
            //   9, 1, 0, 7, 0, 5, 4, 2, 0, 0, 9, 7, 35, 0, 0, 3, 0, 0, 12, 7, 9,
            //   0, 0, 7, 0, 2, 0, 7, 0, 0, 9, 7, 0, 0, 1,
                        //   { value: 1, name: "在逃人员" },
                        //   { value: 3, name: "吸毒人员" },
                        //   { value: 10, name: "刑释解教人员" },
                        //   { value: 5, name: "社会闲散青少年" },
                        //   { value: 11, name: "艾滋病人" },
                        //   { value: 26, name: "其他人员" },
            // ],
            data: s,
          },
          {
            name: "理论成绩",
            type: "line",
            stack: "总量",
            areaStyle: {},
            emphasis: {
              focus: "series",
                            itemStyle: {
                                shadowBlur: 10,
                                shadowOffsetX: 0,
                                shadowColor: "rgba(0, 0, 0, 0.5)",
            },
            // data: [
            //   4, 0, 5, 0, 7, 3, 2, 9, 7, 1, 0, 3, 5, 0, 9, 7, 0, 2, 0, 0, 7, 0,
            //   2, 0, 7, 0, 0, 9, 5, 0, 0, 0, 7, 9, 0, 0, 7, 0, 5, 0, 7, 1, 0, 9,
            //   2, 0, 0, 50, 3, 0, 30, 0, 7, 9, 0, 20, 7, 40, 0, 0, 0, 7, 9, 1, 0,
            //   7, 0, 5, 4, 2, 0, 0, 9, 7, 35, 0, 0, 3, 0, 0, 12, 7, 9, 0, 7, 0,
            //   0, 11, 0, 0, 0, 3, 2, 1, 0, 4, 0, 5, 0, 3,
            // ],
            data: l,
                        },
                        label: {
                            // alignTo: "edge",
                            formatter: "{name|{b}}\n({d}%)",
                            // minMargin: 5,
                            // edgeDistance: 10,
                            // lineHeight: 15,
                            rich: {
                                time: {
                                    fontSize: 10,
                                    color: "#999",
                                },
                            },
                        },
          },
        ],
      };

 src/views/securityEquipment/car.js

@@ -15,13 +15,13 @@
    //     addDisplay: false
    // },
    {
        label: "车牌号码",
        label: "车牌",
        prop: "carNumber",
        searchSpan: 3,
        search: true,
        rules: [{
            required: true,
            message: "请输入车牌号码",
            message: "请输入车牌",
            trigger: "blur"
        }]
    },
@@ -44,11 +44,11 @@
        }],
    }, //上面不显示
    {
        label: "车辆类型",
        label: "车辆分类",
        prop: "carType",
        rules: [{
            required: true,
            message: "请输入车辆类型",
            message: "请输入车辆分类",
            trigger: "blur"
        }],
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=carType",
@@ -61,7 +61,7 @@
        },
        dataType: "number",
    }, {
        label: "车辆型号",
        label: "型号",
        prop: "mode",
        // search: true,
        width: 110,
@@ -69,7 +69,7 @@
        // search: true,
        rules: [{
            required: true,
            message: "请输入车辆型号",
            message: "请输入型号",
            trigger: "blur"
        }]
    },
@@ -120,7 +120,7 @@
        searchSpan: 4,
    },
    {
        label: "出厂日期",
        label: "购买时间",
        prop: "dateForProduction",
        type: "date",
        format: "yyyy-MM-dd",
@@ -129,7 +129,7 @@
        overHidden: true,
        rules: [{
            required: true,
            message: "请输入出厂日期",
            message: "请选择购买时间",
            trigger: "blur"
        }]
    },
@@ -157,7 +157,7 @@
        searchSpan: 4,
    },
    {
        label: "车辆图片",
        label: "照片",
        type: "upload",
        listType: "picture-img",
        propsHttp: {
@@ -169,7 +169,7 @@
            ratio: 0.1,
        },
        action: "/api/blade-resource/oss/endpoint/put-file",
        tip: "只能上传单张车辆图片，且不超过500kb",
        tip: "只能上传单张照片，且不超过500kb",
        span: 10,
        // row: true,
        prop: "picture",

 src/views/securityEquipment/equipments.js

@@ -145,7 +145,7 @@
        }]
    },
    {
        label: "出厂日期",
        label: "出厂时间",
        prop: "dateForProduction",
        type: "date",
        format: 'yyyy-MM-dd',
@@ -155,7 +155,7 @@
        overHidden: true,
        rules: [{
            required: true,
            message: "请输入出厂日期",
            message: "请选择出厂时间",
            trigger: "blur"
        }]
    },

 src/views/system/user.vue

@@ -291,6 +291,10 @@
        border: true,
        index: true,
        delBtnText: "注销",
        addBtnText: "系统用户注册",
        addTitle: "系统用户注册",
        editBtnText: "修改",
        editTitle: "用户信息修改",
        selection: true,
        viewBtn: true,
        //dialogType: 'drawer',

 src/views/trainingRegistration/index.vue

@@ -425,7 +425,8 @@
        delBtn: false,
        editBtn: false,
        addBtn: true,
        addBtnText: "报名新增",
        addBtnText: "培训报名新增",
        addTitle: "培训报名新增",
        selection: false,
        menu: true,
        // 导出按钮

 src/views/workreport/data.js

@@ -1,6 +1,6 @@
//已发送列表信息
export var workreportColumn = [{
    label: "汇报时间",
    label: "上报时间",
    prop: "reportTime",
    type: "datetime",
    format: "yyyy-MM-dd HH:mm:ss",
@@ -8,13 +8,13 @@
    searchRange: true,
    searchSpan: 6,
    hide: false,
    addDisplay: false,
    editDisplay: false,
    // addDisplay: false,
    // editDisplay: false,
    // viewDisplay: false,
    search: false,
    rules: [{
        required: true,
        message: "请输入时间",
        message: "请选择上报时间",
        trigger: "blur"
    }]
}, {