bug

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/FireStrengthEdit.js

@@ -144,7 +144,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

@@ -152,6 +152,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>