-
{{ '测验得分：' }}{{ resultScore+' 分' }}
-
错题列表
-
+
+
{{ '测验得分：' }}{{ resultScore+' 分' }}
+
错题列表
{{ covertWrong() }}
@@ -98,6 +98,10 @@
+
+
+
{{ '测验得分：' }}{{ resultScore+' 分' }}
+
@@ -293,10 +297,20 @@ export default {
this.theoryExamWrongList = writeList.filter(wrong=>{
return wrong.correct == false;
});
- this.resultScore = writeList.reduce((prev, cur, index, arr)=>{
- return prev.score == undefined ? prev + cur.score : prev.score + cur.score;
- });
- this.getWrongDataOption();
+ if (writeList.length > 0) {
+ if (writeList.length >= 2) {
+ this.resultScore = writeList.reduce((prev, cur, index, arr)=>{
+ return prev.score == undefined ? prev + cur.score : prev.score + cur.score;
+ });
+ } else {
+ this.resultScore = writeList[0].score;
+ }
+ } else {
+ this.resultScore = 0;
+ }
+ if (this.theoryExamWrongList.length > 0) {
+ this.getWrongDataOption();
+ }
}).catch(()=>{
this.$message.error('提交失败，请稍后再试');
@@ -419,6 +433,8 @@ export default {
overflow:auto;
padding-left: 10px;
width: 256px;
+ border: 1px #ececec solid;
+ border-radius: 5px;
}
.eachQuestionNum{
color: #8f7f70;
@@ -524,6 +540,17 @@ export default {
margin-top: 10px;
font-size: 15px;
}
+.theoryExamScore1{
+ text-align: center;
+ font-size: 17px;
+ margin-top: 20px;
+}
+.theoryExamEnd{
+ font-size: 90px;
+ color: #007b00;
+ margin-left: 340px;
+ margin-top: 115px;
+}
.theoryExamWrongList{}
.theoryExamWrongListL{
width: 500px;
diff --git a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
index 12dd29bff..ac58490b5 100644
--- a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
+++ b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
@@ -1,5 +1,6 @@
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import store from '@/store/index_APP_TARGET';
+import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config';
// 操作
export const operateEnum = {
Set_Fault:{
@@ -146,7 +147,28 @@ export const operateEnum = {
// 转换函数
export function covertOperate(operationType, operationParamMap) {
if (operationType == 'Set_Fault' || operationType == 'Cancel_Fault') {
- // covertOperation(operationType);
+ let deviceName = '';
+ const device = store.getters['map/getDeviceByCode'](operationParamMap.code);
+ if (device._type == 'StationStand') {
+ const station = store.getters['map/getDeviceByCode'](device.stationCode);
+ deviceName += '【车站-' + station.name + '】/';
+ } else {
+ deviceName = '' + device.name;
+ }
+ let tip = '请找到' + deviceType[device._type] + deviceName + ',';
+ if (operationType == 'Set_Fault') {
+ tip += '设置故障,';
+ } else {
+ tip += '取消故障,';
+ }
+ const data = deviceFaultType[device._type];
+ data.forEach(each=>{
+ if (each.value == operationParamMap.faultType) {
+ tip += '参数为:' + each.label;
+ }
+ });
+ return tip;
+
} else {
let device = operationType.split('_')[0];
if (device == 'CM') {
From 4eab63d1f34696b642b7082a395f86174e438906 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 28 Sep 2020 16:32:33 +0800
Subject: [PATCH 29/53] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=89=93=E5=8C=85?=
=?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/index_Common.js | 1 +
src/views/login/index.vue | 4 ++--
vue.config.js | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/router/index_Common.js b/src/router/index_Common.js
index 9263ac1f8..7eef8d620 100644
--- a/src/router/index_Common.js
+++ b/src/router/index_Common.js
@@ -1214,6 +1214,7 @@ export const JSXT = [
}
];
const createRouter = () => new Router({
+ base: '/cbtc/',
mode: 'history', // require service support
scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 9261fdb05..922433159 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -213,7 +213,7 @@ export default {
versionBaseNoShow: VersionBaseNoShow,
mainBodyNoShow: MainBodyNoShow,
noQrcodeList: NoQrcodeList,
- expirationDate: 1605488400000,
+ expirationDate: 1606784400000,
countdown: null,
days: [0, 0, 0],
gameOver: false,
@@ -581,7 +581,7 @@ export default {
if (difference <= 0) {
this.gameOver = true;
}
- const day = Math.floor(difference / (24 * 60 * 60 * 1000));
+ const day = Math.ceil(difference / (24 * 60 * 60 * 1000));
this.days.push(Math.floor(day / 100));
this.days.push(Math.floor((day % 100) / 10));
this.days.push(day % 10);
diff --git a/vue.config.js b/vue.config.js
index f56070b32..73f199c82 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -21,8 +21,8 @@ module.exports = {
* In most cases please use '/' !!!
* Detail: https://cli.vuejs.org/config/#publicpath
*/
- publicPath: '/',
- outputDir: 'dist',
+ publicPath: '/cbtc',
+ outputDir: 'dist/cbtc',
assetsDir: 'static', // 相对于outputDir的静态资源(js、css、img、fonts)目录
lintOnSave: false,
productionSourceMap: false, // 项目打包后是否压缩
From 2f051be6e9580f48af7359ec80a0dc4b26dab7d6 Mon Sep 17 00:00:00 2001
From: program-walker <418875866@qq.com>
Date: Mon, 28 Sep 2020 17:54:54 +0800
Subject: [PATCH 30/53] =?UTF-8?q?=E4=BF=AE=E6=94=B9Jenkins=E6=89=93?=
=?UTF-8?q?=E5=8C=85=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Jenkinsfile-test | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile-test b/Jenkinsfile-test
index 694bc472a..7961d5f98 100644
--- a/Jenkinsfile-test
+++ b/Jenkinsfile-test
@@ -4,7 +4,7 @@ pipeline {
label 'master'
}
}
-
+
stages {
stage('Package') {
tools {
@@ -17,7 +17,9 @@ pipeline {
}
stage('Publish') {
steps {
- sh 'cp -rf ./dist/* /usr/local/joylink/jlclient'
+ sh 'mkdir -p /usr/local/joylink/jlclient'
+ sh 'rm -rf /usr/local/joylink/jlclient/*'
+ sh 'cp -rf ./dist/* /usr/local/joylink/jlclient'
}
}
}
From c89fb915f56658f4aaa0f04ff585a9958ce65e07 Mon Sep 17 00:00:00 2001
From: program-walker <418875866@qq.com>
Date: Mon, 28 Sep 2020 17:57:53 +0800
Subject: [PATCH 31/53] =?UTF-8?q?=E4=BF=AE=E6=94=B9Jenkins=E6=89=93?=
=?UTF-8?q?=E5=8C=85=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Jenkinsfile-test | 1 +
1 file changed, 1 insertion(+)
diff --git a/Jenkinsfile-test b/Jenkinsfile-test
index 7961d5f98..fff7d237c 100644
--- a/Jenkinsfile-test
+++ b/Jenkinsfile-test
@@ -11,6 +11,7 @@ pipeline {
nodejs 'nodejs-10'
}
steps {
+ sh 'npm update'
sh 'npm install'
sh 'npm run test'
}
From 6019050258ad69810a9141649a91f6f57ac2c5b1 Mon Sep 17 00:00:00 2001
From: program-walker <418875866@qq.com>
Date: Mon, 28 Sep 2020 18:27:57 +0800
Subject: [PATCH 32/53] =?UTF-8?q?=E4=BF=AE=E6=94=B9Jenkins=E6=AD=A3?=
=?UTF-8?q?=E5=BC=8F=E6=89=93=E5=8C=85=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Jenkinsfile-prd | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile-prd b/Jenkinsfile-prd
index 8bff30f3b..1bd53bb27 100644
--- a/Jenkinsfile-prd
+++ b/Jenkinsfile-prd
@@ -4,7 +4,7 @@ pipeline {
label 'master'
}
}
-
+
stages {
stage('Package') {
tools {
@@ -18,6 +18,8 @@ pipeline {
}
stage('Publish') {
steps {
+ sh 'mkdir -p /usr/local/joylink/jlclient'
+ sh 'rm -rf /usr/local/joylink/jlclient/*'
sh 'cp -rf ./dist/* /usr/local/joylink/jlclient'
}
}
From ca84d29af9d421e6d5b3e3f30887dade8cf6ab00 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 28 Sep 2020 20:54:34 +0800
Subject: [PATCH 33/53] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/competition.js | 8 +
src/views/drts/scene/index.vue | 2 +-
src/views/drts/scene/modify.vue | 357 ++++++++++++++++++++---
src/views/drts/scene/stepDescription.vue | 92 ++++++
4 files changed, 424 insertions(+), 35 deletions(-)
create mode 100644 src/views/drts/scene/stepDescription.vue
diff --git a/src/api/competition.js b/src/api/competition.js
index 60bed1cd5..3dfbaf849 100644
--- a/src/api/competition.js
+++ b/src/api/competition.js
@@ -310,3 +310,11 @@ export function getCompetitionPracticalSceneById(id) {
});
}
+/** 更新步骤数据 */
+export function updateCompetitionPracticalStep(data) {
+ return request({
+ url: `/api/v1/competitionPractical/detail`,
+ method: 'POST',
+ data
+ });
+}
diff --git a/src/views/drts/scene/index.vue b/src/views/drts/scene/index.vue
index 03e64e3e0..338edb67b 100644
--- a/src/views/drts/scene/index.vue
+++ b/src/views/drts/scene/index.vue
@@ -3,7 +3,7 @@
-
+