Merge branch 'gaodongdong' into dev_upgrade

package.json

@@ -53,7 +53,7 @@
     "react-dom": "~16.3.3"
   },
   "devDependencies": {
-    "amos-build": "^3.x",
+    "amos-build": "3.1.4",
     "amos-framework": "^1.2.2",
     "amos-iot-3dgraph": "^1.0.0",
     "amos-designer": "^1.0.2",

src/consts/urlConsts.js

@@ -167,6 +167,7 @@ selectedOrgInfoUrl: completePrefix(baseURI, 'api/region/current'),//获取选择
   matchEquipmentBindUrl: completePrefix(baseURI, 'api/impEquip/{id}/fireeqmt'), // 绑定配套设备
   equipmentPrePlanPictureUrl: completePrefix(baseURI, 'api/impEquip/pre-picture?equipId={equipmentId}&type={type}') ,//获取重点设备预控图
   riskSourceTreeUrl: completePrefix(baseURI, 'api/risksource/riskSourceTress'),//风险点树查询
+  regionTreeUrl: completePrefix(baseURI, 'api/risksource/regionTress'),//风险点树查询
   riskSourceEditUrl: completePrefix(baseURI, 'api/riskModel/riskSource/editRiskSource'),//风险点编辑
   riskSourceDeleteUrl: completePrefix(baseURI, 'api/riskModel/riskSource/deleteRiskSource'),//风险点删除
   femaEditUrl: completePrefix(baseURI, 'api/riskModel/fmea/editFmea'), //fmea编辑

src/entry/index.js

@@ -18,7 +18,6 @@ import { configureStoreWithDev } from './../store';
 import beforeRender from './beforeRender';
 import {  Store, LocationParam } from 'amos-tool';
 import { getSystemAllMenu, avoidLoginAction } from '../services/securityService';
-import { sessionConsts } from '../consts/storageConsts';
 import SysConsts from 'amos-processor/lib/config/consts';
 // 引入主体样式文件
 import './../styles';

src/services/preControlService.js

@@ -261,3 +261,9 @@ export const deleteTextPlanAction = (id) => {
 export const getManageLevelEumListAction = () => {
   return commonGet(FasSerUrl.manageLevelEumListUrl);
 };
+/**
+ * 查询区域树
+ */
+export const queryRegionTreeAction = () => {
+  return commonGet(formatUrl(FasSerUrl.regionTreeUrl), {});
+};
\ No newline at end of file

src/view/bizview/equipmentLedger/FireResources/FireEquipment/FireEquipmentModel.js

 import React, { Component } from 'react';
 import { Form, InputNumber, Input, Select, Radio } from 'amos-framework';
-import { DatePicker } from 'amos-antd';
+import { DatePicker, TreeSelect } from 'amos-antd';
 import moment from 'moment';
 import PropTypes from 'amos-react-router/lib/PropTypes';
 import { getFireEquipmentAction } from '../../../../../services/ledgerService';
-import { getRiskSourceSecondLevelAction } from '../../../../../services/preControlService';
+import { queryRegionTreeAction } from '../../../../../services/preControlService';
 
 const FormItem = Form.Item;
 const Option = Select.Option;
@@ -106,7 +106,7 @@ class FireEquipmentModel extends Component {
   }
 
   getRiskSourceSecondLevelDate = () =>{
-    getRiskSourceSecondLevelAction().then(
+    queryRegionTreeAction().then(
       data =>{
         this.setState({ riskSourceData: data });
       }
@@ -248,14 +248,15 @@ class FireEquipmentModel extends Component {
               />
             </FormItem>
             <FormItem label={<span>所属区域</span>} field="riskSourceId" {...formItemLayout}>
-              <Select
+              <TreeSelect
                 searchable
                 className="risk_source_select"
-                data={riskSourceData}
-                renderOption={item => <Option value={parseInt(item.id)}>{item.name}</Option>}
+                style={{ width: '200px' }}
+                dropdownStyle={{ maxHeight: 200, overflow: 'auto' }}
+                treeData={riskSourceData}
                 placeholder = "请选择"
                 value={form.riskSourceId}
-                onChange={e => this.onSelectChange('riskSourceId', e)}
+                onChange={(value, label, extra) => this.onSelectChange('riskSourceId', value)}
               />
             </FormItem>
             {/* <FormItem label={<span>区域</span>} field="productionArea" {...formItemLayout}>

src/view/bizview/preControl/mgtCtrlModel/index.js

 import React, { Component } from 'react';
 import { IFrame } from 'amos-framework';
+import { Store } from 'amos-tool';
+import SysConsts from 'amos-processor/lib/config/consts';
+import formatUrl from 'amos-processor/lib/utils/urlFormat';
 import { getOutterURL } from './../../../../consts/urlConsts';
 /**
  * 管控模型
@@ -8,9 +11,13 @@ import { getOutterURL } from './../../../../consts/urlConsts';
  * @extends {Component}
  */
 
+const lsTool = Store.lsTool;
+
 class MgtCtrlModel extends Component {
   render() {
-    const url = getOutterURL('mgtCtrlModel');
+    const token = lsTool.read(SysConsts.token);
+    const url = formatUrl(getOutterURL('mgtCtrlModel'), { token });
+    
     return (
       <div className="rule-model">
         <IFrame

src/view/bizview/xunjian/XJIndex.js

@@ -17,9 +17,9 @@ class XJIndex extends Component {
   render() {
     const reginParams = JSON.parse(lsTool.read('CURRENT_REGION'));
     const token = lsTool.read(SysConsts.token);
-    const companyId = reginParams.company.sequenceNbr;
-    const deptId = reginParams.department.sequenceNbr;
-    const roleId = reginParams.role.sequenceNbr;
+    const companyId = (reginParams.company || {}).sequenceNbr ? (reginParams.company || {}).sequenceNbr : '';
+    const deptId = (reginParams.department || {}).sequenceNbr ? (reginParams.department || {}).sequenceNbr : '';
+    const roleId = (reginParams.role || {}).sequenceNbr ? (reginParams.role || {}).sequenceNbr : '';
     //const orgCode = JSON.parse(region).orgCode;
     const url = formatUrl(getOutterURL('xunjian'), { token, companyId, deptId, roleId });
 

src/view/common/header/Weather.js

@@ -38,10 +38,10 @@ class Weather extends Component {
     const { forecast = [] } = data;
     const current = forecast[0];
     if (current){
-      // const fengli = current.fengli.replace('<![CDATA\[', '').replace(']]>', '');
+      const fengli = current.fengli.replace('<![CDATA\[', '').replace(']]>', '');
       const high = current.high.replace('高温', '').trim();
       const low = current.low.replace('低温', '').trim();
-      const weatherInfo = `${current.type} ${low}~${high} ${current.fx} ${current.fl}`;
+      const weatherInfo = `${current.type} ${low}~${high} ${current.fengxiang} ${fengli}`;
       this.setState({
         weatherInfo
       });