From 99e0ca9b5737287f71d57ec6731d765d94acd716 Mon Sep 17 00:00:00 2001 From: Jo <479214531@qq.com> Date: Fri, 19 Nov 2021 00:16:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=9B=BE=E8=A1=A8=E3=80=81=E6=96=B0=E5=A2=9E=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=8F=AA=E8=83=BD=E7=BA=AF?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E7=AD=89=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/account/login/index.vue | 2 +- src/pages/data/list/index.vue | 11 +++++++++-- src/pages/stat/list/index.vue | 24 ++++++++++++++++++++++-- src/pages/user/list/index.vue | 24 ++++++++++++------------ 4 files changed, 44 insertions(+), 17 deletions(-) diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue index 3c1371b..282f862 100644 --- a/src/pages/account/login/index.vue +++ b/src/pages/account/login/index.vue @@ -33,7 +33,7 @@ - +

依据国家政策法规，需绑定手机号进行网络实名才可登录使用本平台

diff --git a/src/pages/data/list/index.vue b/src/pages/data/list/index.vue index 2471a88..8ee4424 100644 --- a/src/pages/data/list/index.vue +++ b/src/pages/data/list/index.vue @@ -331,7 +331,14 @@ export default { }) this.listData = list this.total = res.pageList.total - }).catch(res => { }) + if (this.$route.query.preview) { + this.preview({ + id: this.$route.query.id, + name: this.$route.query.name + }) + this.$router.replace('list') + } + }).catch(res => {}) }, initData() { this.page = 1 @@ -389,7 +396,7 @@ export default { previewCurrentChange(val) { this.currentRow = val }, - preview(row, isDefault) { + preview(row) { this.$get(`${this.api.previewData}?tableName=${row.name}&tableId=${row.id}`).then(res => { // 查询次数+1 this.$post(this.api.saveRecord, { diff --git a/src/pages/stat/list/index.vue b/src/pages/stat/list/index.vue index 99a2dfa..d028cf5 100644 --- a/src/pages/stat/list/index.vue +++ b/src/pages/stat/list/index.vue @@ -97,7 +97,11 @@ - + + + @@ -218,12 +222,13 @@ export default { for(let n in list[i]){ let item = { year: i, - type: n, + type: n } result.push(item) } } this.yearLen = len + // debugger this.monthData = result this.$nextTick(() => { this.initChart(list) @@ -539,6 +544,21 @@ export default { } } } + .meta:after { + content: ''; + display: inline-block; + width: 12px; + height: 12px; + margin-left: 5px; + vertical-align: middle; + background-color: #55D3DE; + } + /deep/.el-table__body-wrapper tr:nth-child(2n) .meta:after { + background-color: #7ED321; + } + /deep/.el-table__body-wrapper tr:nth-child(3n) .meta:after { + background-color: #1A78F6; + } .chart{ width: calc(100% - 240px); height: 132px; diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue index 8e7937c..88a7c99 100644 --- a/src/pages/user/list/index.vue +++ b/src/pages/user/list/index.vue @@ -216,13 +216,13 @@ export default { trigger: 'blur' } ], - // phone: [ - // { - // pattern: /^1[3456789]\d{9}$/, - // message: '请输入正确的手机号', - // trigger: 'blur' - // } - // ], + phone: [ + { + pattern: /^1[3456789]\d{9}$/, + message: '请输入正确的手机号', + trigger: 'blur' + } + ], email: [ { pattern: /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/, @@ -338,7 +338,7 @@ export default { }).catch(() => {}) }, accountChange(){ - if(this.form.account !== this.originalAccount){ + if(this.form.account && this.form.account !== this.originalAccount){ // type: 0：教师端，1：学生端，2：无端 this.$post(`${this.api.checkAccount}?account=${this.form.account}&type=2&platformId=${Setting.platformId}${this.form.accountId ? '&accountId=' + this.form.accountId : ''}`).then(res => { this.accountRepeat = false @@ -350,7 +350,7 @@ export default { } }, workNumberChange(){ - if(this.form.workNumber !== this.originalWorkNumber){ + if(this.form.workNumber && this.form.workNumber !== this.originalWorkNumber){ this.$post(`${this.api.checkAccount}?workNumber=${this.form.workNumber}&type=2&platformId=${Setting.platformId}`).then(res => { this.workNumberRepeat = false }).catch(res => { @@ -361,7 +361,7 @@ export default { } }, phoneChange(){ - if(this.form.phone !== this.originalPhone){ + if(this.form.phone && this.form.phone !== this.originalPhone){ this.$post(`${this.api.checkEmailOrPhone}?phone=${this.form.phone}${this.form.accountId ? '&accountId=' + this.form.accountId : ''}`).then(res => { this.phoneRepeat = false }).catch(res => { @@ -372,7 +372,7 @@ export default { } }, emailChange(){ - if(this.form.email !== this.originalEmail){ + if(this.form.email && this.form.email !== this.originalEmail){ this.$post(`${this.api.checkEmailOrPhone}?email=${this.form.email}${this.form.accountId ? '&accountId=' + this.form.accountId : ''}`).then(res => { this.emailRepeat = false }).catch(res => { @@ -406,7 +406,7 @@ export default { accountId, userName: data.userName, roleIds: data.roleId.map(e => e.roleId), - phone: data.phone ? data.phone : '暂未绑定', + phone: data.phone, workNumber: data.workNumber, email: data.email, schoolId: data.schoolId,