diff --git a/public/index.html b/public/index.html
index c17491a57..956a01818 100644
--- a/public/index.html
+++ b/public/index.html
@@ -14,7 +14,7 @@
-
+
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index f7714e1cf..08cd9c9fd 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -38,27 +38,27 @@
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index d2c0b8de4..7441341a4 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -19,18 +19,18 @@ import { mapGetters } from 'vuex';
import SidebarItem from './SidebarItem';
export default {
- components: { SidebarItem },
- computed: {
- ...mapGetters([
- 'sidebar',
- 'routers'
- ]),
- routes() {
- return this.$router.options.routes;
- },
- isCollapse() {
- return !this.sidebar.opened;
- }
- }
+ components: { SidebarItem },
+ computed: {
+ ...mapGetters([
+ 'sidebar',
+ 'routers'
+ ]),
+ routes() {
+ return this.$router.options.routes;
+ },
+ isCollapse() {
+ return !this.sidebar.opened;
+ }
+ }
};
diff --git a/src/scripts/plugin/converter/CancelLimitOperationConverter.js b/src/scripts/plugin/Converter/CancelLimitOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/CancelLimitOperationConverter.js
rename to src/scripts/plugin/Converter/CancelLimitOperationConverter.js
diff --git a/src/scripts/plugin/converter/MixinOperationConverter.js b/src/scripts/plugin/Converter/MixinOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/MixinOperationConverter.js
rename to src/scripts/plugin/Converter/MixinOperationConverter.js
diff --git a/src/scripts/plugin/converter/SectionOperationConverter.js b/src/scripts/plugin/Converter/SectionOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/SectionOperationConverter.js
rename to src/scripts/plugin/Converter/SectionOperationConverter.js
diff --git a/src/scripts/plugin/converter/SignalRouteOperationConverter.js b/src/scripts/plugin/Converter/SignalRouteOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/SignalRouteOperationConverter.js
rename to src/scripts/plugin/Converter/SignalRouteOperationConverter.js
diff --git a/src/scripts/plugin/converter/StationControlOperationConverter.js b/src/scripts/plugin/Converter/StationControlOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/StationControlOperationConverter.js
rename to src/scripts/plugin/Converter/StationControlOperationConverter.js
diff --git a/src/scripts/plugin/converter/StationOperationConverter.js b/src/scripts/plugin/Converter/StationOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/StationOperationConverter.js
rename to src/scripts/plugin/Converter/StationOperationConverter.js
diff --git a/src/scripts/plugin/converter/StationStandOperationConverter.js b/src/scripts/plugin/Converter/StationStandOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/StationStandOperationConverter.js
rename to src/scripts/plugin/Converter/StationStandOperationConverter.js
diff --git a/src/scripts/plugin/converter/SwitchOperationConverter.js b/src/scripts/plugin/Converter/SwitchOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/SwitchOperationConverter.js
rename to src/scripts/plugin/Converter/SwitchOperationConverter.js
diff --git a/src/scripts/plugin/converter/TrainOperationConverter.js b/src/scripts/plugin/Converter/TrainOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/TrainOperationConverter.js
rename to src/scripts/plugin/Converter/TrainOperationConverter.js
diff --git a/src/scripts/plugin/converter/manager.js b/src/scripts/plugin/Converter/manager.js
similarity index 100%
rename from src/scripts/plugin/converter/manager.js
rename to src/scripts/plugin/Converter/manager.js
diff --git a/src/views/display/demon/addQuest.vue b/src/views/display/demon/addQuest.vue
index 84ae3bfdb..b34ec5851 100644
--- a/src/views/display/demon/addQuest.vue
+++ b/src/views/display/demon/addQuest.vue
@@ -178,9 +178,10 @@ export default {
confirm() {
const roleName = this.memberList.find(elem=>{ return elem.id == this.form.role; });
+ this.$emit('selectQuest', this.row, this.form.role, this.mapLocation, roleName.role);
this.doClose();
this.roleDoClose();
- this.$emit('selectQuest', this.row, this.form.role, this.mapLocation, roleName.role);
+
},
roleDoClose() {
diff --git a/src/views/display/designIndex.vue b/src/views/display/designIndex.vue
index db5ae1d11..3d08a026c 100644
--- a/src/views/display/designIndex.vue
+++ b/src/views/display/designIndex.vue
@@ -585,11 +585,11 @@ export default {
if (this.isDrive) {
this.panelShow = false;
this.drivingShow = true;
- this.$refs.Jl3dDrive.show(this.mapId,this.group);
+ this.$refs.Jl3dDrive.show(this.mapId, this.group);
} else {
this.panelShow = false;
this.simulationShow = true;
- this.$refs.Jl3dSimulation.show(this.mapId,this.group);
+ this.$refs.Jl3dSimulation.show(this.mapId, this.group);
}
},
showScheduling() {
diff --git a/src/views/display/index.vue b/src/views/display/index.vue
index ecf89c7c8..d44e25291 100644
--- a/src/views/display/index.vue
+++ b/src/views/display/index.vue
@@ -159,9 +159,6 @@ export default {
skinCode() {
return this.$route.query.skinCode;
},
- mapId() {
- return this.$route.query.mapId;
- },
isLesson() {
return this.mode === 'teach' || this.mode === 'record' || this.mode === 'manage';
},
@@ -527,11 +524,11 @@ export default {
if (this.isDrive) {
this.panelShow = false;
this.drivingShow = true;
- this.$refs.Jl3dDrive.show(this.mapId,this.group);
+ this.$refs.Jl3dDrive.show(this.mapId, this.group);
} else {
this.panelShow = false;
this.simulationShow = true;
- this.$refs.Jl3dSimulation.show(this.mapId,this.group);
+ this.$refs.Jl3dSimulation.show(this.mapId, this.group);
}
},
showScheduling() {
diff --git a/src/views/scriptManage/create.vue b/src/views/scriptManage/create.vue
index b83e72804..61e04cfbf 100644
--- a/src/views/scriptManage/create.vue
+++ b/src/views/scriptManage/create.vue
@@ -47,15 +47,13 @@ export default {
rules() {
const crules = {
name: [
- // { required: true, message: this.$t('scriptRecord.inputScriptName'), trigger: 'blur' },
- // { required: true, message: this.$t('scriptRecord.inputScriptName'), trigger: 'change' }
{ validator: this.validateScriptName, trigger: 'blur' },
{ validator: this.validateScriptName, trigger: 'change' }
+ ],
+ description: [
+ { validator: this.validateDescription, trigger: 'blur' },
+ { validator: this.validateDescription, trigger: 'change' }
]
- // description:[
- // { required: true, message: this.$t('scriptRecord.inputScriptDescription'), trigger: 'blur' },
- // { required: true, message: this.$t('scriptRecord.inputScriptDescription'), trigger: 'change' }
- // ]
};
return crules;
}
@@ -69,6 +67,14 @@ export default {
return callback();
}
},
+ validateDescription(rule, value, callback) {
+ if (value.trim().length === 0) {
+ this.formModel.description = this.formModel.name.replace(/\s/g, '');
+ return callback(new Error(this.$t('scriptRecord.inputScriptDescription')));
+ } else {
+ return callback();
+ }
+ },
doShow(questid) {
if (questid) {
getQuestById(questid).then(resp=>{
diff --git a/src/views/trainRoom/e-chat.vue b/src/views/trainRoom/e-chat.vue
index 84002d14e..e3bf91cf5 100644
--- a/src/views/trainRoom/e-chat.vue
+++ b/src/views/trainRoom/e-chat.vue
@@ -140,16 +140,15 @@ export default {
justify-content: space-between;
&__head {
- height: 30px;
display: flex;
align-items: center;
background: #f0f0f0;
border-bottom: 1px solid #ccc;
- padding: 10px;
&--title {
font-size: 16px;
font-weight: bold;
+ padding:10px 0px 10px 10px;
}
}
@@ -216,6 +215,8 @@ export default {
outline: none;
resize: none;
font-size: 16px;
+ padding-left: 10px;
+ padding-top: 10px;
}
&--send {
diff --git a/src/views/trainRoom/e-device.vue b/src/views/trainRoom/e-device.vue
index 9678ff7fe..b296c1943 100644
--- a/src/views/trainRoom/e-device.vue
+++ b/src/views/trainRoom/e-device.vue
@@ -119,9 +119,11 @@ export default {
&--title {
font-size: 14px;
font-weight: bold;
+ margin-left:10px;
}
&--add {
+ margin-right:2px;
/deep/ .el-button.is-circle {
padding: 5px;
}
diff --git a/src/views/trainRoom/e-members.vue b/src/views/trainRoom/e-members.vue
index 08aa1a2c3..8f2261b02 100644
--- a/src/views/trainRoom/e-members.vue
+++ b/src/views/trainRoom/e-members.vue
@@ -59,7 +59,7 @@ export default {
return { label: 'nickName' };
},
treeHeight() {
- return this.height - 40;
+ return this.height - 64;
},
filterMembers() {
return this.members.filter(e =>{ return e.nickName.includes(this.filterText); });
@@ -97,7 +97,6 @@ export default {
border: 1px solid #ccc;
&__head {
- height: 30px;
display: flex;
justify-content: space-between;
align-items: center;
@@ -105,13 +104,14 @@ export default {
border-bottom: 1px solid #ccc;
&--title {
+ padding:10px 0px;
font-size: 16px;
font-weight: bold;
}
&--notes {
font-size: 16px;
- height: 100%;
+ padding:10px 0px;
display: flex;
align-items: flex-end;
}
@@ -124,6 +124,7 @@ export default {
height: auto;
min-height: calc(100%-200px);
max-height: calc(100%-200px);
+ border-bottom: 1px #ccc solid;
&::-webkit-scrollbar {
display: none;
diff --git a/src/views/trainRoom/e-role.vue b/src/views/trainRoom/e-role.vue
index effec5372..ed5938b51 100644
--- a/src/views/trainRoom/e-role.vue
+++ b/src/views/trainRoom/e-role.vue
@@ -129,9 +129,11 @@ export default {
&--title {
font-size: 14px;
font-weight: bold;
+ margin-left:10px;
}
&--add {
+ margin-right:2px;
/deep/ .el-button.is-circle {
padding: 5px;
}
diff --git a/src/views/trainRoom/e-roles.vue b/src/views/trainRoom/e-roles.vue
index 5f28cf240..d61092568 100644
--- a/src/views/trainRoom/e-roles.vue
+++ b/src/views/trainRoom/e-roles.vue
@@ -365,7 +365,7 @@ export default {
this.loading = true;
await putJointTrainingExit(this.group);
this.loading = false;
- this.$router.push({ path: `/trainingPlatform/detail/${this.$route.query.subSystem}`, query: {mapId: this.room.mapId}});
+ history.go(-1);
} catch (error) {
this.$emit('message', {type:'error', message: this.$t('error.operationFailure')});
}
@@ -381,7 +381,6 @@ export default {
background: #fff;
&__head {
- height: 60px;
display: flex;
justify-content: space-between;
align-items: center;
@@ -393,6 +392,7 @@ export default {
&--title {
display: flex;
align-items: flex-end;
+ padding: 10px 0px;
.label {
font-size: 16px;