diff --git a/src/assets/img/screen/jt.png b/src/assets/img/screen/jt.png new file mode 100644 index 0000000..1eb5cb0 Binary files /dev/null and b/src/assets/img/screen/jt.png differ diff --git a/src/assets/img/screen/lbx.png b/src/assets/img/screen/lbx.png new file mode 100644 index 0000000..cefb215 Binary files /dev/null and b/src/assets/img/screen/lbx.png differ diff --git a/src/assets/img/screen/map.png b/src/assets/img/screen/map.png new file mode 100644 index 0000000..2138288 Binary files /dev/null and b/src/assets/img/screen/map.png differ diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue index d2af71d..5c8c402 100644 --- a/src/pages/account/login/index.vue +++ b/src/pages/account/login/index.vue @@ -149,14 +149,16 @@ export default { this.$refs.login.validate(valid => { if (valid) { this.$post(this.api.logins, this.form).then(res => { - this.token = res.data.token - this.setLogin() - }).catch(res => { // 如果没有绑定手机号 - if (res && res.status == 30001) this.phoneVisible = true - this.getVerImg() - this.form.code = '' - }) + if (res && res.status == 30001) { + this.phoneVisible = true + this.getVerImg() + this.form.code = '' + } else { + this.token = res.data.token + this.setLogin() + } + }).catch(res => {}) } }) }, diff --git a/src/pages/screen/list/index.vue b/src/pages/screen/list/index.vue index d360a33..9d53f5e 100644 --- a/src/pages/screen/list/index.vue +++ b/src/pages/screen/list/index.vue @@ -152,7 +152,7 @@ -
+
@@ -177,6 +177,11 @@ 主要央行利率
+
+ + + +
@@ -788,7 +793,7 @@ export default { trigger: 'axis' }, grid: { - left: '18%', + left: '80', right: '12%', bottom: '12%' }, @@ -1114,7 +1119,7 @@ export default { // 视觉映射组件 visualMap: { type: 'continuous', // continuous 类型为连续型 piecewise 类型为分段型 - show: true, // 是否显示 visualMap-continuous 组件 如果设置为 false,不会显示,但是数据映射的功能还存在 + show: false, // 是否显示 visualMap-continuous 组件 如果设置为 false,不会显示,但是数据映射的功能还存在 // 指定 visualMapContinuous 组件的允许的最小/大值。'min'/'max' 必须用户指定。 // [visualMap.min, visualMax.max] 形成了视觉映射的『定义域』 min: 0, @@ -1125,10 +1130,9 @@ export default { color: '#fff' }, realtime: false, // 拖拽时,是否实时更新 - calculable: true, // 是否显示拖拽用的手柄 // 定义 在选中范围中 的视觉元素 inRange: { - color: ['#9fb5ea', '#e6ac53', '#74e2ca', '#85daef', '#9feaa5', '#5475f5'] // 图元的颜色 + color: ['#337cfd', '#e6ac53', '#74e2ca', '#85daef', '#9feaa5', '#5475f5'] // 图元的颜色 } }, series: [ diff --git a/src/pages/setting/person/info.vue b/src/pages/setting/person/info.vue index bdc339a..c92fd5e 100644 --- a/src/pages/setting/person/info.vue +++ b/src/pages/setting/person/info.vue @@ -130,7 +130,8 @@
  • - 更换 + {{ form.phone ? '更换' : '绑定' }} + 解绑
  • @@ -534,6 +535,17 @@ export default { bindPhone() { this.phoneVisible = true }, + // 解绑手机号 + unbind() { + this.$confirm('确定要解绑该手机号吗?', '提示', { + type: 'warning' + }).then(() => { + this.$get(this.api.unbindMobilePhone).then(res => { + this.$message.success('解绑成功') + this.getdata() + }).catch(res => {}) + }).catch(() => {}) + }, bindPassword() { this.passwordVisible = true }, diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue index 68a94df..84d9e41 100644 --- a/src/pages/user/list/index.vue +++ b/src/pages/user/list/index.vue @@ -337,7 +337,7 @@ export default { renderAccount() { const form = this.form // 平台id-端id-schoolId-workNumber组成账号 - form.account = `${Setting.platformId}-2-${this.schoolId}-${form.workNumber}` + form.account = `${Setting.platformId}-${Setting.platformType}-${this.schoolId}-${form.workNumber}` }, workNumberChange(){ if(this.form.workNumber && this.form.workNumber !== this.originalWorkNumber){ diff --git a/src/setting.js b/src/setting.js index b55efa9..9d51787 100644 --- a/src/setting.js +++ b/src/setting.js @@ -52,6 +52,10 @@ const Setting = { * 所属平台:1->职站 2->数据平台 3->中台 */ platformId: 2, + /** + * 平台端区分:0->教师端 1->学生端 2->无端 + */ + platformType: 2, /** * 多语言配置 * */ diff --git a/src/styles/page/screen.scss b/src/styles/page/screen.scss index 62a5247..26eef98 100644 --- a/src/styles/page/screen.scss +++ b/src/styles/page/screen.scss @@ -77,6 +77,60 @@ right: -3px; bottom: -3px; } + .earth { + z-index: 0; + position: absolute; + width: 100%; + height: 100%; + overflow: hidden; + img { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + opacity: .4; + } + .lbx { + z-index: 2; + max-width: 95%; + max-height: 95%; + animation: rotate 15s linear infinite; + } + .jt { + z-index: 3; + max-width: 90%; + max-height: 90%; + opacity: .3; + animation: rotate-reverse 15s linear infinite; + } + .map { + z-index: 1; + max-width: 85%; + max-height: 85%; + } + } + @keyframes rotate { + 0% { + transform: translate(-50%, -50%) rotate(0); + } + 50% { + transform: translate(-50%, -50%) rotate(180deg); + } + 100% { + transform: translate(-50%, -50%) rotate(360deg); + } + } + @keyframes rotate-reverse { + 0% { + transform: translate(-50%, -50%) rotate(0360deg); + } + 50% { + transform: translate(-50%, -50%) rotate(180deg); + } + 100% { + transform: translate(-50%, -50%) rotate(0); + } + } } .main_table { width: 100%;