@@ -132,14 +132,6 @@ export default {
return form;
},
rules() {
- var validatePhone = (rule, value, callback) => {
- const myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1}))+\d{8})$/;
- if (myreg.test(value)) {
- callback();
- } else {
- callback(new Error('电话号码格式不正确'));
- }
- };
return {
name: [
{ required: true, message: '请填写名字', trigger: 'blur' }
@@ -149,8 +141,7 @@ export default {
{ validator: this.validateNumberId, trigger: 'blur' }
],
phone:[
- { required: true, message: '请填写电话', trigger: 'blur' },
- { validator: validatePhone, trigger: 'blur' }
+ { required: true, message: '请填写电话', trigger: 'blur' }
],
phoneCode:[
{ required: true, message: '请填写验证码', trigger: 'blur' }
@@ -332,16 +323,19 @@ export default {
token: md5(pass)
};
try {
- this.mobileCodeTime = 30;
- this.mobileTime = setInterval(() => {
- this.mobileCodeTime--;
- if (this.mobileCodeTime <= 0) {
- this.mobileCodeTime = 0;
- clearInterval(this.mobileTime);
- this.mobileTime = null;
- }
- }, 1000);
- await getUserinfoMobileCode(param);
+
+ const res = await getUserinfoMobileCode(param);
+ if (res.code == 200) {
+ this.mobileCodeTime = 30;
+ this.mobileTime = setInterval(() => {
+ this.mobileCodeTime--;
+ if (this.mobileCodeTime <= 0) {
+ this.mobileCodeTime = 0;
+ clearInterval(this.mobileTime);
+ this.mobileTime = null;
+ }
+ }, 1000);
+ }
} catch (error) {
this.$message.info(this.$t('global.codeFaile'));
}
diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index 4b6f56d77..590079c65 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -42,7 +42,6 @@
{{ $t('exam.startTheExam') }}
- {{ $t('global.back') }}
@@ -51,10 +50,7 @@
+
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 2e2bc3e88..1d6254ccc 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -337,7 +337,9 @@ export default {
removeSessionStorage('againEnter');
if (this.$route.query.raceId) {
getIsSignUp(this.$route.query.raceId).then(res => {
- this.$router.push({ path: this.path });
+ if (res.data) {
+ this.$router.push({ path: this.path });
+ }
}).catch(() => {
this.$messageBox('您未报名该竞赛，所以无法进入竞赛系统');
});
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index fe2c820f0..fba08bd23 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -1,7 +1,7 @@
@@ -387,8 +386,8 @@ export default {
try {
await loadNewMapDataByGroup(this.group);
await this.$store.dispatch('training/setMapDefaultState');
- if(this.userRole == "MAINTAINER"){
- this.jl3dmaintainershow = true;
+ if (this.userRole == 'MAINTAINER') {
+ this.jl3dmaintainershow = true;
}
} catch (error) {
this.$messageBox(this.$t('error.getMapDataFailed'));
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index c81de0c09..5698d73eb 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -10,7 +10,7 @@
{{ $t('joinTraining.exitPlan') }}
- 开始
+
结束
{{ $t('global.back') }}
@@ -298,10 +298,17 @@ export default {
}).then(() => {
participantCompleteCompetition(1, this.group).then(resp => {
this.$router.go(-1);
+ // this.submit();
}).catch(()=> {
this.$message.success('提交试卷失败！');
});
});
+ },
+ submit() {
+ // this.$store.dispatch('exam/over').then(() => {
+ // this.$store.dispatch('trainingList/clearTrainingList');
+ this.$router.replace({ path: `/jsxt/result/${this.$route.query.userExamId}`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId } });
+ // });
}
}
};
diff --git a/vue.config.js b/vue.config.js
index 21c947aba..00c399378 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -33,7 +33,6 @@ module.exports = {
productionSourceMap: false, // 项目打包后是否压缩
devServer: {
port: port,
- // open: true,
hotOnly: true,
overlay: {
warnings: false,
@@ -49,8 +48,7 @@ module.exports = {
// ['^' + process.env.VUE_APP_BASE_API]: ''
// }
// }
- // },
- // after: require('./mock/mock-server.js')
+ // }
},
// css: {
// extract: true, // 是否使用css分离插件 ExtractTextPlugin
@@ -87,19 +85,10 @@ module.exports = {
// // 为开发环境修改配置...
// config.mode = 'development';
// }
- // if (process.env.NODE_ENV !== 'development') {
- // config.plugins.push(new CompressionPlugin({
- // filename: '[path].gz[query]',
- // algorithm: 'gzip',
- // test:/\.js$|\.html$|.\css/, // 匹配文件名
- // threshold: 10240, // 对超过10k的数据压缩
- // minRatio: 0.8, // 只有压缩好这个比率的资产才能被处理
- // deleteOriginalAssets: true
- // }));
- // }
config.name = name;
config.resolve = {
extensions: ['.js', '.vue', '.json'],
+ modules: [path.resolve(__dirname, './node_modules')],
alias: { // 添加别名
'@': path.resolve('src')
}
@@ -132,7 +121,7 @@ module.exports = {
// // 修复HMR
// config.resolve.symlinks(true);
config.plugins.delete('preload'); // TODO: need test
- config.plugins.delete('prefetch'); // 移除 prefetch 插件
+ config.plugins.delete('prefetch'); // 移除 prefetch 插件 预先加载模块
// set svg-sprite-loader
config.module
@@ -181,47 +170,68 @@ module.exports = {
.end();
config
.optimization.splitChunks({
- chunks: 'all',
+ chunks: 'all', // async表示抽取异步模块，all表示对所有模块生效，initial表示对同步模块生效
cacheGroups: {
- libs: {
- name: 'chunk-libs',
- test: /[\\/]node_modules[\\/]/,
- priority: 10,
- chunks: 'initial' // only package third parties that are initially dependent
- },
- // elementUI: {
- // name: 'chunk-elementUI', // split elementUI into a single package
- // priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
- // test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+ // libs: {
+ // name: 'chunk-libs',
+ // test: /[\\/]node_modules[\\/]/,
+ // priority: -10,
+ // chunks: 'initial' // only package third parties that are initially dependent
// },
- commons: {
- name: 'chunk-commons',
- test: path.resolve('src/components'), // can customize your rules
- minChunks: 3, // minimum common number
- priority: 5,
+ vendors: {
+ test: /[\\/]node_modules[\\/]/,
+ name: 'vendor', // 要缓存的 分隔出来的 chunk 名称
+ priority: -10 // 缓存组优先级 数字越⼤大，优先级越⾼高
+ },
+ elementUI: {
+ name: 'elementUI',
+ test: /element-ui/,
+ // minChunks: 1,
+ priority: -10,
+ chunks: 'all'
+ },
+ xlsx: {
+ name: 'xlsx',
+ test: /xlsx/,
+ // minChunks: 1,
+ priority: -10,
+ chunks: 'all'
+ },
+ zrender: {
+ name: 'zrender',
+ test: /zrender/,
+ // minChunks: 1,
+ priority: -10,
+ chunks: 'all'
+ },
+ jmap: {
+ name: 'jmap',
+ test: path.resolve(__dirname, './src/jmap'),
+ priority: -10,
+ minChunks: 1,
+ reuseExistingChunk: true // 可设置是否重⽤用该chunk
+ },
+ jmapNew: {
+ name: 'jmapNew',
+ test: path.resolve(__dirname, './src/jmapNew'),
+ priority: -20,
+ minChunks: 1,
+ reuseExistingChunk: true
+ },
+ jlmap3d: {
+ name: 'jlmap3d',
+ test: path.resolve(__dirname, './src/jlmap3d'),
+ priority: -10,
+ minChunks: 1,
+ reuseExistingChunk: true
+ },
+ ibp: {
+ name: 'ibp',
+ test: path.resolve(__dirname, './src/ibp'),
+ priority: -10,
+ minChunks: 1,
reuseExistingChunk: true
}
- // jmap: {
- // name: 'chunk-jmap',
- // test: resolve('src/jmap'), // can customize your rules
- // minChunks: 3, // minimum common number
- // priority: 5,
- // reuseExistingChunk: true
- // },
- // jlmap3d: {
- // name: 'chunk-jlmap3d',
- // test: resolve('src/jlmap3d'), // can customize your rules
- // minChunks: 3, // minimum common number
- // priority: 5,
- // reuseExistingChunk: true
- // },
- // ibp: {
- // name: 'chunk-ibp',
- // test: resolve('src/ibp'), // can customize your rules
- // minChunks: 3, // minimum common number
- // priority: 5,
- // reuseExistingChunk: true
- // }
}
});
config.optimization.runtimeChunk('single');
From 9827e8aae8389e382dfcdba8d9ad1f9fea43c390 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 21 May 2020 15:03:42 +0800
Subject: [PATCH 23/65] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=88=E8=BE=BE=20?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 2 +-
src/scripts/ProjectConfig.js | 6 ++++++
src/store/modules/permission.js | 2 --
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.env.development b/.env.development
index 5748d0aa5..535c20d5e 100644
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,6 @@
# just a flag
NODE_ENV = 'development'
-VUE_APP_PRO = 'local'
+# VUE_APP_PRO = 'local'
# base api
# VUE_APP_BASE_API = 'https://joylink.club/jlcloud'
diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index 3b04d9b1c..0c952a264 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -104,6 +104,12 @@ export const goOtherPlatformMenu = { // 导航栏快速切换平台
designxadt: '/xadt/login'
};
export const PermissionParam = { // 路径权限处理所需参数配置（跳转白名单&路径正则匹配&clientId）
+ hyd: {
+ systemType: '011'
+ },
+ designhyd: {
+ systemType: '011'
+ },
login: {
systemType: '011'
},
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index ea1eec9a9..ee75ac2d9 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -91,8 +91,6 @@ const permission = {
const routeList = resetAsyncRouter(PermissionParam[getSessionStorage('project')]);
const accessedRouters = filterAsyncRouter(routeList, roles);
- console.log(accessedRouters);
- debugger;
accessedRouters.forEach(route => {
if (route.children && route.children.length == 0) {
route.hidden = true;
From 81973b69678772cfa6f49d7f7c209da2cfe69963 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 21 May 2020 15:18:00 +0800
Subject: [PATCH 24/65] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9E=E6=93=8D?=
=?UTF-8?q?=E8=80=83=E8=AF=95=20=E7=BB=93=E6=9D=9F=E7=94=9F=E6=88=90?=
=?UTF-8?q?=E5=88=86=E5=80=BC=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/index_Common.js | 4 +-
src/views/jsxt/competition/examDetail.vue | 4 +-
src/views/jsxt/competition/result.vue | 47 ++++++++++---------
.../newMap/jointTrainingNew/menuDemon.vue | 6 +--
4 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/src/router/index_Common.js b/src/router/index_Common.js
index 80aca8e5d..63005db1b 100644
--- a/src/router/index_Common.js
+++ b/src/router/index_Common.js
@@ -128,12 +128,12 @@ const CompetitionDetail = () => import('@/views/jsxt/competition/examDetail');
const CompetitionManage = () => import('@/views/jsxt/competition/index');
const CompetitionHome = () => import('@/views/jsxt/competition/home');
const Refereedetail = () => import('@/views/jsxt/competition/theory/quiz/index');
+const JsxtExamResult = () => import('@/views/jsxt/competition/result');
const JsxtApply = () => import('@/views/jsxt/apply/index');
// const theoryManage = () => import('@/views/jsxt/competition/theory/index');
const RefereeList = () => import('@/views/jsxt/refereeList/index');
const homeJsxt = () => import('@/views/jsxt/home/index');
const RecaList = () => import('@/views/jsxt/reca/list');
-const JsxtExamResult = () => import('@/views/jsxt/competition/result');
import { GenerateRouteProjectList } from '@/scripts/ProjectConfig';
import { getSessionStorage } from '@/utils/auth';
@@ -1005,7 +1005,7 @@ export const JSXT = [
}
},
{ // 考试结果
- path: 'result/:userExamId',
+ path: 'result',
component: JsxtExamResult,
hidden: true
}
diff --git a/src/views/jsxt/competition/examDetail.vue b/src/views/jsxt/competition/examDetail.vue
index 590079c65..1d28941f2 100644
--- a/src/views/jsxt/competition/examDetail.vue
+++ b/src/views/jsxt/competition/examDetail.vue
@@ -5,7 +5,7 @@