冲突解决

src/main.js

@@ -99,24 +99,24 @@ ElementUI.Drawer.props.showClose.default = false;
 
 Vue.config.lang = 'ZH'
 /* table懒加载 */
-Vue.directive('tableLoad',{
-  bind (el,binding) {
-    let tableWarp = el.querySelector('.el-table__body-wrapper')
-    function handleFun (e) {
-      if (store.state.loading) return
-      if (tableWarp.scrollTop + tableWarp.clientHeight == tableWarp.scrollHeight) {
-        binding.value()
-      }
-    }
-    tableWarp.addEventListener('scroll',handleFun)
-    el.tableWarp = tableWarp
-    el.handleFun = handleFun
-  },
-  unbind (el,binding) {
-    /* 解绑 */
-    el.tableWarp.removeEventListener('scroll',el.handleFun)
-  }
-})
+// Vue.directive('tableLoad',{
+//   bind (el,binding) {
+//     let tableWarp = el.querySelector('.el-table__body-wrapper')
+//     function handleFun (e) {
+//       if (store.state.loading) return
+//       if (tableWarp.scrollTop + tableWarp.clientHeight == tableWarp.scrollHeight) {
+//         binding.value()
+//       }
+//     }
+//     tableWarp.addEventListener('scroll',handleFun)
+//     el.tableWarp = tableWarp
+//     el.handleFun = handleFun
+//   },
+//   unbind (el,binding) {
+//     /* 解绑 */
+//     el.tableWarp.removeEventListener('scroll',el.handleFun)
+//   }
+// })
 
 
 new Vue({

vue.config.js

@@ -13,14 +13,18 @@ module.exports = {
       host: 'localhost',
       port: 8000,
       proxy: {
-        '/apis': {
-          target: 'http://61.164.207.46:8000',
-          ws: true,  // proxy websockets
-          changeOrigin: true,  // needed for virtual hosted sites
-          pathRewrite: {
-            '^/apis': ''  // rewrite path
+          '/apis': {
+              target: 'http://61.164.207.46:8000',  // target host*/
+              // target: 'http://192.168.3.13:8080',  // target host*!
+              // target: 'http://192.168.3.9:8090',  // target host*!
+              // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+              // target: 'localhost:8080',  // target host
+              ws: true,  // proxy websockets
+              changeOrigin: true,  // needed for virtual hosted sites
+              pathRewrite: {
+                  '^/apis': ''  // rewrite path
+              },
           },
-        },
       }
     }
 }