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

Administrator

2021-08-04 bdc33e7dad9bd8e481f2dbd61b7f8b6381c685a1

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

 public/papers.html

@@ -12,7 +12,7 @@
            justify-content: center;
            flex-direction: column;
        }
        

        .user-info-table {
            margin-top: 30px;
            width: 60%;
@@ -20,25 +20,25 @@
            border: 1px solid #000;
            background-color: #fff;
        }
        

        .user-info-tr {
            height: 50px;
        }
        

        .avatar {
            width: 140px;
            height: 190px;
        }
        

        .title {
            margin-top: 20px;
        }
        

        .avatar {
            width: 140px;
            height: 190px;
        }
        

        .my-picture {
            width: 150px;
            /* height: 200px; */
@@ -121,7 +121,7 @@
            var examType = JSON.parse(getData("data")).examType;
            // console.log(JSON.parse(getData("data")), 111);

            axios.get('http://192.168.0.114:81/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
            axios.get('http://47.49.21.216:82/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>
@@ -204,4 +204,4 @@
        </script>
</body>

</html>
</html>

 src/styles/element-ui.scss

@@ -20,7 +20,7 @@
}

.el-menu--display,
.el-menu--display+.el-submenu__icon-arrow {
.el-menu--display + .el-submenu__icon-arrow {
    display: none;
}

@@ -49,17 +49,17 @@

.el-dropdown-menu__item--divided:before,
.el-menu,
.el-menu--horizontal>.el-menu-item:not(.is-disabled):focus,
.el-menu--horizontal>.el-menu-item:not(.is-disabled):hover,
.el-menu--horizontal>.el-submenu .el-submenu__title:hover {
.el-menu--horizontal > .el-menu-item:not(.is-disabled):focus,
.el-menu--horizontal > .el-menu-item:not(.is-disabled):hover,
.el-menu--horizontal > .el-submenu .el-submenu__title:hover {
    background-color: transparent;
}

.el-dropdown-menu__item--divided:before,
.el-menu,
.el-menu--horizontal>.el-menu-item:not(.is-disabled):focus,
.el-menu--horizontal>.el-menu-item:not(.is-disabled):hover,
.el-menu--horizontal>.el-submenu .el-submenu__title:hover {
.el-menu--horizontal > .el-menu-item:not(.is-disabled):focus,
.el-menu--horizontal > .el-menu-item:not(.is-disabled):hover,
.el-menu--horizontal > .el-submenu .el-submenu__title:hover {
    background-color: transparent !important;
}

@@ -227,7 +227,7 @@
.avue-sidebar .el-submenu__title span,
.avue-sidebar .el-submenu__title i,
.avue-sidebar .el-menu-item i {
    color: #000 !important;
    color: rgba($color: #000000, $alpha: 0.8) !important;
}

// 菜单 活动背景
@@ -241,8 +241,8 @@
}

//top 导航 按钮
.el-menu--horizontal>.el-menu-item.is-active,
.el-menu--horizontal > .el-menu-item.is-active,
.avue-top,
.el-dropdown {
    color: #fff !important;
}
}

 src/views/onSiteInspection/company.vue

@@ -67,7 +67,7 @@
          },
          //
          {
            label: "被检查单位名称",
            label: "被检查单位",
            prop: "sname",
            overHidden: true,
            // display: false,

 src/views/onSiteInspection/securityStaff.vue

@@ -92,7 +92,7 @@
            //     addDisplay: false
          },
          {
            label: "保安员身份证号",
            label: "身份证号",
            prop: "carid",
            // type: "select",
            // labelWidth: 120,

 vue.config.js

@@ -1,6 +1,6 @@
module.exports = {
  //路径前缀
  publicPath: "/",
  publicPath: "/enterprises/",
  lintOnSave: true,
  productionSourceMap: false,
  chainWebpack: (config) => {
@@ -29,7 +29,7 @@
        //本地服务接口地址
        // target: 'http://localhost',
        // target: 'http://192.168.0.114:81',//钟W
        target: 'http://192.168.0.108:81',//原W
        target: 'http://localhost:82',//原W
        // target: 'http://192.168.0.104:80',//唐N
        //远程演示服务地址,可用于直接启动项目
        // target: 'https://saber.bladex.vip/api',