Merge branch 'dev_upgrade' of 172.16.10.76:station/amos-convertor-view into dev_upgrade

src/consts/urlConsts.js

@@ -66,13 +66,13 @@ export const FscSerUrl = {
   trajectoryUrl: completePrefix(fireBaseURI, 'api/spc/trajectory/list?current={page}&pageSize={size}'), //右侧菜单-轨迹
   msgCategoryListUrl: completePrefix(view3dURI, 'msgCategoryListUrl'), //右侧菜单-消息-类别集合
   msgUrl: completePrefix(fireBaseURI, 'api/message/page?pageNumber={page}&pageSize={size}&time={time}&type={category}&title={title}'), //右侧菜单-消息 *
-  ruleRePlayUrl: completePrefix(fireBaseURI, 'urule/v1/rule/replay?batchNo={batchNo}'), //右侧菜单-步骤点击 *
+  ruleRePlayUrl: completePrefix(baseURI, 'urule/v1/rule/replay?batchNo={batchNo}'), //右侧菜单-步骤点击 *
   stepUrl: completePrefix(fireBaseURI, 'api/timeline/contingency/page?current={page}&pageSize={size}'), //右侧菜单-步骤 *
   broadcastTypeListUrl: completePrefix(view3dURI, 'broadcastTypeListUrl'), //右侧菜单-播报-类型集合
   broadcastUrl: completePrefix(fireBaseURI, 'api/timeline/{instanceNo}?recordType={recordType}'), //右侧菜单-播报 *
   markerDetailsUrl: completePrefix(view3dURI, 'view3d/node/info?id={id}&type={type}'), //三维地图中各种点详情
   tellRegionSelectUrl: completePrefix(view3dURI, 'patrol/save/curCompany/{orgCode}'), // 注入选择的厂区信息 post
-  loadPackagesUrl: completePrefix(securityBaseWsURI, 'urule/v1/packageeditor/loadPackages?project={project}'), //风险管控查询
+  loadPackagesUrl: completePrefix(baseURI, 'urule/v1/packageeditor/loadPackages?project={project}'), //风险管控查询
 
   pointInfoUrl: completePrefix(fireBaseURI, 'api/spc/queryPointById/{pointId}'), // 获取巡检点详情
 

src/view/bizview/equipmentLedger/Equipment/EquipmentModel.js

@@ -347,6 +347,9 @@ class EquipmentModel extends Component {
     //   AmosAlert.error('错误', e);
     // });
   }
+  handleUpload = () =>{
+
+  }
 
   render() {
     const { form, rules, chargeDeptData, chargeUserData, fireStationData, previewImage, previewVisible, project, riskSourceData } = this.state;
@@ -426,6 +429,7 @@ class EquipmentModel extends Component {
             <FormItem label={<span>电源负荷图</span>} field={form.imageUrl1} {...formItemLayout}>
               <div>
                 <Upload
+                  customRequest={this.handleUpload}
                   className="upload-img"
                   fileList={form.imageUrl1}
                   listType="picture-card"
@@ -447,6 +451,7 @@ class EquipmentModel extends Component {
             <FormItem label={<span>电缆沟封堵图</span>} field="picture2" {...formItemLayout}>
               <div>
                 <Upload
+                  customRequest={this.handleUpload}
                   className="upload-img"
                   fileList={form.imageUrl2}
                   listType="picture-card"
@@ -468,6 +473,7 @@ class EquipmentModel extends Component {
             <FormItem label={<span>消防车进站行车路线图</span>} field="picture3" {...formItemLayout}>
               <div>
                 <Upload
+                  customRequest={this.handleUpload}
                   className="upload-img"
                   fileList={form.imageUrl3}
                   listType="picture-card"
@@ -489,6 +495,7 @@ class EquipmentModel extends Component {
             <FormItem label={<span>消防取水图</span>} field="picture4" {...formItemLayout}>
               <div>
                 <Upload
+                  customRequest={this.handleUpload}
                   className="upload-img"
                   fileList={form.imageUrl4}
                   listType="picture-card"

src/view/bizview/preControl/paramSet/riskFactor/RiskFactorModel.js

 import React, { Component } from 'react';
-import { DatePicker } from 'amos-antd';
-import moment from 'moment';
+// import { DatePicker } from 'amos-antd';
+// import moment from 'moment';
 import { Form, AmosAlert, Input, Select } from 'amos-framework';
 import { accidentTypeNoPageAction,riskFactorEditAction } from '../../../../../services/preControlService';
+import { queryDictsByCode } from '../../../../../services/stationMaintenService';
 
 const FormItem = Form.Item;
 const Option = Select.Option;
 const TextArea = Input.TextArea;
-const typeData = [{id:1,name:'消防'},{id:2,name:'电力'},{id:3,name:'其他'}];
 /**
  * 危险因素新增及编辑
  */
@@ -21,11 +21,12 @@ class RiskFactorModel extends Component {
         accidentTypeId: null,
         type: ''
       },
-      accidentTypeData:[],
+      typeData: [],
+      accidentTypeData: [],
       rules: {
         name: [{ required: true, message: '危险因素不能为空' }],
         accidentTypeId: [{ required: true, message: '失效模式/事故类型不能为空' }],
-        type: [{ required: true, message: '分类不能为空' }],
+        type: [{ required: true, message: '分类不能为空' }]
       }
     };
   }
@@ -33,18 +34,19 @@ class RiskFactorModel extends Component {
   componentWillMount = () => {
     this.getAccidentTypeData();
     const { selectRowData } = this.props || {};
-      if(selectRowData){
-        let form ={};
+    if (selectRowData){
+      let form = {};
       Object.assign(form, selectRowData);
+      if (form.accidentTypeId){
+        form.accidentTypeId = parseInt(form.accidentTypeId);
+      }
       this.setState({ form });
     }
+    queryDictsByCode('INDUSTRY_TYPE').then(typeData =>{
+      this.setState({ typeData });
+    });
   };
 
-  getAccidentTypeData =()=>{
-    accidentTypeNoPageAction().then(data =>{
-      this.setState({ accidentTypeData: data });
-    });
-  }
 
   onSelectChange = (key, value) => {
     const { form } = this.state;
@@ -52,6 +54,12 @@ class RiskFactorModel extends Component {
     this.setState({ form });
   };
 
+  getAccidentTypeData =()=>{
+    accidentTypeNoPageAction().then(data =>{
+      this.setState({ accidentTypeData: data });
+    });
+  }
+
   handleSubmit = e => {
     this.form.validate((valid, dataValues) => {
       if (valid) {
@@ -76,7 +84,7 @@ class RiskFactorModel extends Component {
   }
 
   render() {
-    const { form, rules, accidentTypeData } = this.state;
+    const { form, rules, accidentTypeData,typeData } = this.state;
     const formItemLayout = {
       labelCol: {
         xs: { span: 24 },
@@ -97,7 +105,6 @@ class RiskFactorModel extends Component {
     };
 
     return (
-      
       <div className="risk-factor-model">
         <Form model={form} rules={rules} ref={component => (this.form = component)}>
           <FormItem label={<span>危险因素</span>} field="name" {...formItemLayout}>
@@ -116,8 +123,8 @@ class RiskFactorModel extends Component {
             <Select
               className="risk-factor-select"
               data={typeData}
-              renderOption={item => <Option value={item.id}>{item.name}</Option>}
-              value={parseInt(form.type)}
+              renderOption={item => <Option value={item.dictDataKey}>{item.dictDataValue}</Option>}
+              value={form.type}
               onChange={e => this.onSelectChange('type', e)}
             />
           </FormItem>

src/view/bizview/preControl/paramSet/riskFactor/index.js

@@ -6,7 +6,6 @@ import { Modal, AmosAlert } from 'amos-framework';
 import { riskFactorDeleteAction } from '../../../../../services/preControlService';
 import RiskFactorModel from './RiskFactorModel';
 
-const typeEum = { '1': '消防', '2': '电力', '3': '其他' };
 const getColumns = () => {
   return [
     {
@@ -27,10 +26,9 @@ const getColumns = () => {
     },
     {
       title: '分类',
-      dataIndex: 'type',
-      key: 'type',
-      width: '10%',
-      render: text => typeEum[text]
+      dataIndex: 'typeName',
+      key: 'typeName',
+      width: '10%'
     },
     {
       title: '维护部门',

src/view/bizview/preControl/paramSet/riskLevel/index.js

@@ -35,13 +35,13 @@ const getColumns = () => {
       width: '10%',
       className: 'uant-table-thead'
     },
-    {
-      title: '管控级别',
-      dataIndex: 'manageLevelName',
-      key: 'manageLevelName',
-      width: '10%',
-      className: 'uant-table-thead'
-    },
+    // {
+    //   title: '管控级别',
+    //   dataIndex: 'manageLevelName',
+    //   key: 'manageLevelName',
+    //   width: '10%',
+    //   className: 'uant-table-thead'
+    // },
     {
       title: '图标颜色',
       dataIndex: 'color',

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

@@ -353,7 +353,6 @@ class RiskModel extends Component {
   };
 
   onOk = (modelFlag, toolBarFlag) =>{
-    debugger
     const { form, selectData } = this.model.state;
     const { riskSourceId, fmeaId } = this.state;
     if (modelFlag === 'risk') {