merge

src/pages/main/onlineExcel/index.vue

@@ -326,7 +326,7 @@ export default {
                     return;
                 }
                 let exceljson = JSON.stringify(exportJson)
-                _this.$util.ajaxJson("正在导入中", "http://192.168.2.124:7777/sheet/excel/importFile", { exceldata: exceljson, id: res }, function (res) {
+                _this.$util.ajaxJson("正在导入中", "http://10.149.85.91:7777/sheet/excel/importFile", { exceldata: exceljson, id: res }, function (res) {
                     // console.log('[ res ] >', res)
                     _this.addNewStatus = false;
                     document.getElementById('excelId').setAttribute("value", res.id);
@@ -571,11 +571,9 @@ export default {
                     });
                     var id = res.data.desc;
                     _this.addNewStatus = false;
-                    console.log(123);
                     //放入id，切换到excel模式
                     document.getElementById('excelId').setAttribute("value", id);
                     _this.showExcel = true;
-                    console.log(_this.showExcel);
                 }
             });
         },