feat: 添加父子应用状态通讯

src/api/service/base.js

@@ -4,7 +4,7 @@ import * as constants from '../../constants';
 
 export const API = {
   AUTHORIZATION_TOKEN: '/Publish/Identity/AuthorizationToken',
-  GET_GATEWAY_CONFIG: '/Publish/OMS/GateWayConfig',
+  GET_GATEWAY_CONFIG: '/PandaCore/OMS/GateWayConfig',
   GET_CONFIG: '/CityInterface/rest/services.svc/GetConfig',
   GENERATE_TOKEN: '/cityinterface/rest/services.svc/generatetoken',
   GENERATE_IOT_TOKEN: 'cityinterface/rest/services.svc/generateGCKToken',
@@ -33,6 +33,8 @@ export const API = {
   UPLOAD_FILE_URL:
     '/cityinterface/rest/services/filedownload.svc/uploadfile/个人信息/{path}/{filename}',
   AVATAR_FILE_URL: '/cityinterface/rest/services/filedownload.svc/download',
+  GET_SENSOR_TYPE: '/PandaCore/GCK/Sensor/GetSensorType', // 获取传感器类型
+  GET_SYSTEM_CONFIGURATION: '/PandaCore/OMS/SysConfiguration', // 获取系统配置
 };
 
 const services = {
@@ -145,6 +147,17 @@ const services = {
     method: constants.REQUEST_METHOD_GET,
     type: constants.REQUEST_HTTP,
   },
+  // Sensor 指标管理
+  getSensorType: {
+    url: API.GET_SENSOR_TYPE,
+    method: constants.REQUEST_METHOD_GET,
+    type: constants.REQUEST_HTTP,
+  },
+  sysConfiguration: {
+    url: API.GET_SYSTEM_CONFIGURATION,
+    method: constants.REQUEST_METHOD_GET,
+    type: constants.REQUEST_HTTP,
+  },
 };
 
 export const searchAutoCity = keywords => {

src/app.js

@@ -80,6 +80,7 @@ const loader = (appContent, loading) => render({ appContent, loading });
 const initLocale = () => {
   localStorage.setItem('umi_locale', 'zh-CN');
 };
+const PRODUCT_NAME = ['civ_water', 'civ_monitor'];
 
 const initGlobalConfig = () => {
   // eslint-disable-next-line no-debugger
@@ -120,7 +121,7 @@ const initGlobalConfig = () => {
           actionCreators.getConfig(
             Object.assign({}, window.globalConfig, {
               hasGateWay,
-              apiGatewayDomain: `${window.location.origin}/Publish/GateWay`,
+              apiGatewayDomain: `${window.location.origin}/PandaCore/GateWay`,
             }),
           ),
         );
@@ -130,6 +131,7 @@ const initGlobalConfig = () => {
     appService
       .queryConfig({ client: params.getParams('client') || 'city' })
       .then(res => {
+        debugger;
         if (res) {
           const data = res;
           if (!data.client) {
@@ -175,6 +177,8 @@ const initGlobalConfig = () => {
       })
       // eslint-disable-next-line no-shadow
       .then(res => {
+        initSensorType();
+        initIsMock();
         render({ appContent: '', loading: true });
       })
       .catch(error => {
@@ -183,6 +187,41 @@ const initGlobalConfig = () => {
   }
 };
 
+const initSensorType = () => {
+  let filterProduct =
+    (window.globalConfig && window.globalConfig.products) || [];
+  filterProduct = filterProduct.filter(item =>
+    PRODUCT_NAME.includes(item.PackageName),
+  );
+  if (filterProduct.length > 0) {
+    appService.getSensorType().then(res => {
+      store.dispatch(
+        actionCreators.getConfig(
+          Object.assign({}, window.globalConfig, {
+            sensorType: res.data,
+          }),
+        ),
+      );
+    });
+  }
+};
+
+const initIsMock = () => {
+  appService
+    .sysConfiguration({
+      moduleName: '是否mock数据',
+    })
+    .then(res => {
+      store.dispatch(
+        actionCreators.getConfig(
+          Object.assign({}, window.globalConfig, {
+            isMock: res.data === '是',
+          }),
+        ),
+      );
+    });
+};
+
 initGlobalConfig();
 initLocale();
 window.share &&

src/global.less

@@ -299,200 +299,3 @@ body {
 }
 
 //left menu
-// :global {
-//   #micro-container {
-//      // 图标向下偏移问题
-//     .anticon {
-//       vertical-align: 0.125em;
-//     }
-//     .ant-select-arrow {
-//       .anticon {
-//         vertical-align: top;
-//       }
-//     }
-//     // 默认分页组件右对齐，总条数信息放左边
-//     .ant-pagination {
-//       display: flex;
-//       flex-wrap: wrap;
-//       grid-row-gap: 8px;
-//       justify-content: flex-end;
-
-//       .ant-pagination-total-text {
-//         margin-left: 8px;
-//         margin-right: auto;
-//       }
-//     }
-//     // tab标签
-//     .ant-tabs-tab {
-//       margin:0 16px;
-//       padding: 12px 20px;
-//       font-size: 15px;
-//       .ant-tabs-tab-btn {
-//           font-weight: 600;
-//       }
-//     }
-        
-//       /*****webkit 滚动条*******/
-//       // .wkt-scroll{
-//       //   margin: 10px;
-//       // }
-//       .wkt-scroll::-webkit-scrollbar,
-//       .wkt-scroll *::-webkit-scrollbar {
-//         width: 8px;
-//         height: 8px;
-//       }
-
-//       .wkt-scroll::-webkit-scrollbar-track,
-//       .wkt-scroll *::-webkit-scrollbar-track {
-//         -webkit-box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.3);
-//         box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.3);
-//         border-radius: 10px;
-//       }
-
-//       .wkt-scroll::-webkit-scrollbar-thumb,
-//       .wkt-scroll *::-webkit-scrollbar-thumb {
-//         border-radius: 10px;
-//         background: rgba(0, 0, 0, 0.1);
-//         -webkit-box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.5);
-//         box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.5);
-//       }
-
-//       .wkt-scroll-light::-webkit-scrollbar,
-//       .wkt-scroll-light *::-webkit-scrollbar {
-//         width: 8px;
-//         height: 8px;
-//       }
-
-//       .wkt-scroll-light::-webkit-scrollbar-track,
-//       .wkt-scroll-light *::-webkit-scrollbar-track {
-//         -webkit-box-shadow: inset 0 0 8px rgba(193, 193, 193, 0.45);
-//         box-shadow: inset 0 0 8px rgba(193, 193, 193, 0.45);
-//         border-radius: 10px;
-//       }
-
-//       .wkt-scroll-light::-webkit-scrollbar-thumb,
-//       .wkt-scroll-light *::-webkit-scrollbar-thumb {
-//         border-radius: 10px;
-//         background: rgba(0, 0, 0, 0.1);
-//         -webkit-box-shadow: inset 0 0 8px rgba(177, 177, 177, 0.5);
-//         box-shadow: inset 0 0 8px rgba(177, 177, 177, 0.5);
-//       }
-
-//       .wkt-scroll-null::-webkit-scrollbar,
-//       .wkt-scroll-null *::-webkit-scrollbar {
-//         width: 0px;
-//         height: 0px;
-//       }
-    
-//     //left menu
-
-//     //iconfont 引入
-//     .noWrap{
-//       overflow: hidden;
-//       text-overflow: ellipsis;
-//       white-space: nowrap;
-//     }
-//     .btn {
-//       background: #1890ff;
-//       border-color: #1890ff;
-//       box-shadow: 0 2px 0 rgb(0 0 0 / 5%);
-//       color: #fff;
-//       border: 1px solid #d9d9d9;
-//       border-radius: 2px;
-//       cursor: pointer;
-//       display: inline-block;
-//       font-size: 14px;
-//       font-weight: 400;
-//       height: 32px;
-//       line-height: 1.5715;
-//       padding: 4px 15px;
-//       position: relative;
-//       text-align: center;
-//       touch-action: manipulation;
-//       transition: all .3s cubic-bezier(.645,.045,.355,1);
-//       -webkit-user-select: none;
-//       -moz-user-select: none;
-//       -ms-user-select: none;
-//       user-select: none;
-//       white-space: nowrap;
-//     }
-//     .btn-l{
-//       border-radius: 2px;
-//       font-size: 16px;
-//       height: 40px;
-//       padding: 6.4px 15px;
-//     }
-//     .btn-s{
-//       border-radius: 2px;
-//       font-size: 14px;
-//       height: 24px;
-//       padding: 0 7px;
-//     }
-//     .btn-white{
-//       color: rgba(0,0,0,.85);
-//       box-shadow: 0 2px 0 rgb(0 0 0 / 2%);
-//       border: 1px solid #d9d9d9;
-//       background: #fff;
-//     }
-//     .btn-red{
-//       background: #ff7875;
-//       border-color: #ff7875;
-//       color: #fff;
-//     }
-//     .btn-normal-v1{
-//       .btn()
-//     }
-//     .btn-large-v1{
-//       .btn();
-//       .btn-l();
-//     }
-//     .btn-small-v1{
-//       .btn();
-//       .btn-s();
-//     }
-//     .btn-normal-white-v1{
-//       .btn();
-//       .btn-white();
-//     }
-//     .btn-large-white-v1{
-//       .btn();
-//       .btn-white();
-//       .btn-l();
-//     }
-//     .btn-small-white-v1{
-//       .btn();
-//       .btn-white();
-//       .btn-s();
-//     }
-//     .btn-normal-red-v1{
-//       .btn();
-//       .btn-red();
-//     }
-//     .btn-large-red-v1{
-//       .btn();
-//       .btn-red();
-//       .btn-l();
-//     }
-//     .btn-small-red-v1{
-//       .btn();
-//       .btn-red();
-//       .btn-s();
-//     }
-//   }
-  
-// }
-//iconfont 引入
-// @font-face {
-//   font-family: 'iconfont';
-//   src: url('//at.alicdn.com/t/font_2542433_w0epxoeyc3r.woff2?t=1623038328111') format('woff2'),
-//         url('//at.alicdn.com/t/font_2542433_w0epxoeyc3r.woff?t=1623038328111') format('woff'),
-//         url('//at.alicdn.com/t/font_2542433_w0epxoeyc3r.ttf?t=1623038328111') format('truetype');
-// }
-
-// .iconfont {
-//   font-family: "iconfont" !important;
-//   font-size: 16px;
-//   font-style: normal;
-//   -webkit-font-smoothing: antialiased;
-//   -moz-osx-font-smoothing: grayscale;
-// }
\ No newline at end of file