From e86c0b9c45f09a431d2c7671c8b7f2f5b99dbf39 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 21 Aug 2020 16:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=91=E5=B8=83=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=AF=BC=E5=85=A5=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QueryListPage/QueryListPage.vue           |  2 +-
 src/views/newMap/jointTrainingNew/index.vue   | 22 +++++++++----------
 .../newMap/jointTrainingNew/menuDemon.vue     |  1 -
 .../newMap/jointTrainingNew/menuSchema.vue    |  1 -
 src/views/publish/publishMap/index.vue        |  8 +++++--
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue
index 6b3c86b4c..f44bef52c 100644
--- a/src/components/QueryListPage/QueryListPage.vue
+++ b/src/components/QueryListPage/QueryListPage.vue
@@ -144,7 +144,7 @@
                     :disabled="isTableBtnDisabled(button, scope.$index, scope.row)"
                     :loading="scope.row['loading'+idx]"
                   >
-                    <input :id="button.id" type="file" class="file_box" accept=".json, application/json" @change="button.handleClick(scope.$index, scope.row, idx)">
+                    <input :class="button.class" type="file" class="file_box" accept=".json, application/json" @change="button.handleClick(scope.$index, scope.row, idx)">
                     {{ getTableBtnName(button.name, scope.$index, scope.row) }}
                   </el-button>
                 </template>
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index 18716d655..7e76e1c03 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -19,7 +19,7 @@
         :device-code="deviceCode"
         :countdown-time="countdownTime"
         @passflow="passflow"
-        @faultdevice = "faultdevice"
+        @faultdevice="faultdevice"
         @getUserRole="getUserRole"
         @hidepanel="hidepanel"
         @devicemodel="devicemodel"
@@ -487,16 +487,16 @@ export default {
             window.open(routeData.href, '_blank', 'noopener noreferrer');
         },
         faultdevice() {
-          const routeData = this.$router.resolve({
-              path:'/jlmap3d/maintainer',
-              query:{
-                  mapid:this.mapId,
-                  group:this.group,
-                  project: this.project,
-                  noPreLogout: true
-              }
-          });
-          window.open(routeData.href, '_blank', 'noopener noreferrer');
+            const routeData = this.$router.resolve({
+                path:'/jlmap3d/maintainer',
+                query:{
+                    mapid:this.mapId,
+                    group:this.group,
+                    project: this.project,
+                    noPreLogout: true
+                }
+            });
+            window.open(routeData.href, '_blank', 'noopener noreferrer');
         },
         showdriving() {
             this.panelShow = true;
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index bcf3d3edf..eeb727466 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -5,7 +5,6 @@
     <!-- 地图错误判断 -->
     <div v-if="!dataError&&hasOneButton" class="display_top_draft" :style="{top: offset+'px'}">
       <div class="btn_hover" @click="menuClick">菜单</div>
-      <!-- transform: translateX(-${btnWidth}px) -->
       <el-button-group ref="button_group_box" class="button_group_box" :style="`margin-left:-${btnWidth}px`">
         <!-- 设备视图 -->
         <el-button v-if="isShow3dmodel && isShowScheduling" size="small" @click="jumpjlmap3dmodel">{{ $t('display.demon.deviceView') }}</el-button>
diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue
index a9157d91d..97a88bbee 100644
--- a/src/views/newMap/jointTrainingNew/menuSchema.vue
+++ b/src/views/newMap/jointTrainingNew/menuSchema.vue
@@ -15,7 +15,6 @@
           <el-button v-if="faultMode && !dataError" size="small" type="danger" @click="setFault">{{ $t('joinTraining.faultSetting') }}</el-button>
         </template>
       </el-button-group>
-      <!-- <el-button v-if="isAdmin && !dataError && !isScreen" size="small" :type="faultMode ? 'danger' : ''" @click="changeOperateMode()">故障模式</el-button> -->
       <el-button v-if="isAdmin && !dataError && !isScreen" size="small" :type="faultMode ? '' : 'primary' " @click="changeOperateMode()">{{ faultMode?' 切换到普通模式':'切换到故障模式' }}</el-button>
       <!-- isCenter && !dataError && !isAdmin 此判断用于以后(目前 暂时不用) -->
       <el-button v-if="isShowDirective" size="small" :type="directiveMode ? 'primary' : ''" @click="changeDirectiveMode()">{{ directiveMode? '切换到普通模式':'切换到指令模式' }}</el-button>
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index efc719075..1bdbd34aa 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -135,7 +135,7 @@ export default {
                                 name: '导入',
                                 handleClick: this.handleImportMap,
                                 type: 'file',
-                                id: 'queryPagesFilesInput'
+                                class: 'queryPagesFilesInput'
                             },
                             {
                                 name: '导出',
@@ -375,7 +375,11 @@ export default {
         handleImportMap(index, row, idx) {
             setTimeout(() => {
                 this.$set(row, 'loading' + idx, true);
-                const obj = document.getElementById('queryPagesFilesInput');
+                const objInput = document.getElementsByClassName('queryPagesFilesInput');
+                let obj = {files: null};
+                if (objInput.length) {
+                    obj = objInput[index];
+                }
                 if (!obj.files) return;
                 const f = obj.files[0];
                 const reader = new FileReader();