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

liuyg

2021-09-01 e53c635fbe5ba2f3925b0052e60e24c2f68e88d6

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

 public/securityInfo.html

@@ -12,15 +12,31 @@
            align-items: center;
            justify-content: center;
            flex-direction: column;
            background-color: rgba(42, 66, 110, 0.8);
      /* background-color: rgba(42, 66, 110, 0.8); */
      background: #0ED2F7;
      /* fallback for old browsers */
      background: -webkit-linear-gradient(to left, #B2FEFA, #0ED2F7);
      /* Chrome 10-25, Safari 5.1-6 */
      background: linear-gradient(to left, #B2FEFA, #0ED2F7);
      /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */

            width: 100%;
            height: 100%;
        }
        
        .top {
            width: 100%;
            height: 250px;
            background-color: aquamarine;
      height: 224px;
      /* background-color: aquamarine; */

      background: #00d2ff;
      /* fallback for old browsers */
      background: -webkit-linear-gradient(to left, #00d2ff, #13b0ee, #13b0ee, #00d2ff);
      /* Chrome 10-25, Safari 5.1-6 */
      background: linear-gradient(to left, #00d2ff, #13b0ee, #13b0ee, #00d2ff);
      /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */


            display: flex;
            align-items: center;
            justify-content: center;
@@ -43,13 +59,14 @@
            margin-top: 15px;
            font-size: 16px;
            letter-spacing: 1px;
      color: #fff;
        }
        
        .content {
            margin-top: 5px;
            width: 90%;
            height: 500px;
            background-color: rgba(74, 66, 98, 0.8);
      background-color: rgba(65, 64, 66, 0.1);
            border-radius: 5px;
            display: flex;
            flex-direction: column;
@@ -68,7 +85,10 @@
        }
        
        .title {
            margin-left: 7%;
      margin-left: 6%;
      display: inline-block;
      width: 26%;
      min-width: 80px;
        }
    </style>
    <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
@@ -128,7 +148,7 @@


        axios.get('http://223.82.109.183:2080/api/qrCode/getUserInfo?securityNumber=' + securityNumber).then(function(res) {
            // axios.get('http://localhost:81/qrCode/getUserInfo?securityNumber=' + securityNumber).then(function(res) {
      // axios.get('http://192.168.0.114:81/qrCode/getUserInfo?securityNumber=赣洪202100008').then(function(res) {

            var data = res.data;
            console.log(data, 456);
@@ -147,18 +167,37 @@
                <span class="title">名称</span>
                <span>&nbsp;&nbsp;&nbsp;&nbsp;${data.realName}</span>
            </div>
            <div class="row-content">
                <span class="title">公司名称</span>
                <span>&nbsp;&nbsp;&nbsp;&nbsp;${data.deptName}</span>
            </div>

            <div class="row-content">
                <span class="title">性别</span>
                <span>&nbsp;&nbsp;&nbsp;&nbsp;${data.sex==1?'男':data.sex==2?'女':''}</span>
            </div>

            <div class="row-content">
                <span class="title">年龄</span>
                <span>&nbsp;&nbsp;&nbsp;&nbsp;${data.age}</span>
            </div>

            <div class="row-content">
                <span class="title">籍 贯</span></span></span>
                <span>&nbsp;&nbsp;&nbsp;&nbsp;${data.nativeplace}</span>
            </div>

            <div class="row-content">
                <span class="title">是否派遣</span></span>
                <span>&nbsp;&nbsp;&nbsp;&nbsp;${data.dispatch == 0 ? '已派遣' : '未派遣'}</span>
            </div>

            <div class="row-content">
                <span class="title">联系电话</span>
                <span>&nbsp;&nbsp;&nbsp;&nbsp;${data.phone}</span>
            </div>

            <div class="row-content">
                <span class="title">公司名称</span>
                <span>&nbsp;&nbsp;&nbsp;&nbsp;${data.deptName}</span>
            </div>

            <div class="row-content">
                <span class="title">保安证编号</span>
                <span>&nbsp;&nbsp;&nbsp;&nbsp;${data.securitynumber}</span>

 public/securityPrint.html

@@ -15,41 +15,41 @@
        }
        
        .print {
            position: absolute;
            left: 43%;
            top: 60%;
            position: relative;
            left: 45%;
            margin-top: 30px;
            width: 7%;
            height: 36px;
            border-radius: 9px;
            background-color: #1D5CE4;
            background-color: #409EFF;
            border: 0px;
            color: #fff;
            letter-spacing: 4px;
        }
        
        #table {
            margin-left: 35%;
            margin-left: 26%;
            color: #000;
            position: fixed;
            align-items: center;
            justify-content: center;
            flex-direction: column;
            width: 400px;
            height: 250px;
            width: 750px;
            height: 550px;
            border-radius: 7px;
            margin-top: -250px;
            margin-top: -550px;
            background: url(./img/bazbj.png) no-repeat;
            background-size: 100% 100%;
        }
        
        #table1 {
            margin-left: 35%;
            margin-left: 26%;
            color: #000;
            width: 400px;
            height: 250px;
            width: 750px;
            height: 550px;
            background-color: #fff;
            border-radius: 7px;
            margin-top: 200px;
            margin-top: 100px;
        }
        
        .user-info-table {
@@ -62,26 +62,27 @@
        
        .table-top {
            width: 100%;
            height: 20%;
            margin-top: 20px;
            height: 16%;
            margin-top: 30px;
            text-align: center;
            font-size: 32px;
            letter-spacing: 10px;
            font-size: 4rem;
            letter-spacing: 15px;
        }
        
        .table-center {
            font-size: 14px;
            font-size: 2rem;
            width: 100%;
            height: 60%;
            font-weight: 200;
        }
        
        .table-center-right {
            width: 70px;
            height: 70px;
            line-height: 70px;
            margin-left: 290px;
            margin-top: -100px;
            border-radius: 100px;
            width: 152px;
            height: 205px;
            line-height: 205px;
            margin-left: 510px;
            margin-top: -350px;
            border-radius: 10px;
            /* border: 1px solid; */
            text-align: center;
        }
@@ -95,8 +96,8 @@
        }
        
        .security-info {
            margin-left: 20px;
            margin-top: 18px;
            margin-left: 5rem;
            margin-top: 1.8rem;
        }
        
        .table-down {
@@ -147,9 +148,7 @@

<body>
    <div class="fo">
        <div>
            <button onclick="preview(1)" class="print">打印</button>
        </div>


        <!--startprint-->
        <div id="print">
@@ -190,11 +189,11 @@
            </div>
        </div> -->
            <!--endprint-->

        </div>




        <div>
            <button onclick="preview(1)" class="print">打印</button>
        </div>
    </div>
    <script>
        var getData = function(name) {
@@ -210,6 +209,7 @@
        // console.log(JSON.parse(getData("data")), 111);

        axios.get('http://223.82.109.183:2080/api/apply/userDetail?id=' + id).then(function(res) {

            var data = res.data.data;
            var str = `<div id="table1"></div>
            <div id="table">
@@ -230,21 +230,19 @@
                            <span>编号:</span>
                            <span>&nbsp;${data.securitynumber}</span>
                        </div>
                    </div>
                    <div class="table-center-right">
                        <img src="${data.avatar}">
                    </div>
                </div>
                <div class="table-down">
                    <div class="paper-unit">
                        <div class="security-info">
                        <span>发证机关:</span>
                        <span>&nbsp;南昌市公安局</span>
                    </div>
                    <div class="paper-date">
                        <div class="security-info">
                        <span>发证日期:</span>
                        <span>&nbsp;${data.paperTime}</span>
                    </div>
                </div>
                    <div class="table-center-right">
                            <img src="${data.avatar}">
                    </div>
                </div>
            </div>
        </div>`


 src/views/applyexam/index.vue

@@ -786,6 +786,7 @@
    },
    questionBankOnLoad(page, params = {}) {
      this.questionBankLoading = false;
      params["applyStatus"] = 1;
      getApplyList(
        page.currentPage,
        page.pageSize,

 src/views/companyApply/index.vue

@@ -469,6 +469,7 @@
    questionBankOnLoad(page, params = {}) {
      this.questionBankLoading = false;
      params["deptId"] = this.userInfo.dept_id;
      params["status"] = 1;
      getListApply(
        page.currentPage,
        page.pageSize,

 src/views/securityGuard/securityGuard.vue

@@ -518,7 +518,7 @@
                tip: "只能上传jpg/png个人头像，且不超过500kb",
                span: 12,
                row: true,
                prop: "myPicture",
                prop: "avatar",
              },
              {
                label: "是否持证",

 src/views/trainingRegistration/index.vue

@@ -150,6 +150,22 @@
        menuWidth: 380,
        dialogClickModal: false,
        column: [
          // {
          //   label: "考试人数",
          //   prop: "number",
          //   type: 'number',
          //   span: 6,
          //   precision:2,
          //   mock:{
          //     type:'number',
          //     max:500,
          //     min:50,
          //     precision:50
          //   },
          //   minRows: 0,
          //   maxRows: 3,
          //   row:true,
          // },
          {
            label: "考试时间",
            prop: "startTime",