From bdc33e7dad9bd8e481f2dbd61b7f8b6381c685a1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 04 Aug 2021 20:59:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
vue.config.js | 4 ++--
src/views/onSiteInspection/company.vue | 2 +-
public/papers.html | 16 ++++++++--------
src/styles/element-ui.scss | 20 ++++++++++----------
src/views/onSiteInspection/securityStaff.vue | 2 +-
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/public/papers.html b/public/papers.html
index 93b2421..c7f8f3d 100644
--- a/public/papers.html
+++ b/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>
\ No newline at end of file
+</html>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index b179094..8b21bf4 100644
--- a/src/styles/element-ui.scss
+++ b/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;
-}
\ No newline at end of file
+}
diff --git a/src/views/onSiteInspection/company.vue b/src/views/onSiteInspection/company.vue
index a1732aa..c7b0371 100644
--- a/src/views/onSiteInspection/company.vue
+++ b/src/views/onSiteInspection/company.vue
@@ -67,7 +67,7 @@
},
//
{
- label: "被检查单位名称",
+ label: "被检查单位",
prop: "sname",
overHidden: true,
// display: false,
diff --git a/src/views/onSiteInspection/securityStaff.vue b/src/views/onSiteInspection/securityStaff.vue
index 1fdd03d..d006ff4 100644
--- a/src/views/onSiteInspection/securityStaff.vue
+++ b/src/views/onSiteInspection/securityStaff.vue
@@ -92,7 +92,7 @@
// addDisplay: false
},
{
- label: "保安员身份证号",
+ label: "身份证号",
prop: "carid",
// type: "select",
// labelWidth: 120,
diff --git a/vue.config.js b/vue.config.js
index ae07d48..4ccc2fc 100644
--- a/vue.config.js
+++ b/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',
--
Gitblit v1.9.3