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

src/styles/view/biz/point/point.scss

@@ -569,6 +569,7 @@
                   // border: 1px solid $core-border-color;
 
                   .ant-table {
+                    height: 100%;
                     border-radius: 0;
 
                     &.ant-table-middle {

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

@@ -187,7 +187,7 @@ class FireEquipmentModel extends Component {
                 onChange={e => this.onDateChange('productionDate', e)}
               />
             </FormItem>
-            <FormItem label={<span>保养周期</span>} field="maintenanceCycle" {...formItemLayout}>
+            <FormItem label={<span>保养周期(月)</span>} field="maintenanceCycle" {...formItemLayout}>
               <InputNumber className="risk_factor_input" required value={form.maintenanceCycle} onChange={value => this.onInputChange('maintenanceCycle', value)} />
             </FormItem>
             <FormItem label={<span>3维坐标</span>} field="position3d" {...formItemLayout}>

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

@@ -74,11 +74,11 @@ class PointToolBar extends Component {
         if (info.file.status !== 'uploading') {
           console.log(info.file, info.fileList);
         }
-        if (info.file.status === 'done') {
-          message.success(`${info.file.name} 上传成功`);
+        if (info.file.status === 'done' && info.file.response.success) {
+          message.success(`${info.file.name} 导入成功`);
           this.props.reload();
-        } else if (info.file.status === 'error') {
-          message.danger(`${info.file.name} 失败.`);
+        } else if (info.file.status === 'error' || !info.file.response.success) {
+          message.danger(`${info.file.name} 导入失败.`);
         }
       }
     };

src/view/bizview/equipmentLedger/FireResources/FireStrength/FireStrengthAdd.js

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 
 const FormItem = Form.Item;
 const Option = Select.Option;
+
 class FireStrengthAdd extends Component {
   constructor(props) {
     super(props);
@@ -27,11 +28,12 @@ class FireStrengthAdd extends Component {
         username: [
           { required: true, message: '请输入名称' }
         ],
-        // position: [
-        //   { required: true, message: '请输入职位' }
-        // ],
+        position: [
+          { required: true, message: '请输入职位' }
+        ],
         phone_num: [
-          { required: true, message: '请输入移动号码' }
+          { required: true, message: '请输入移动号码' },
+          { pattern: /^1[3|4|5|7|8][0-9]\d{8}$/, message: '请输入正确的手机号' }
         ]
       }
     };
@@ -104,7 +106,7 @@ class FireStrengthAdd extends Component {
                 renderOption={item => <Option value={item.code}>{item.name}</Option>}
                 onChange={e => this.onSelectChange('position', e)}
               />
-       
+
           {/* <Input
             value={strength.position ? strength.position : ''}
             onChange={(e) => this.onChange('position', e)}

src/view/bizview/equipmentLedger/FireResources/FireStrength/FireStrengthEdit.js

@@ -34,7 +34,8 @@ class FireStrengthEdit extends Component {
           { required: true, message: '请输入职位' }
         ],
         phone_num: [
-          { required: true, message: '请输入移动号码' }
+          { required: true, message: '请输入移动号码' },
+          { pattern: /^1[3|4|5|7|8][0-9]\d{8}$/, message: '请输入正确的手机号' }
         ]
       }
     };
@@ -144,7 +145,7 @@ class FireStrengthEdit extends Component {
           </FormItem>
         <FormItem label="工作描述" field="jobDes" {...formItemLayout} >
           <Input
-            value={strength.jobDes ? strength.jobDes : ''}
+            value={strength.job_des ? strength.job_des : ''}
             onChange={(e) => this.onChange('jobDes', e)}
             className="risk_factor_input"
           />

src/view/bizview/equipmentLedger/FireResources/FireTruck/fireTruckModel.js

@@ -36,8 +36,14 @@ class FireTruckModel extends Component {
       chargeDeptData: [],
       riskSourceData:[],
       rules: {
-        carNum: [{ required: true, message: '车牌号不能为空' }],
-        name: [{ required: true, message: '名称不能为空' }],
+        carNum: [
+          { required: true, message: '车牌号不能为空' },
+          { max: 20, message: '车牌号不能大于20个字符' }
+        ],
+        name: [
+          { required: true, message: '名称不能为空' },
+          { max: 100, message: '名称不能大于100个字符' }
+        ],
         position3d: [{ validator: this.validPositon3d }]
       }
     };
@@ -152,6 +158,12 @@ class FireTruckModel extends Component {
             <FormItem label={<span>3维坐标</span>} field="position3d" {...formItemLayout}>
               <Input className="risk_factor_input" required disabled={!this.props.editable} value={form.position3d} onChange={e => this.onInputChange('position3d', e.target.value)} />
             </FormItem>
+            <FormItem label={<span>ue4位置</span>} field="ue4Location" {...formItemLayout}>
+              <Input className="risk_factor_input" required disabled={!this.props.editable} value={form.ue4Location} onChange={e => this.onInputChange('ue4Location', e.target.value)} />
+            </FormItem>
+            <FormItem label={<span>ue4旋转</span>} field="ue4Rotation" {...formItemLayout}>
+              <Input className="risk_factor_input" required disabled={!this.props.editable} value={form.ue4Rotation} onChange={e => this.onInputChange('ue4Rotation', e.target.value)} />
+            </FormItem>
             <FormItem label={<span>3维楼层</span>} field="floor3d" {...formItemLayout}>
               <Select
                 className="fire-equip-select"

src/view/bizview/point/PointListView.js

@@ -229,7 +229,7 @@ class PointListView extends Component {
     return (
       <div className="create-device-root">
         <div className="create-device-host-top">
-          <div className="table-title">风险点信息列表</div>
+          <div className="table-title">巡检点信息列表</div>
           <div className="table-search">
             <PointSearch setSearchParam={this.setSearchParam} countStatus={status} />
           </div>

src/view/bizview/point/PointStatistics.js

@@ -63,26 +63,26 @@ class PointStatistics extends Component {
           itemStyle: {
             normal: {
               label: {
-                show: true,
-                position: 'center',
-                formatter: function(params) {
-                  let dataIndex = params.dataIndex;
-                  if (parseInt(dataIndex) === 0) {
-                    return '{a|' + total + '}' + '\r\n' + '{b|' + '总数' + '}';
-                  } else {
-                    return '';
-                  }
-                },
-                rich: {
-                  a: {
-                    fontSize: '28',
-                    color: 'black'
-                  },
-                  b: {
-                    fontSize: '16',
-                    color: 'black'
-                  }
-                }
+                show: false,
+                // position: 'center',
+                // formatter: function(params) {
+                //   let dataIndex = params.dataIndex;
+                //   if (parseInt(dataIndex) === 0) {
+                //     return '{a|' + total + '}' + '\r\n' + '{b|' + '总数' + '}';
+                //   } else {
+                //     return '';
+                //   }
+                // },
+                // rich: {
+                //   a: {
+                //     fontSize: '28',
+                //     color: 'black'
+                //   },
+                //   b: {
+                //     fontSize: '16',
+                //     color: 'black'
+                //   }
+                // }
               },
               labelLine: {
                 show: false
@@ -132,6 +132,14 @@ render(){
         <div className="point-statistics-concent">
           异常点数：<span>{error}</span>
         </div>
+        {
+          total &&
+          <div className="point-statistics-label">
+            {total} <br/>
+            总数
+          </div>
+        }
+
       </div>
     );
   }

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

@@ -130,6 +130,9 @@ class RiskLevelModel extends Component {
               onChange={(value)=> this.onSelectChange('level', value)}
             />
           </FormItem>
+          <FormItem label={<span>图标颜色</span>}{...formItemLayout}>
+            <Input value={form.color} disabled />
+          </FormItem>
           <FormItem label={<span>上限</span>} field="topLimit" {...formItemLayout}>
             <InputNumber defaultValue={1} max={1000} min={1} value={form.topLimit} onChange={value => this.onChange(value, 'topLimit')} />
           </FormItem>

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

@@ -173,7 +173,7 @@ class PointModel extends Component {
     let { pointId } = this.state;
     let searchParam = [];
     value && searchParam.push({ name: e, value });
-    pointId && searchParam.push({ name: 'pointId', value: pointId });
+    // pointId && searchParam.push({ name: 'pointId', value: pointId });
     this.setState({ searchParam,[e]: value },()=> this.questStatistiscData({ pageNumber: 0, pageSize: 10 }));
   };
 
@@ -232,7 +232,7 @@ class PointModel extends Component {
       <div className="point-model">
         <div className="point-model-left">
           <div className="point-model-title">
-            <span>责任部门555：</span>
+            <span>责任部门：</span>
             <Select
               className="point-model_select"
               data={deptData}