Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev

public/index.html

@@ -14,7 +14,7 @@
 
     <script src="https://cdn.bootcss.com/vue/2.6.10/vue.min.js"></script>
     <script src="https://cdn.bootcss.com/vuex/3.1.0/vuex.min.js"></script>
-    <script src="https://cdn.bootcss.com/vue-router/3.0.6/vue-router.min.js"></script>
+    <script src="https://cdn.bootcss.com/vue-router/3.1.2/vue-router.min.js"></script>
     <script src="https://cdn.bootcss.com/nprogress/0.2.0/nprogress.min.js"></script>
 
     <script src="https://cdn.bootcss.com/element-ui/2.7.2/index.js"></script>

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() {

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';
         },

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=>{

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 {

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;
 				}

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;

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;
 				}

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;