修改配置文件

amos.config.js

@@ -7,30 +7,21 @@
   Amos.config = {
     // 普通http
     httpURI: {
-      baseURI: 'http://172.16.11.36:10005/',
-      convertorURI: 'http://172.16.11.36:10005/',
-      patrolURI: 'http://172.16.3.122:8082/',
-      securityBaseURI: 'http://172.16.10.72:10005/',
-      pluginURI: 'http://172.16.10.91:8091/',
-      studioURI: 'http://172.16.10.91:8091/',
+      baseURI: 'http://172.16.10.98:10005/',
       //设计器数据绑定
-      dataBindUrl: 'http://172.16.10.91:8083/api/visual/common/dataBind'
+      // dataBindUrl: 'http://172.16.10.91:8083/api/visual/common/dataBind'
     },
     // websocket 地址
     wsURI: {
-      pluginURI: 'ws://172.16.3.70:8989/',
       baseURI: 'ws://172.16.10.91:10600/',
       ruleURI: 'ws://172.16.3.63:8083/',
-      convertorView3dURI: 'ws://172.16.10.91:10600/',
-      securityBaseURI: 'ws://172.16.10.91:10600/',
-      rulesConfigURI: 'ws://172.16.10.91:8080/'
     },
     // 外部链接地址
     outterURI: {
       //巡检子服务地址,
       xunjian: 'http://172.16.11.36:3001/outter?isSub=true&token={token}&companyId={companyId}&deptId={deptId}&roleId={roleId}',
       //规则管控模型地址
-      mgtCtrlModel: 'http://172.16.10.91:8080',
+      mgtCtrlModel: 'http://172.16.11.36:8080?token={token}',
       //预案业务屏前端接口地址
       prePlan: 'http://172.16.10.91:3004',
       ue4URI: 'http://172.16.11.36:8089',
@@ -131,8 +122,6 @@
   window.demo = true;
   // 采用本地模式启动插件
   window.useNative = true;
-  window.BizPermissionType = 25; //业务屏菜单权限类型
-  window.V3DpermissionType = 26; //3D屏菜单权限类型
   window.appKey = 'CONVERTER_STATION';
   window.product = 'CONVERTER_STATION_WEB';
   window.dutyType = 'normal'; //normal/bank

src/consts/urlConsts.js

@@ -2,9 +2,9 @@ import * as endConf from 'amos-processor/lib/config/endconf';
 
 const completePrefix = endConf.completePrefix;
 
-const securityBaseURI = endConf.securityBaseURI;
+const securityBaseURI = endConf.baseURI;
 const AmosConfig = endConf.AmosConfig;
-const securityBaseWsURI = AmosConfig.wsURI.securityBaseURI;
+const securityBaseWsURI = AmosConfig.wsURI.baseURI;
 // 三维视图
 //const view3dURI = AmosConfig.httpURI.view3dURI;
 const view3dURI = AmosConfig.httpURI.view3dURI;

src/consts/wsUrlConsts.js

@@ -7,7 +7,7 @@ const lsTool = Store.lsTool;
 const completePrefix = endConf.completePrefix;
 const AmosConfig = endConf.AmosConfig;
 const ruleURI = AmosConfig.wsURI.ruleURI;
-const convertorView3dURI = AmosConfig.wsURI.convertorView3dURI;
+const convertorView3dURI = AmosConfig.wsURI.baseURI;
 const getToken = () => {
   return lsTool.read(SysConsts.token);
 };

src/routes/index.js

 // @author ilex.h
-import RProgress from 'ray-progress';
+// import RProgress from 'ray-progress';
 import { genOnRouteEnter, genOnRouteChange } from 'amos-designer/lib/utils/routerValidate';
-import notFound from 'amos-security/lib/routes/notfound';
-import redirect from 'amos-security/lib/routes/notfound/redirect';
+// import notFound from 'amos-security/lib/routes/notfound';
+// import redirect from 'amos-security/lib/routes/notfound/redirect';
 import signUp, { signupRouters } from 'amos-security/lib/routes/signUp';
-import routerFilter, { checkLogin } from 'amos-security/lib/routes/validateRouter';
+// import routerFilter, { checkLogin } from 'amos-security/lib/routes/validateRouter';
 import AutoLogin from './../view/autoLogin/AutoLogin';
 import calcRoutes from './calcRoutes';
 import addCustomRoutes, { customRoutes, planChildrenRoutes } from './customRoutes';

src/view/3dview/LayerPool.js

@@ -95,7 +95,7 @@ class LayerPool extends Component {
     const { detailPos, recordPos, setupPos, operatePos, monitorPos, waterPos, displayDetail, planStarted, fireResourceData } = this.state;
     const { animationProps, planStart, planQuit } = this.props;
     let detailTop = planStarted ? detailPos.top : detailPos.planStartTop;
-    let wsURL = AmosConfig.wsURI.securityBaseURI + 'plan';
+    let wsURL = AmosConfig.wsURI.baseURI + 'plan';
     return (
       <div className="layer-pool">
       <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />

src/view/mainframe/BizFrame.js

@@ -148,13 +148,13 @@ class BizFrame extends Component {
   };
 
 
-  getFrameConfig = () => {
-    return {
-      opSearchMenusUrl: formatUrl(secExtUrl.opSearchMenusUrl, { nodeName: '', type: window.BizPermissionType }),
-      defaultLink: '/biz',
-      loginLink: '/login'
-    };
-  };
+  // getFrameConfig = () => {
+  //   return {
+  //     opSearchMenusUrl: formatUrl(secExtUrl.opSearchMenusUrl, { nodeName: '', type: window.BizPermissionType }),
+  //     defaultLink: '/biz',
+  //     loginLink: '/login'
+  //   };
+  // };
 
   getSysToolProps = () => {
     return {
@@ -183,9 +183,8 @@ class BizFrame extends Component {
   };
 
   render() {
-    const frameConfig = this.getFrameConfig();
     const sysToolPorps = this.getSysToolProps();
-    const { siderMenusList, selectedSubMenuKey, showPrePlan } = this.state;
+    const { showPrePlan } = this.state;
     const url = formatUrl(getOutterURL('prePlan'));
 
     if (showPrePlan) {
@@ -201,15 +200,6 @@ class BizFrame extends Component {
         />);
     } else {
       return (
-      // <MainFrame
-      //   {...frameConfig}
-      //   onMenuLoadCompleted={this.openDefaultPage}
-      //   sysToolPorps={sysToolPorps}
-      //   siderMenusList={siderMenusList}
-      //   selectedSubMenuKey={selectedSubMenuKey}
-      //   // menuWidth="160px"
-      //   {...this.props}
-      // />
       <MainFrame
         {...this.props}
         userMenusAction={currentUserBizPermissions}

webpack.config.js

@@ -58,8 +58,8 @@ const defaultConfig = simpleConfig(config);
 // 插入第三方脚本
 defaultConfig.plugins.push(
   new HtmlInlineCodePlugin([
-    { inject: 'body', begin: true, tag: 'script',  attr: { src: '/extra/convertor3d/graphmod.js' } },
-    { inject: 'body', begin: false, tag: 'script',  attr: { src: '/extra/convertor3d/worker.e1906a3436c9762655d1.js' } }
+    { inject: 'body', begin: true, tag: 'script',  attr: { src: '/extra/convertor3d/graphmod.eec79d185151b59c1fda.js' } },
+    { inject: 'body', begin: false, tag: 'script',  attr: { src: '/extra/convertor3d/worker.c4c6a3fe3a78c939709a.js' } }
  ])
 );