修改bug

mods/components/3dviewConvertor/view/equipmentLedger/FireResources/FireEquipment/index.js

@@ -65,7 +65,7 @@ const fireEquipmentTableColumns = self => {
       width: '3%'
     },
     {
-      title: '建/构筑物',
+      title: '6',
       dataIndex: 'riskSourceName',
       key: 'riskSourceName',
       width: '8%'

src/styles/view/biz/riskModel/riskModel.scss

@@ -368,6 +368,13 @@
   .amos-form-item {
     margin-bottom: 1.5rem;
   }
+  .amos-modal-container .amos-modal-content {
+    padding: 5px;
+}
+  .point-model .point-model-left .point-model-table .ant-table-pagination {
+    margin: 8px 0;
+    float: left;
+}
 
   .amos-radio-disabled {
     .amos-radio-status {

src/view/bizview/common/tableComponent/table/AmosGridTable.js

@@ -184,6 +184,7 @@ class AmosGridTable extends Component {
     if (operateCol){
       columns[columns.length - 1].render = (text,record) => this.addOperateCol(text,record);
     }
+    debugger
     let tepmPage = Object.assign({
       size: 'small',
       total: totals,
@@ -192,8 +193,8 @@ class AmosGridTable extends Component {
       onShowSizeChange: this.onSizeChange,
       onChange: this.onPaginationChange,
       maxSeries:4,
-      showSizeChanger: true,
-      showTotal: this.showTotal
+      showSizeChanger: true
+      // showTotal: this.showTotal
     },  pagination);
     let _tempPagination = isPageable === false ? false : tepmPage;
     let bordered = true;

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

@@ -3,10 +3,9 @@ import formatUrl from 'amos-processor/lib/utils/urlFormat';
 import PropTypes from 'prop-types';
 import { Store } from 'amos-tool';
 import SysConsts from 'amos-processor/lib/config/consts';
-import { Select, Button, Input, Upload, message } from 'amos-framework';
+import { Select, Button, Input, Upload,Icon, message } from 'amos-framework';
 import BizIcon from './../../../../common/icon/BizIcon';
 import { FasSerUrl } from './../../../../../consts/urlConsts';
-
 const Option = Select.Option;
 const lsTool = Store.lsTool;
 
@@ -113,6 +112,8 @@ class FireEquipmentToolBar extends Component {
           enableEdit &&
           (
             <div className="fire-truck-buttons">
+             <Button title="导出模板" icon={<Icon icon="ccgl-chukucaozuo-13" prefix="amosicon" color="rgb(52, 95, 166)"  />} transparent onClick={() => this.props.downloadTemp('model')} />
+
               <Upload {...uploadProps}>
                 <Button icon={<BizIcon icon="daoru" />} transparent />
               </Upload>

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

@@ -8,8 +8,10 @@ import { deleteFireEquipmentAction, addFireEquipmentAction } from './../../../..
 import FireEquipmentModel from './FireEquipmentModel';
 import FireEquipmentToolBar from './FireEquipmentToolBar';
 import BizIcon from './../../../../common/icon/BizIcon';
-
+import { downLoadFilePost } from './../../../../../utils/FileUtils';
 const EquipClassifyEnum = { 0: '设备类', 1: '耗材类', 2: '视频监控', 3: '灭火器材' };
+import { FasSerUrl } from './../../../../../consts/urlConsts';
+import formatUrl from 'amos-processor/lib/utils/urlFormat';
 const fireEquipmentTableColumns = self => {
   return [
     {
@@ -331,6 +333,16 @@ class FireEquipmentView extends Component {
   import = () => {
 
   }
+  downLoadExeclFile = (exportType) => {
+    const { searchParam } = this.state;
+    let modelName = 'equipment';
+    let url = formatUrl(FasSerUrl.exportExcelFireEquipmentPointUrl, { exportType, modelName });
+    let queryParamMap = {};
+    Object.assign(queryParamMap, searchParam);
+    queryParamMap.pageSize = -1;
+    downLoadFilePost(url, queryParamMap);
+  }
+
 
   getToolButton = () => {
     let buttonArr = new Array();
@@ -433,6 +445,7 @@ class FireEquipmentView extends Component {
           getTableListData={getTableListData}
           pageConfig={this.pageConfig}
           enableEdit={_true_}
+          downloadTemp={this.downLoadExeclFile}
         />
         <AmosGridTable
           rowKey="id"

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

@@ -95,6 +95,10 @@ class AccidentType extends Component {
         AmosAlert.warning('提示', '请先点击选择编辑的行');
         return;
       } else {
+        if(selectedRows.length >1){
+          AmosAlert.warning('提示', '请选择一行');
+          return;
+        }
         this.setState({ modal: true, toolBarFlag });
       }
     } else if (toolBarFlag == '3') {

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

@@ -82,13 +82,17 @@ const getDColumns = () => {
 class EvaModel extends Component {
   constructor(props) {
     super(props);
+   
     this.state = {
       selectedRows: [],
-      selectedRowKeys: []
+      selectedRowKeys: [],
+      pagination: true,
     };
   }
 
   componentWillMount(){
+   
+
 
   };
 
@@ -113,18 +117,46 @@ class EvaModel extends Component {
 
 
   render() {
-    let { totalCount } = this.state;
+    debugger
+    let { totalCount,pagination } = this.state;
     let { dataList } = this.props;
+    let s=0;
+    let o=0;
+    let d=0;
+
+     if(dataList.S){
+      s=dataList.S.length
+     }
+     if(dataList.D){
+     d= dataList.D.length
+     }
+     if(dataList.O){
+     o= dataList.O.length
+     }
+     let defaultPageConfigs = {
+      current: 1,
+      pageSize: s
+    };
+    let defaultPageConfig0 = {
+      current: 1,
+      pageSize: o
+    };
+    let defaultPageConfigd = {
+      current: 1,
+      pageSize: d
+    };
     return (
       <div className='eva-model' >
         <div className='eva-model-S' >
           <CardPane title="危险程度（S）评分标准" style={{ width: '100%' }}>
             <AmosGridTable
               columns={getSColumns()}
+              isPageable={pagination}
               callBack={this.reload}
               dataList={dataList.S || []}
               isChecked={false}
-              totals={totalCount}
+              totals={s}
+              defaultPageConfig={defaultPageConfigs}
               getTableDataAction={()=>{}}
               onRowDoubleClick={this.onRowDoubleClick}
             />
@@ -133,10 +165,12 @@ class EvaModel extends Component {
         <div className='eva-model-O' >
           <CardPane title="故障频数（O）评分标准" style={{ width: '100%' }}>
             <AmosGridTable
+               defaultPageConfig={defaultPageConfig0}
               columns={getOColumns()}
+              isPageable={pagination}
               callBack={this.reload}
               dataList={dataList.O || []}
-              totals={totalCount}
+              totals={o}
               isChecked={false}
               getTableDataAction={()=>{}}
               onRowDoubleClick={this.onRowDoubleClick}
@@ -146,11 +180,13 @@ class EvaModel extends Component {
         <div className='eva-model-D' >
           <CardPane title="管控度（D）评分标准" style={{ width: '100%' }}>
             <AmosGridTable
+               defaultPageConfig={defaultPageConfigd}
               columns={getDColumns()}
+              isPageable={pagination}
               callBack={this.reload}
               dataList={dataList.D || []}
               isChecked={false}
-              totals={totalCount}
+              totals={d}
               getTableDataAction={()=>{}}
               onRowDoubleClick={this.onRowDoubleClick}
             />

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

@@ -90,6 +90,10 @@ class RiskFactor extends Component {
         AmosAlert.warning('提示', '请先点击选择编辑的行');
         return;
       } else {
+        if(selectedRows.length >1){
+          AmosAlert.warning('提示', '请选择一行');
+          return;
+        }
         this.setState({ modal: true, toolBarFlag });
       }
     } else if (toolBarFlag === '3') {

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

@@ -74,7 +74,17 @@ class RiskLevelModel extends Component {
     this.form.validate((valid, dataValues) => {
       if (valid) {
         let { form } = this.state;
-        this.riskLevelEdit(form);
+
+         if(form.topLimit<form.downLimit){
+          AmosAlert.error('提示', '上线不能低于下限！');
+          return false;
+         }else{
+          this.riskLevelEdit(form);
+         }
+
+
+
+        
       } else {
         return false;
       }

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

@@ -123,6 +123,10 @@ class RiskLevel extends Component {
         AmosAlert.warning('提示', '请先点击选择编辑的行');
         return;
       } else {
+        if(selectedRows.length >1){
+          AmosAlert.warning('提示', '请选择一行');
+          return;
+        }
         this.setState({ modal: true, toolBarFlag });
       }
     } else if (toolBarFlag == '3') {

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

@@ -236,8 +236,10 @@ class RiskModel extends Component {
       this.setState({
         code: data.code,
         level: data.level,
-        rpni: data.rpni
+        rpni: data.rpni,
+        node:data
       });
+ 
     });
   }
 
@@ -342,6 +344,7 @@ class RiskModel extends Component {
   };
 
   onOk = (modelFlag, toolBarFlag) =>{
+    debugger
     const { form, selectData } = this.model.state;
     const { riskSourceId, fmeaId } = this.state;
     if (modelFlag === 'risk') {
@@ -505,11 +508,11 @@ class RiskModel extends Component {
   }
 
   getDeteleConfirmByLength =(length)=>{
-    if (length > 0){
-      return '是否同步删除下层级所有节点';
-    } else {
+    // if (length > 0){
+    //   return '是否同步删除下层级所有节点';
+    // } else {
       return '确定要删除么';
-    }
+    // }
   }
 
   riskSourceDelete =(id, length)=>{
@@ -920,7 +923,7 @@ class RiskModel extends Component {
           visible={modal}
           className="risk-model-model"
           destroyContent
-          width={modelFlag === 'equip' ? '70%' : '50%'}
+          width={modelFlag === 'equip' ? '70%' : '60%'}
           content={this.getContext(modelFlag, toolBarFlag)}
           onCancel={() => this.cancel()}
           onOk={() => this.onOk(modelFlag, toolBarFlag)}

src/view/bizview/preControl/riskModel/model/PointModel.js

@@ -232,7 +232,7 @@ class PointModel extends Component {
       <div className="point-model">
         <div className="point-model-left">
           <div className="point-model-title">
-            <span>责任部门：</span>
+            <span>责任部门555：</span>
             <Select
               className="point-model_select"
               data={deptData}

src/view/bizview/preControl/riskModel/model/RiskFactorModel.js

@@ -24,7 +24,7 @@ class RiskFactorModel extends Component {
       riskFactorData: [],
       userData: [],
       rules: {
-        riskFactorIds: [{ required: true, message: '危险因素不能为空' }]
+        riskFactorsId: [{ required: true, message: '危险因素不能为空' }]
       }
     };
   }
@@ -119,7 +119,8 @@ class RiskFactorModel extends Component {
               <span className="fmea-item-span">危险有害因素：</span>
               <Divider />
               <FormItem label={<span>危险因素</span>} className="fmea-item-risk-factor" field="riskFactorsId" {...formItemLayout}>
-                <div className="risk-factor-select" style={{ height: '200px' }} >
+                {/* <div className="risk-factor-select" style={{ height: '200px' }} > */}
+                <div className="risk-factor-select"  >
                   <MultiSelect
                     className="fmea-model-select"
                     data={riskFactorData}

src/view/bizview/preControl/riskModel/model/RiskSourceModel.js

@@ -40,6 +40,7 @@ class RiskSourceModel extends Component {
   }
 
   componentWillMount = () => {
+    debugger
     let { form } = this.state;
     let { selectedRow } = this.props;
     if (selectedRow) {
@@ -66,9 +67,10 @@ class RiskSourceModel extends Component {
   };
 
   componentWillReceiveProps = (nextProps) => {
+    debugger
     let { form } = this.state;
     let { selectedRow } = nextProps;
-    if (selectedRow && form.id !== selectedRow.id) {
+    // if (selectedRow && form.id !== selectedRow.id) {
       form.id = selectedRow.id;
       form.name = selectedRow.name;
       form.code = selectedRow.code;
@@ -80,7 +82,7 @@ class RiskSourceModel extends Component {
       form.floor3d = selectedRow.floor3d;
       form.isIndoor = selectedRow.isIndoor;
       this.setState({ form, isEdit: true });
-    }
+    // }
   }
 
   onSelectChange = (key, value) => {