Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls

src/views/trainingManage/create.vue

@@ -16,7 +16,6 @@
           v-if="inputVisible"
           ref="saveTagInput"
           v-model="inputValue"
-          autofocus
           class="input-new-tag"
           size="small"
           @keyup.enter.native="handleInputConfirm"
@@ -99,6 +98,9 @@ export default {
         },
         showInput() {
             this.inputVisible = true;
+            this.$nextTick(_ => {
+                this.$refs.saveTagInput.$refs.input.focus();
+            });
         },
         handleInputConfirm() {
             const inputValue = this.inputValue;

src/views/trainingManage/editDetails.vue

@@ -182,7 +182,7 @@ export default {
             updateTrainingStep(this.editData.id, list).then(res => {
                 console.log('保存步骤成功！', res);
                 this.$message.success('保存步骤成功！');
-                this.doClose();
+                // this.doClose();
             }).catch(err => {
                 console.log('保存步骤失败', err);
                 this.$message.error('保存步骤失败');

src/views/trainingManage/trainingList.vue

@@ -111,7 +111,11 @@ export default {
     computed: {
     },
     methods: {
-        queryFunction(params) {
+        queryFunction(param) {
+            const params = {
+                ...param,
+                mapId: this.$route.query.mapId
+            };
             return getTrainingList(params);
         },
         doShow() {