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

package.json

@@ -59,7 +59,7 @@
     "amos-designer": "^1.0.2",
     "amos-framework": "^1.2.2",
     "amos-iot-3dgraph": "^1.0.0",
-    "amos-iot-webstudio": "^1.0.4",
+    "amos-iot-webstudio": "1.0.4",
     "eslint-config-ray": "^1.0.26",
     "mockjs": "^1.0.1-beta3",
     "ray-build": "^2.0.2",

src/view/bizview/point/PointSearch.js

@@ -113,7 +113,7 @@ class PointSearch extends Component {
 
       data.departments ? data.departments.map(e => {
         if (e) {
-          departmentList.push(<Option value={`${e.sequenceNbr}`}>{e.departmentName}</Option>);
+          departmentList.push(<Option value={`${e.id}`}>{e.name}</Option>);
         }
       }) : [];
 

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

@@ -129,6 +129,7 @@ class EvaluationModel extends Component {
       }
     });
     form.rpni = rpni;
+    form.riskLevelId = target[0] && target[0].id;
     return target[0] && target[0].name;
   }
 
@@ -239,7 +240,7 @@ class EvaluationModel extends Component {
                     {item.coefficient}-{item.describe}
                   </Option>
                 )}
-                value={form.evaluationDid}
+                value={parseInt(form.evaluationDid)}
                 onChange={(e, item) => this.onSelectChange('evaluationDid', e, item)}
               />
             </FormItem>