merge

public/static/views/onlineShareExcel.html

@@ -656,17 +656,33 @@
                         let res = JSON.stringify(exportJson)
                         console.log(res);
                         util.ajaxJson("正在导入中", "http://10.149.85.91:7777/sheet/excel/importFile", { exceldata: res, id: excelId }, function (res) {
-
                             console.log(res);
+                            if (res.code === '1') {
+                                // 销毁原来的excel
+                                window.luckysheet.destroy();
+                                // // 重新加载
+                                var a = exportJson.sheets[0];
+                                a.name = '';
+                                if (res.code === '1') {
+
+                                }
+                                initExcel([a], name.replace('.xlsx', ''), excelId);
+                                // // 绑定按钮事件
+                                initHandel()
+                            }
+
                         });
-                        // 销毁原来的excel
-                        window.luckysheet.destroy();
-                        // // 重新加载
-                        var a = exportJson.sheets[0];
-                        a.name = '';
-                        initExcel([a], name.replace('.xlsx', ''), excelId);
-                        // // 绑定按钮事件
-                        initHandel()
+                        // // 销毁原来的excel
+                        // window.luckysheet.destroy();
+                        // // // 重新加载
+                        // var a = exportJson.sheets[0];
+                        // a.name = '';
+                        // if (res.code === '1') {
+
+                        // }
+                        // initExcel([a], name.replace('.xlsx', ''), excelId);
+                        // // // 绑定按钮事件
+                        // initHandel()
                     }
                     );
                 });

src/pages/main/onlineExcel/index.vue

@@ -95,7 +95,7 @@
                     <div class="container" id="container" v-else>
                         <fullscreen :fullscreen.sync="excelFullScreen" class="container">
                             <iframe id="excelIframe" height="100%" width="100%"
-                                    src="/marketfront/static/views/onlineShareExcel.html"
+                                    src="/static/views/onlineShareExcel.html"
                                     frameborder="0"></iframe>
                         </fullscreen>
                     </div>

vue.config.js

@@ -144,8 +144,8 @@ module.exports = {
                 // target: 'http://192.168.0.156:9600/',
                 // target: 'http://192.168.2.170:9600/',
                 // target: 'http://192.168.2.169:9600/',
-                // target: "http://192.168.2.124:9600/",
-                target:'http://43.138.50.94:9600',
+                target: "http://192.168.2.124:9600/",
+                // target:'http://43.138.50.94:9600',
                 changeOrigin: true,
             },
         },