提交前端修改

cors.js

@@ -1,217 +1,3 @@
-<<<<<<< HEAD
-let url = 'http://172.16.4.162/icore.icp.web/pass'
-module.exports = {
-  proxyTable: {
-    '/icore.icp.web/pass/v1': {
-      target: url + '/v1', //加http
-      changeOrigin: true,
-      pathRewrite: {
-        '^/icore.icp.web/pass/v1': '/' //这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-        // 比如我要调用'http://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/
-      }
-    },
-    '/icore.icp.web/pass/auth': {
-      // target: 'http://172.22.4.6:20002/auth',
-      //target: url + '/auth',
-      //target: 'https://172.16.4.162/icore.icp.web/pass/auth',
-      target: 'http://172.16.4.162/icore.icp.web/pass/auth',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/icore.icp.web/pass/auth': '/'
-      }
-    },
-    '/icore.icp.web/pass/logout': {
-      target: url + '/logout',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/icore.icp.web/pass/logout': '/'
-      }
-    },
-    // '/icore.icp.web/pass/configCenter': {
-    //   target: 'http://dev-config.steerinfo.com/configCenter',
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/configCenter': '/'
-    //   }
-    // },
-    '/icore.icp.web/restPassword': {
-      target: url,
-      changeOrigin: true,
-      pathRewrite: {
-        '^/icore.icp.web/restPassword': '/'
-      }
-    },
-    // '/icore.icp.web/pass/serviceCenter': {
-    //   target: 'http://dev-govern.steerinfo.com',
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/serviceCenter': '/'
-    //   }
-    // },
-    // '/icore.icp.web/pass/act': {
-    //   target: 'http://dev-act.steerinfo.com',
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/act': '/'
-    //   }
-    // },
-    // '/icore.icp.web/pass/job': {
-    //   target: 'http://dev-job.steerinfo.com',
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/job': '/'
-    //   }
-    // },
-    // '/icore.icp.web/pass/dd': {
-    //   target: 'http://dd.steerinfo.com',
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/dd': '/'
-    //   }
-    // },
-    // '/icore.icp.web/pass/apiauth': {
-    //   target: 'http://auth.steerinfo.com',
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/apiauth': '/'
-    //   }
-    // },
-    // '/icore.icp.web/pass/websocket': {
-    //   target: 'http://websocket.steerinfo.com/',
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/websocket': '/'
-    //   }
-    // },
-    '/icore-api': {
-      target: 'http://172.16.4.162/icore.icp.web/pass/',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/icore-api': '/'
-      }
-    },
-     '/icore.icp.web/pass/testManagement/v1': {
-      //  target: 'http://172.22.4.6:9006/v1', // 加https
-      //  target: 'http://prod-lims-test/v1', //
-      //  target: 'http://localhost:9001/v1', //加http
-       target: 'http://172.16.4.162', // 加https
-       // target: 'https://lims-bnusiness-dev.steerinfo.com/v1', //加https
-       changeOrigin: true
-     },
-    // '/icore.icp.web/pass/testManagement/v1': {
-    //   target: 'http://127.0.0.1:9001/v1', // 加https
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/testManagement/v1': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-    //     // 比如我要调用'https://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/ 
-    //   }
-    // },
-    // '/icore.icp.web/pass/mqtt/v1': {
-    //   // target: 'http://172.22.4.6:9006/v1', // 加https
-    //   // target: 'http://prod-lims-test/v1', // 加https
-    //   target: 'http://172.16.4.162:9410/v1', // 加https
-    //   // target: 'https://lims-business-dev.steerinfo.com/v1', //加https
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/mqtt/v1': '/'
-    //   }
-    // },
-    // '/icore.icp.web/pass/baseManagement/v1': {
-    //   target: 'http://localhost:9002/v1', // 正式
-    //   // target: 'http://192.168.3.165:9002/v1', // 加https
-    //   // target: 'https://jclims.steerinfo.com/v1',
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/baseManagement/v1': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-    //     // 比如我要调用'https://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/
-    //   }
-    // },
-    '/icore.icp.web/pass/baseManagement/v1': {
-      target: 'http://172.16.4.162', // 正式
-      // target: 'http://localhost:9002/v1', // 正式
-      // target: 'http://192.168.3.165:9002/v1', // 加https
-      // target: 'https://jclims.steerinfo.com/v1',
-      changeOrigin: true
-    },
-    '/icore.icp.web/pass/systemBase/v1': {
-      // target: 'http://168.168.45.55:9002/v1',
-      // target: 'http://192.168.3.38:9004/v1',
-      // target: 'http://168.168.44.214:9004/v1',
-      // target: 'http://172.22.42.233:9004/v1',
-      target: 'http://172.16.4.162', //加http
-      // target: 'http://localhost:9002/v1', //加http
-      // target: 'http://192.168.3.113:9004/v1', //加http
-      // target: 'http://168.168.44.214:9004/v1', //加http
-      // target: 'http://jc1.steerinfo.com/v1', //加http
-      changeOrigin: true,
-    },
-    '/weblib': {
-      target: 'http://172.22.42.2/',
-      // target: 'http://172.22.4.2:9004/v1', //加http
-      // target: 'http://jc1.steerinfo.com/v1', //加http
-      changeOrigin: true,
-      pathRewrite: {
-        '^/weblib': '/' //这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-        // 比如我要调用'http://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/
-      }
-    },
-    // 文件系统-上传下载
-    '/icore.icp.web/pass/seaweedfs/v1/download': {
-      target: 'http://172.22.4.6:30888',
-      // target: 'http://oss-filer.icore-oss.svc.cluster.local:8888', // 正式
-      changeOrigin: true,
-      pathRewrite: {
-        '^/icore.icp.web/pass/seaweedfs/v1/download': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-        // 比如我要调用'https://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/
-      }
-    },
-    // 报表地址代理
-    '/webroot/decision': {
-      target: 'http://172.22.4.5:8080/webroot/decision',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/webroot/decision': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-      }
-    },
-    // 文件上传地址代理
-    '/icore.icp.web/file': {
-      target: 'http://lims.jnmc.com',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/webroot/decision': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-      }
-    },
-    // 文件上传地址代理
-    '/icore.icp.web/oss-volume-0': {
-      target: 'http://lims.jnmc.com',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/webroot/decision': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-      }
-    },
-    // 文件上传地址代理
-    '/icore.icp.web/oss-volume-1': {
-      target: 'http://lims.jnmc.com',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/webroot/decision': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-      }
-    },
-    // 文件上传地址代理
-    '/icore.icp.web/oss-volume-2': {
-      target: 'http://lims.jnmc.com',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/webroot/decision': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-      }
-    }
-  },
-  // devModules: ['index', 'reportForm','workFlow', 'systemConfig', 'demo', 'taskManagement', 'batchManagement', 'programManagement', 'entrustedManagement', 'screeningTests','sampleManagement', 'sampleManager', 'samplePreparationTask','approveManagement','weightingManagement','testAnalysis','decideManagement','commodityInspection', 'exceptionManagement', 'certificateManagement', 'standardManagement', 'resourceManager']
-  //devModules: ['reportForm', 'screeningTests', 'index',  'entrustedManagement','measurementDataManagement', 'approveManagement', 'testAnalysis', 'resourceManager', 'taskManagement']
-  //  devModules: ['all']
-  //  devModules:['index']
-  devModules: ['index', 'approveManagement', 'entrustedManagement', 'resourceManager', 'systemConfig']
-}
-=======
 let url = 'http://172.16.4.162/icore.icp.web/pass'
 module.exports = {
   proxyTable: {
@@ -319,15 +105,15 @@ module.exports = {
     //     // 比如我要调用'https://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/ 
     //   }
     // },
-    '/icore.icp.web/pass/mqtt/v1': {
-      // target: 'http://172.22.4.6:9006/v1', // 加https
-      // target: 'http://prod-lims-test/v1', // 加https
-      target: 'http://172.16.4.162:9410/v1', // 加https
-      // target: 'https://lims-business-dev.steerinfo.com/v1', //加https
-      pathRewrite: {
-        '^/icore.icp.web/pass/mqtt/v1': '/'
-      }
-    },
+    // '/icore.icp.web/pass/mqtt/v1': {
+    //   // target: 'http://172.22.4.6:9006/v1', // 加https
+    //   // target: 'http://prod-lims-test/v1', // 加https
+    //   target: 'http://172.16.4.162:9410/v1', // 加https
+    //   // target: 'https://lims-business-dev.steerinfo.com/v1', //加https
+    //   pathRewrite: {
+    //     '^/icore.icp.web/pass/mqtt/v1': '/'
+    //   }
+    // },
     // '/icore.icp.web/pass/baseManagement/v1': {
     //   target: 'http://localhost:9002/v1', // 正式
     //   // target: 'http://192.168.3.165:9002/v1', // 加https
@@ -420,8 +206,7 @@ module.exports = {
   },
   // devModules: ['index', 'reportForm','workFlow', 'systemConfig', 'demo', 'taskManagement', 'batchManagement', 'programManagement', 'entrustedManagement', 'screeningTests','sampleManagement', 'sampleManager', 'samplePreparationTask','approveManagement','weightingManagement','testAnalysis','decideManagement','commodityInspection', 'exceptionManagement', 'certificateManagement', 'standardManagement', 'resourceManager']
   //devModules: ['reportForm', 'screeningTests', 'index',  'entrustedManagement','measurementDataManagement', 'approveManagement', 'testAnalysis', 'resourceManager', 'taskManagement']
- devModules: ['all']
-//  devModules:['index']
-//  devModules:['index','entrustedManagement','approveManagement','resourceManager']
+  //  devModules: ['all']
+  //  devModules:['index']
+  devModules: ['index', 'approveManagement', 'entrustedManagement', 'resourceManager', 'systemConfig']
 }
->>>>>>> a1418f49b291dfc3325814c230cb6165b735ae2e