bug

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/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: '请输入正确的手机号' }
         ]
       }
     };

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 }]
       }
     };

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}

src/view/region/index.js

@@ -150,7 +150,7 @@ class RegionSelect extends Component {
         browserHistory.push('/main/3dview');
         //2.通过配置，确定是否打开业务屏
         if (isAutoOpen){
-          const url = `?token=+${ls.read(token)}`;
+          const url = `?token=${ls.read(token)}`;
           window.open('/biz/assessment/' + url);
         }
       }