网站主办单位：包头市应急管理局
@@ -42,7 +42,7 @@ export default {
diff --git a/src/assets/Components/Header.vue b/src/assets/Components/Header.vue
index 6385529..66e9692 100644
--- a/src/assets/Components/Header.vue
+++ b/src/assets/Components/Header.vue
@@ -1,25 +1,27 @@
-
-
-
-
-
包头市安全生产考试服务平台
-Baotou Workplace Safety Examination Service Platform
-
- 登录
- 注册
-
-
- {{ userInfo.name }}
- 退出登录
+
@@ -89,71 +91,83 @@ export default {
min-width 1200px
background url("~@/assets/images/head-bg.jpg") no-repeat center
background-size: auto 100%
- .head-container
- width 1200px
- margin 0 auto
- padding-top 20px
- overflow hidden
- .title
- float left
- margin-right 50px
- cursor pointer
- h1
- font-size 22px
- color #fff
- font-weight normal
- margin-bottom 5px
- p
- font-size 12px
- color #fff
- .nav
- float left
- margin-top 5px
- ul
- &:after
- content ''
- display block
- clear both
- li
- float left
- padding 0 40px
- font-size 18px
+ .header-box
+ height 110px
+ box-sizing border-box
+ background url("~@/assets/images/login-head-bg.png") no-repeat
+ background-size: 100% 100%
+ .head-container
+ width 1200px
+
+ margin 0 auto
+ padding-top 20px
+ overflow hidden
+ .title
+ float left
+ margin-right 30px
+ cursor pointer
+ h1
+ font-size 22px
color #fff
- border-right 2px solid #fff
- cursor pointer
- position relative
- &:last-child
- border none
- &.active
- &:after
- content ''
- display block
- width 40px
- height 3px
- border-radius 3px
- background #fff300
- position absolute
- bottom -10px
- left 50%
- margin-left -20px
- .login
- float right
- margin-top 5px
- a
- display inline-block
- padding-left 25px
- font-size 16px
- color #fff
- &.login-btn
- background url("~@/assets/images/login-icon.png") no-repeat left center
- background-size 18px 18px
- padding-right 10px
- border-right 1px solid #fff
- margin-right 10px
- &.register-btn
- background url("~@/assets/images/register-icon.png") no-repeat left 1.5px
- background-size 20px 20px
- &.logout-btn
- background url("~@/assets/images/logout-icon.png") no-repeat left 1.5px
- background-size 20px 20px
+ font-weight normal
+ margin-bottom 5px
+ p
+ font-size 12px
+ color #fff
+ .nav
+ float left
+ margin-top 5px
+ ul
+ &:after
+ content ''
+ display block
+ clear both
+ li
+ float left
+ padding 0 34px
+ font-size 18px
+ color #fff
+ border-right 2px solid #fff
+ cursor pointer
+ position relative
+ &:last-child
+ border none
+ &.active
+ &:after
+ content ''
+ display block
+ width 40px
+ height 3px
+ border-radius 3px
+ background #fff300
+ position absolute
+ bottom -10px
+ left 50%
+ margin-left -20px
+ .login
+ float right
+ margin-top 5px
+ a
+ display inline-block
+ padding-left 25px
+ font-size 16px
+ color #fff
+ vertical-align top
+ &.login-btn
+ width 100px
+ white-space nowrap
+ overflow hidden
+ text-overflow ellipsis
+ box-sizing border-box
+ background url("~@/assets/images/login-icon.png") no-repeat left center
+ background-size 18px 18px
+ padding-right 10px
+ border-right 1px solid #fff
+ margin-right 10px
+ &.register-btn
+ background url("~@/assets/images/register-icon.png") no-repeat left 1.5px
+ background-size 20px 20px
+ &.logout-btn
+ background url("~@/assets/images/logout-icon.png") no-repeat left 1.5px
+ background-size 20px 20px
diff --git a/src/assets/images/center-tab1.png b/src/assets/images/center-tab1.png
new file mode 100644
index 0000000..9a096f1
Binary files /dev/null and b/src/assets/images/center-tab1.png differ
diff --git a/src/assets/images/head-bg.jpg b/src/assets/images/head-bg.jpg
index a0eaab9..31f651b 100644
Binary files a/src/assets/images/head-bg.jpg and b/src/assets/images/head-bg.jpg differ
diff --git a/src/assets/public/url.js b/src/assets/public/url.js
index fd983ac..326eaf2 100644
--- a/src/assets/public/url.js
+++ b/src/assets/public/url.js
@@ -1,7 +1,11 @@
-const registerUrl = 'http://124.67.110.246:8081/signup/'
-const loginUrl = 'http://124.67.110.246:8081/signup/'
-const signUrl = 'http://124.67.110.246:8081/signup/'
-const personInfoUrl = 'http://124.67.110.246:8081/signup/'
+const registerUrl = 'http://124.67.110.246:9999/signup/'
+const loginUrl = 'http://124.67.110.246:9999/signup/'
+const signUrl = 'http://124.67.110.246:9999/signup/'
+const personInfoUrl = 'http://124.67.110.246:9999/signup/'
+// const registerUrl = 'http://192.168.0.109:8070/signup/'
+// const loginUrl = 'http://192.168.0.109:8070/signup/'
+// const signUrl = 'http://192.168.0.109:8070/signup/'
+// const personInfoUrl = 'http://192.168.0.109:8070/signup/'
export default {
registerUrl,
loginUrl,
diff --git a/src/pages/Login/Login.vue b/src/pages/Login/Login.vue
index d0dfd50..4659580 100644
--- a/src/pages/Login/Login.vue
+++ b/src/pages/Login/Login.vue
@@ -2,7 +2,7 @@
+
+
+
+
+
安全生产三项岗位人员考试服务平台
+The Examination Service Platform For The Three Posts Of Safety Production
+
+ 登录
+ 注册
+
+
+ {{ userInfo.name }}
+ 退出登录
+
-
一旦选择确定后无法修改', btn: ['确认', '取消'], yes: function () { + var type + if (self.workSelectedTypeLv2 != 0) { + type = self.workSelectedTypeLv2 + } else if (self.workSelectedTypeLv1 != 0) { + type = self.workSelectedTypeLv1 + } else { + type = self.workSelectedType + } var info = self.signInfo info['applyClassId'] = planId info['applyClassName'] = name info['applyInstitutionId'] = orgId + info['applyWorkTypeId'] = type axios.post(self.signUrl + 'app/apply/save', info,{ - // axios.post('http://192.168.109:8070/signup/app/apply/save', info,{ + // axios.post('http://192.168.120:7009/signup/app/apply/save', info,{ headers: { token: self.token } @@ -1183,6 +1243,7 @@ export default { self.isSignSuccess = true // self.tab = 1 }).catch(function (error) { + self.$layer.closeAll() self.$layer.msg(error.response.data.msg) }) }, @@ -1437,18 +1498,28 @@ export default { catalogId = self.workSelectedTypeLv1 } var info = self.page - info['workerCatalog'] = catalogId - info['planType'] = self.planType - info['applyCardNumber'] = self.signInfo.applyCardNumber + var type + if (self.workSelectedTypeLv2 != 0) { + type = self.workSelectedTypeLv2 + } else if (self.workSelectedTypeLv1 != 0) { + type = self.workSelectedTypeLv1 + } else { + type = self.workSelectedType + } + info['workTypeId'] = type info['keywords'] = self.orgKeywords - axios.get(self.signUrl + 'app/apply/listPageApplyClassPlan', { - // axios.get('http://192.168.0.109:8070/signup/app/apply/listPageApplyClassPlan', { + axios.get(self.signUrl + 'app/apply/list-page-apply-work-type', { + // axios.get('http://192.168.0.120:7009/signup/app/apply/list-page-apply-work-type', { params: info, headers: { token: self.token } }).then(function (res) { + console.log(res) self.isLoading = false + for (let i = 0; i < res.data.rows.length; i++) { + res.data.rows[i].qrCode = 'data:image/jpg;base64,' + res.data.rows[i].qrCode + } self.orgList = res.data.rows self.page.page = res.data.page self.page.totalPage = Math.ceil(res.data.total / self.page.rows) @@ -1507,6 +1578,8 @@ export default { this.getOrgList() } else if (this.tab == 2) { this.getExamList() + } else if (this.tab == 3) { + this.getAchievement() } }, // 查看审核记录 @@ -1540,6 +1613,7 @@ export default { if (!isResign) { self.signedInfo['isDisabled'] = 1 } else { + // self.signedInfo['isDisabled'] = 0 self.showResignBtn = true } self.checkingSigned = true @@ -1559,6 +1633,9 @@ export default { self.showResignBtn = false self.getMyApply() } + }).catch(function (error) { + self.$layer.msg(error.response.data.msg) + self.isLoading = false }) }, // 获取我的考试列表 @@ -1632,6 +1709,7 @@ export default { // 保存个人信息 savePersonInfo: function () { var self = this + console.log(self.personInfo) if (this.personInfo.fullName) { self.isLaoding = true axios.post(self.personUrl + 'app/basic-staff-info/save', self.personInfo, { @@ -1658,6 +1736,7 @@ export default { var formdata = new FormData() formdata.append('image', file) axios.post(self.personUrl + 'app/file/uploadimage', formdata, { + // axios.post('http://192.168.0.109:8070/signup/app/file/uploadimage', formdata, { headers: { token: self.token } @@ -1665,6 +1744,7 @@ export default { self.$layer.msg('上传成功') self.isLaoding = false self.personInfo.userPhotoId = res.data.data + // self.getPersonInfo() }) }, // 报名选择证件类型判断回填 @@ -1684,6 +1764,21 @@ export default { window.print(); window.location.reload() }, 500); + }, + // 获取我的成绩 + getAchievement: function () { + var self = this + axios.get('http://192.168.0.111:8089/signup/app/applystudents/listpage', { + params: self.page, + headers: { + token: self.token + } + }).then(function (res) { + console.log(res) + self.achievementList = res.data.rows + self.page.page = res.data.page + self.page.totalPage = Math.ceil(res.data.total / self.page.rows) + }) } }, mounted: function () { @@ -1777,14 +1872,13 @@ export default { cursor pointer .person-info float right - margin-top 5px a display inline-block font-size 16px color #fff margin-right 30px - line-height 20px - height 20px + line-height 60px + height 60px &.user-name i background url("~@/assets/images/icon_aggregate1.png") no-repeat left top @@ -1792,7 +1886,7 @@ export default { display inline-block width 17px height 20px - vertical-align top + vertical-align middle margin-right 5px &.back padding-right 30px @@ -1804,7 +1898,7 @@ export default { display inline-block width 19px height 20px - vertical-align top + vertical-align middle margin-right 5px &.logout i @@ -1813,7 +1907,7 @@ export default { display inline-block width 17px height 16px - vertical-align top + vertical-align middle margin-right 5px .content width 1200px @@ -1830,7 +1924,7 @@ export default { margin-top 10px cursor pointer &:first-child - background url("~@/assets/images/center-tab6.png") no-repeat + background url("~@/assets/images/center-tab1.png") no-repeat background-size 100% 100% &.active background url("~@/assets/images/center-tab1-on.png") no-repeat @@ -2083,6 +2177,15 @@ export default { color #000 span font-weight bold + &.count + font-weight normal + margin-right 10px + &.type1 + color #4184dd + &.type2 + color orange + &.type3 + color green button border none outline none @@ -2108,13 +2211,36 @@ export default { margin 20px 0 .signed-box overflow hidden - border #e8e8e8 solid 1px + box-shadow 0 0 10px #eee position relative - margin-bottom 10px + margin-bottom 20px .signed-left width 100% - padding 25px 30px + padding 0 30px 25px box-sizing border-box + position relative + .status + position absolute + top 0 + left 0 + width 110px + height 40px + border-top-left-radius 5px + border-bottom-right-radius 20px + text-align center + line-height 40px + color #fff + &.complete + background #4184dd + &.wait + background #5bd9f0 + &.error + background #f6704d + h3 + font-size 18px + color #333 + line-height 40px + margin-left 95px table table-layout fixed width 100% @@ -2122,6 +2248,14 @@ export default { height 35px font-size 16px color #000 + span + margin-right 10px + &.type1 + color #4184dd + &.type2 + color orange + &.type3 + color green button width 100px height 35px @@ -2319,6 +2453,8 @@ export default { font-size 16px color #000 height 40px + vertical-align top + line-height 40px &:nth-child(odd) text-align right &:nth-child(even) @@ -2349,6 +2485,7 @@ export default { text-align center padding 20px 0 background #fff + min-width 1200px p font-size 16px color #333 @@ -2400,7 +2537,7 @@ export default { width 16px height 16px border-radius 50% - border 1px solid greenyellow + border 1px solid greenorange position absolute background #fff top 0 diff --git a/src/pages/Print/Print.vue b/src/pages/Print/Print.vue deleted file mode 100644 index ec90fbd..0000000 --- a/src/pages/Print/Print.vue +++ /dev/null @@ -1,28 +0,0 @@ - -
-
正在登陆到包头市安全生产考试服务平台
+安全生产三项岗位人员考试服务平台
@@ -81,24 +81,28 @@ export default { border-radius 10px box-shadow 0 0 17px #DEDEDE .login - position fixed - top 0 - right 0 - left 0 - bottom 0 + //position fixed + //top 0 + //right 0 + //left 0 + //bottom 0 background url("~@/assets/images/login-bg.jpg") no-repeat center background-size 100% 100% + overflow hidden .login-box width 460px height 720px - padding 80px 55px 180px 45px + padding 80px 40px 180px box-sizing border-box - position absolute - top 50% - left 54% - margin-top -360px + //position absolute + //top 50% + //left 54% + //margin-top -360px background #fff url("~@/assets/images/login-box-bg1.png") no-repeat left bottom background-size 100% auto + margin-top 100px + margin-bottom 70px + margin-left 54% h3 font-size 20px text-align center @@ -147,11 +151,8 @@ export default { margin-bottom 0 color #999 .bottom-text - position absolute - left 0 - right 0 - bottom 30px text-align center color #fff font-size 14px + margin-bottom 30px diff --git a/src/pages/PersonCenter/PersonCenter.vue b/src/pages/PersonCenter/PersonCenter.vue index a05b14e..fae1c12 100644 --- a/src/pages/PersonCenter/PersonCenter.vue +++ b/src/pages/PersonCenter/PersonCenter.vue @@ -2,7 +2,7 @@
@@ -268,32 +261,33 @@
@@ -332,38 +326,34 @@
| 机构名称: | -{{item.planName}} | -培训地点: | -{{item.planAddress}} | -- - + | 机构名称: | +{{item.institutionName}} | +机构地址: | +{{item.institutionAddress}} | ++ + |
| 报名时间: | -{{ item.signUpStartTime }} 至 {{ item.signUpEndTime }} |
- 开班人数: | -{{ item.planPersonNum }}人 | +机构简介： | +{{ item.institutionDesc }} | ||||
| 开班时间: | -{{ item.planStartTime }} 至 {{ item.planEndTime }} |
- 已报名数: | -{{ item.applyClassPlanUserNumber }}人 | +符合开班人数 - {{ item.applyUserNum1 }}人| 已报名人数 - {{ item.applyUserNum2 }}人| 已通过审核人数 - {{ item.applyUserNum3 }}人 | |||||
| 联系人 | -{{ item.chargePerson }} | -联系电话: | -{{ item.chargePersonTel }} | +负责人: | +{{ item.institutionPrincipal }} | +||||
| 联系方式: | +{{ item.institutionContact }} | +||||||||
| 二维码: | +|||||||||
报考情况
-
+
@@ -587,8 +577,50 @@
待审核
+ 用户撤回
+ 审核通过
+ 报名完成
+ 审核不通过
+ {{ item.applyName }} | 报名时间：{{ item.gmtCreate }}
| 姓 名: | -{{ item.applyName }} | -培训计划: | -{{ item.applyClassName }} | +证件类型: | +{{ item.applyCardTypeName }} | +证件号码: | +{{ item.applyCardNumber }} |
| 证件类型: | -{{ item.applyCardTypeName }} | -证件号码: | -{{ item.applyCardNumber }} | -||||
| 报名时间: | -2021-04-27 09:38:08 | +培训机构: | +{{ item.applyInstitutionName }} | 手 机: | {{ item.applyPhone }} | ||
| 报名情况: | -
- 待审核 -用户撤回 -审核通过 -报名完成 -审核不通过 - |
+ 报名工种: | +{{ item.applyWorkTypeName }} | +||||
| 符合开班人数 - {{ item.applyUserNum1 }}人| 已报名人数 - {{ item.applyUserNum2 }}人| 已通过审核人数 - {{ item.applyUserNum3 }}人 | |||||||
| 操 作: | @@ -410,34 +400,34 @@|||||||
| 姓名 | - + | 出生日期 | - + | ||||
| 证件类型 | - | 证件号码 | - + | ||||
| 手机号码 | - + | 性别 | - | ||||
-
- 
-
-
- 
-
-
- 
-
+
- 暂无记录
+
我的成绩
+
+
+
+
+ | 序号 | +姓名 | +培训机构 | +工种名称 | +开始时间 | +结束时间 | +成绩 | +
|---|---|---|---|---|---|---|
| {{ (page.page - 1) * page.rows + idx + 1 }} | +{{ item.applyName }} | +{{ item.applyUnitName }} | +{{ item.applyWorkTypeName }} | +{{ item.examStartTime }} | +{{ item.examEndTime }} | +{{ item.applyTestScores }} | +
+ 首页
+ 上一页
+
-
+
- + {{cpage}} + +
-
+
- + {{cpage}} + +
- + {{page.totalPage - 5 + cpage}} + +
- + {{page.page - (3 - cpage)}} + +
@@ -597,15 +629,21 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关于包头市领取安全生产考试资格证书有关事项的通告
@@ -957,7 +995,7 @@ @@ -1036,7 +1074,7 @@ export default { workSelectedTypeLv1: 0, workTypeLv2: [], workSelectedTypeLv2: 0, - planType: '', + // planType: '', promiseText: '', paperTypeList: [], sexList: [], @@ -1083,7 +1121,9 @@ export default { orgKeywords: '', basicStaffInfoId: '', isSignSuccess: false, - hasCardNum: false + hasCardNum: false, + hasreCardNum: true, + achievementList: [] } }, methods: { @@ -1099,10 +1139,8 @@ export default { this.checkingSigned = false } else if (tab == 2) { this.getExamList() - } - if (tab == 7) { + } else if (tab == 7) { this.getPersonInfo() - this.$nextTick(function () { laydate.render({ elem: "#birthday", @@ -1112,16 +1150,29 @@ export default { } }); }) + } else if (tab == 3) { + this.getAchievement() } } else { this.$layer.msg('请先完善个人信息') } }, + // 重新报名选择证件类型 + reselectCardType: function () { + if (this.signedInfo.applyCardType == this.personInfo.cardType) { + this.signedInfo.applyCardNumber = this.personInfo.idCardNumber + this.hasreCardNum = true + } else { + this.signedInfo.applyCardNumber = '' + this.hasreCardNum = false + } + }, // 报名成功返回 successBack: function () { - this.tab = 0 - this.signStep = 0 - this.isSignSuccess = false + // this.tab = 0 + // this.signStep = 0 + // this.isSignSuccess = false + this.$router.go(0) }, // 下一步 nextStep: function () { @@ -1133,10 +1184,10 @@ export default { this.$layer.msg('请选择报考工种') return } - if (this.planType == 0) { - this.$layer.msg('请选择培训类型') - return - } + // if (this.planType == 0) { + // this.$layer.msg('请选择培训类型') + // return + // } this.signStep++ this.getPersonInfo(true) if (this.signStep == 1) { @@ -1168,12 +1219,21 @@ export default { content: '确定选择该培训机构吗?一旦选择确定后无法修改', btn: ['确认', '取消'], yes: function () { + var type + if (self.workSelectedTypeLv2 != 0) { + type = self.workSelectedTypeLv2 + } else if (self.workSelectedTypeLv1 != 0) { + type = self.workSelectedTypeLv1 + } else { + type = self.workSelectedType + } var info = self.signInfo info['applyClassId'] = planId info['applyClassName'] = name info['applyInstitutionId'] = orgId + info['applyWorkTypeId'] = type axios.post(self.signUrl + 'app/apply/save', info,{ - // axios.post('http://192.168.109:8070/signup/app/apply/save', info,{ + // axios.post('http://192.168.120:7009/signup/app/apply/save', info,{ headers: { token: self.token } @@ -1183,6 +1243,7 @@ export default { self.isSignSuccess = true // self.tab = 1 }).catch(function (error) { + self.$layer.closeAll() self.$layer.msg(error.response.data.msg) }) }, @@ -1437,18 +1498,28 @@ export default { catalogId = self.workSelectedTypeLv1 } var info = self.page - info['workerCatalog'] = catalogId - info['planType'] = self.planType - info['applyCardNumber'] = self.signInfo.applyCardNumber + var type + if (self.workSelectedTypeLv2 != 0) { + type = self.workSelectedTypeLv2 + } else if (self.workSelectedTypeLv1 != 0) { + type = self.workSelectedTypeLv1 + } else { + type = self.workSelectedType + } + info['workTypeId'] = type info['keywords'] = self.orgKeywords - axios.get(self.signUrl + 'app/apply/listPageApplyClassPlan', { - // axios.get('http://192.168.0.109:8070/signup/app/apply/listPageApplyClassPlan', { + axios.get(self.signUrl + 'app/apply/list-page-apply-work-type', { + // axios.get('http://192.168.0.120:7009/signup/app/apply/list-page-apply-work-type', { params: info, headers: { token: self.token } }).then(function (res) { + console.log(res) self.isLoading = false + for (let i = 0; i < res.data.rows.length; i++) { + res.data.rows[i].qrCode = 'data:image/jpg;base64,' + res.data.rows[i].qrCode + } self.orgList = res.data.rows self.page.page = res.data.page self.page.totalPage = Math.ceil(res.data.total / self.page.rows) @@ -1507,6 +1578,8 @@ export default { this.getOrgList() } else if (this.tab == 2) { this.getExamList() + } else if (this.tab == 3) { + this.getAchievement() } }, // 查看审核记录 @@ -1540,6 +1613,7 @@ export default { if (!isResign) { self.signedInfo['isDisabled'] = 1 } else { + // self.signedInfo['isDisabled'] = 0 self.showResignBtn = true } self.checkingSigned = true @@ -1559,6 +1633,9 @@ export default { self.showResignBtn = false self.getMyApply() } + }).catch(function (error) { + self.$layer.msg(error.response.data.msg) + self.isLoading = false }) }, // 获取我的考试列表 @@ -1632,6 +1709,7 @@ export default { // 保存个人信息 savePersonInfo: function () { var self = this + console.log(self.personInfo) if (this.personInfo.fullName) { self.isLaoding = true axios.post(self.personUrl + 'app/basic-staff-info/save', self.personInfo, { @@ -1658,6 +1736,7 @@ export default { var formdata = new FormData() formdata.append('image', file) axios.post(self.personUrl + 'app/file/uploadimage', formdata, { + // axios.post('http://192.168.0.109:8070/signup/app/file/uploadimage', formdata, { headers: { token: self.token } @@ -1665,6 +1744,7 @@ export default { self.$layer.msg('上传成功') self.isLaoding = false self.personInfo.userPhotoId = res.data.data + // self.getPersonInfo() }) }, // 报名选择证件类型判断回填 @@ -1684,6 +1764,21 @@ export default { window.print(); window.location.reload() }, 500); + }, + // 获取我的成绩 + getAchievement: function () { + var self = this + axios.get('http://192.168.0.111:8089/signup/app/applystudents/listpage', { + params: self.page, + headers: { + token: self.token + } + }).then(function (res) { + console.log(res) + self.achievementList = res.data.rows + self.page.page = res.data.page + self.page.totalPage = Math.ceil(res.data.total / self.page.rows) + }) } }, mounted: function () { @@ -1777,14 +1872,13 @@ export default { cursor pointer .person-info float right - margin-top 5px a display inline-block font-size 16px color #fff margin-right 30px - line-height 20px - height 20px + line-height 60px + height 60px &.user-name i background url("~@/assets/images/icon_aggregate1.png") no-repeat left top @@ -1792,7 +1886,7 @@ export default { display inline-block width 17px height 20px - vertical-align top + vertical-align middle margin-right 5px &.back padding-right 30px @@ -1804,7 +1898,7 @@ export default { display inline-block width 19px height 20px - vertical-align top + vertical-align middle margin-right 5px &.logout i @@ -1813,7 +1907,7 @@ export default { display inline-block width 17px height 16px - vertical-align top + vertical-align middle margin-right 5px .content width 1200px @@ -1830,7 +1924,7 @@ export default { margin-top 10px cursor pointer &:first-child - background url("~@/assets/images/center-tab6.png") no-repeat + background url("~@/assets/images/center-tab1.png") no-repeat background-size 100% 100% &.active background url("~@/assets/images/center-tab1-on.png") no-repeat @@ -2083,6 +2177,15 @@ export default { color #000 span font-weight bold + &.count + font-weight normal + margin-right 10px + &.type1 + color #4184dd + &.type2 + color orange + &.type3 + color green button border none outline none @@ -2108,13 +2211,36 @@ export default { margin 20px 0 .signed-box overflow hidden - border #e8e8e8 solid 1px + box-shadow 0 0 10px #eee position relative - margin-bottom 10px + margin-bottom 20px .signed-left width 100% - padding 25px 30px + padding 0 30px 25px box-sizing border-box + position relative + .status + position absolute + top 0 + left 0 + width 110px + height 40px + border-top-left-radius 5px + border-bottom-right-radius 20px + text-align center + line-height 40px + color #fff + &.complete + background #4184dd + &.wait + background #5bd9f0 + &.error + background #f6704d + h3 + font-size 18px + color #333 + line-height 40px + margin-left 95px table table-layout fixed width 100% @@ -2122,6 +2248,14 @@ export default { height 35px font-size 16px color #000 + span + margin-right 10px + &.type1 + color #4184dd + &.type2 + color orange + &.type3 + color green button width 100px height 35px @@ -2319,6 +2453,8 @@ export default { font-size 16px color #000 height 40px + vertical-align top + line-height 40px &:nth-child(odd) text-align right &:nth-child(even) @@ -2349,6 +2485,7 @@ export default { text-align center padding 20px 0 background #fff + min-width 1200px p font-size 16px color #333 @@ -2400,7 +2537,7 @@ export default { width 16px height 16px border-radius 50% - border 1px solid greenyellow + border 1px solid greenorange position absolute background #fff top 0 diff --git a/src/pages/Print/Print.vue b/src/pages/Print/Print.vue deleted file mode 100644 index ec90fbd..0000000 --- a/src/pages/Print/Print.vue +++ /dev/null @@ -1,28 +0,0 @@ - -
- ![]()
-
-
-
-
-
-
diff --git a/src/pages/Register/Register.vue b/src/pages/Register/Register.vue
index 9d9062e..f918476 100644
--- a/src/pages/Register/Register.vue
+++ b/src/pages/Register/Register.vue
@@ -19,19 +19,15 @@