Skip to content

P
publich5
提交 0150805b authored 作者: 陶然's avatar 陶然
浏览文件
操作

change times

上级 345fa5a6
隐藏空白字符变更
内嵌 并排
正在显示 包含 114 行增加 和 86 行删除
config/dev.env.js
浏览文件 @ 0150805b
......@@ -3,7 +3,7 @@ const merge = require('webpack-merge')
const prodEnv = require('./prod.env')
module.exports = merge(prodEnv, {
NODE_ENV: '"development"',
BASE_API: '"/api/"'
// BASE_API: '"http://192.168.2.242:8996"'
})
NODE_ENV: '"development"',
BASE_API: '"/api/"'
// BASE_API: '"http://192.168.2.242:8996"'
})
\ No newline at end of file
config/index.js
浏览文件 @ 0150805b
......@@ -5,75 +5,75 @@
const path = require('path')
module.exports = {
dev: {
// Paths
assetsSubDirectory: 'static',
assetsPublicPath: '/',
proxyTable: {
'/api': {
target: 'http://192.168.2.242:8996',//后端接口地址
// target: 'http://122.14.50.6:2018',//后端接口地址
changeOrigin: true,//是否允许跨越
pathRewrite: {
'^/api': '',//重写,
}
}
dev: {
// Paths
assetsSubDirectory: 'static',
assetsPublicPath: '/',
proxyTable: {
'/api': {
target: 'http://192.168.2.242:8996', //后端接口地址
// target: 'http://122.14.50.6:2018',//后端接口地址
changeOrigin: true, //是否允许跨越
pathRewrite: {
'^/api': '', //重写,
}
}
},
// Various Dev Server settings
host: 'localhost', // can be overwritten by process.env.HOST
port: 8082, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false,
errorOverlay: true,
notifyOnErrors: true,
poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
/**
* Source Maps
*/
// https://webpack.js.org/configuration/devtool/#development
devtool: 'cheap-module-eval-source-map',
// If you have problems debugging vue-files in devtools,
// set this to false - it *may* help
// https://vue-loader.vuejs.org/en/options.html#cachebusting
cacheBusting: true,
cssSourceMap: true
},
// Various Dev Server settings
host: '192.168.2.64', // can be overwritten by process.env.HOST
port: 8082, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false,
errorOverlay: true,
notifyOnErrors: true,
poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
/**
* Source Maps
*/
// https://webpack.js.org/configuration/devtool/#development
devtool: 'cheap-module-eval-source-map',
// If you have problems debugging vue-files in devtools,
// set this to false - it *may* help
// https://vue-loader.vuejs.org/en/options.html#cachebusting
cacheBusting: true,
cssSourceMap: true
},
build: {
// Template for index.html
index: path.resolve(__dirname, '../dist/index.html'),
// Paths
assetsRoot: path.resolve(__dirname, '../dist'),
assetsSubDirectory: 'static',
assetsPublicPath: './',
/**
* Source Maps
*/
productionSourceMap: true,
// https://webpack.js.org/configuration/devtool/#production
devtool: '#source-map',
// Gzip off by default as many popular static hosts such as
// Surge or Netlify already gzip all static assets for you.
// Before setting to `true`, make sure to:
// npm install --save-dev compression-webpack-plugin
productionGzip: false,
productionGzipExtensions: ['js', 'css'],
// Run the build command with an extra argument to
// View the bundle analyzer report after build finishes:
// `npm run build --report`
// Set to `true` or `false` to always turn it on or off
bundleAnalyzerReport: process.env.npm_config_report
}
}
build: {
// Template for index.html
index: path.resolve(__dirname, '../dist/index.html'),
// Paths
assetsRoot: path.resolve(__dirname, '../dist'),
assetsSubDirectory: 'static',
assetsPublicPath: './',
/**
* Source Maps
*/
productionSourceMap: true,
// https://webpack.js.org/configuration/devtool/#production
devtool: '#source-map',
// Gzip off by default as many popular static hosts such as
// Surge or Netlify already gzip all static assets for you.
// Before setting to `true`, make sure to:
// npm install --save-dev compression-webpack-plugin
productionGzip: false,
productionGzipExtensions: ['js', 'css'],
// Run the build command with an extra argument to
// View the bundle analyzer report after build finishes:
// `npm run build --report`
// Set to `true` or `false` to always turn it on or off
bundleAnalyzerReport: process.env.npm_config_report
}
}
\ No newline at end of file
package-lock.json
浏览文件 @ 0150805b
......@@ -1617,6 +1617,7 @@
"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
"integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
"dev": true,
"optional": true,
"requires": {
"hoek": "2.x.x"
}
......@@ -4778,7 +4779,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
......@@ -4799,12 +4801,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -4825,7 +4829,8 @@
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
......@@ -4976,6 +4981,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -4983,12 +4989,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
......@@ -5007,6 +5015,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -5100,6 +5109,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -5185,7 +5195,8 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
......@@ -5241,6 +5252,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
......@@ -5284,12 +5296,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
}
}
},
......@@ -5722,7 +5736,8 @@
"version": "2.16.3",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
"integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
"dev": true
"dev": true,
"optional": true
},
"home-or-tmp": {
"version": "2.0.0",
......
src/views/moonMatch/match.vue
浏览文件 @ 0150805b
......@@ -245,7 +245,7 @@ export default {
try{
let result = await this.getPaperStatus()
this.createPaperId = result.testPaperId
this.getDetail(result.status,result.endTime)
this.getDetail(result.status,result.endTime,result.effective,result.paperEndTime)
}catch(error) {
}
}
......@@ -298,7 +298,7 @@ export default {
})
})
},
getDetail(status,time){
getDetail(status,time,effective,paperEndTime){
this.toastPage = Toast.loading({
message: '加载中...',
forbidClick: true,
......@@ -324,8 +324,14 @@ export default {
if(status){ // true 继续答题 false 开始或者重新答题
this.currentIndex = this.resetList(this.list) -1
this.nextQues()
let times = ''
if(effective == 1){//1-有有效时间- 0--永久有效无有效时间
times = paperEndTime >= time ? time : paperEndTime
} else{
times = time
}
this.setInter = setInterval(()=> {
this.lastTime = this.leftTimer(time)
this.lastTime = this.leftTimer(times)
if(this.lastTime == '00:00'){
this.hasDown()
}
......@@ -460,7 +466,12 @@ export default {
} else{
this.createPaperId = data.id
this.createPaper.id = this.createPaperId
let time = data.endtime
let time = ''
if(data.effective == 1){//1-有有效时间- 0--永久有效无有效时间
time = data.paperEndTime >= data.endtime ? data.endtime : data.paperEndTime
} else{
time = data.endtime
}
this.setInter = setInterval(()=> {
this.lastTime = this.leftTimer(time)
if(this.lastTime == '00:00'){
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论