Merge branch 'master' of http://ver.wh613.com:3000/shentun/peisweb

src/views/Home.vue

@@ -499,7 +499,7 @@ export default {
     handleCommand(command) {
       if (this.router.path != command) {
         this.router.path = command;
-        this.$router.push({ path: command });
+        this.$router.push({ path: command }).catch(()=>{})
       }
     },
     //确定修改密码按钮

src/views/doctorCheck/personnelBatch.vue

@@ -45,14 +45,13 @@
       <div class="selectfile">
         <div>
           <div><input type="file" accept=".xlsx" @change="onFileChange" /></div>
-
           <div></div>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="back3">上一步</el-button>
-        <el-button type="primary" @click="parseImportData(startRow)">分析</el-button
-        <el-button type="primary" @click="">确 定</el-button
+        <el-button type="primary" @click="parseImportData(startRow)">分析</el-button>
+        <el-button type="primary" @click="nextTick">下一步</el-button
         >
       </span>
     </el-dialog>
@@ -74,7 +73,6 @@ export default {
       importData:[],  //导入原始数据
       tableDataCol:{}, //导入原始数据 分析后 字段 key-value：key 为excel字段标题，value 为数据库中后台字段
       tableData:[],    //导入原始数据 分析后 表格数据
-
     };
   },
   methods: {
@@ -83,6 +81,7 @@ export default {
       const file = event.target.files[0];
       // 调用导入Excel文件的方法
       this.importExcelFile(file);
+           this.parseImportData()
     },
     importExcelFile(file) {
       this.filepopupdialogVisible = true;
@@ -108,6 +107,7 @@ export default {
           worksheet.eachRow((row, rowNumber) => {
             console.log(row.values);
             this.importData.push(row.values);
+        
             // console.log(`第${row.rowNumber}行的数据：${row.rowData}`);
           });
         });
@@ -172,6 +172,7 @@ export default {
     },
     //下一步
     nextstep() {
+     
       this.dialogVisible3 = true;
       this.dialogVisible2 = false;
     },