换流站修改bug

src/view/bizview/equipmentLedger/Equipment/EquipmentModel.js

@@ -362,7 +362,7 @@ class EquipmentModel extends Component {
               <Select
                 className="risk_factor_select"
                 data={chargeDeptData}
-                renderOption={item => <Option value={parseInt(item.id)}>{item.departmentName}</Option>}
+                renderOption={item => <Option value={item.sequenceNbr}>{item.departmentName}</Option>}
                 value={form.chargeDeptId}
                 onChange={e => this.onSelectChange('chargeDeptId', e)}
               />
@@ -371,7 +371,7 @@ class EquipmentModel extends Component {
               <Select
                 className="risk_factor_select"
                 data={chargeUserData}
-                renderOption={item => <Option value={parseInt(item.id)}>{item.name}</Option>}
+                renderOption={item => <Option value={item.userId}>{item.realName}</Option>}
                 value={form.chargeUserId === undefined ? null : form.chargeUserId}
                 onChange={e => this.onSelectChange('chargeUserId', e)}
                 closeOnScroll

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

@@ -122,7 +122,7 @@ class FireTruckModel extends Component {
                 searchable
                 className="risk_factor_select"
                 data={chargeDeptData}
-                renderOption={item => <Option value={parseInt(item.id)}>{item.departmentName}</Option>}
+                renderOption={item => <Option value={item.sequenceNbr}>{item.departmentName}</Option>}
                 defaultOption={<Option value={-1}>{'请选择'}</Option>}
                 value={form.deptId}
                 onChange={e => this.onSelectChange('deptId', e)}

src/view/bizview/point/PointSearch.js

@@ -78,11 +78,28 @@ class PointSearch extends Component {
   }
 
   onDeptChange = (value) => {
-    this.queryUserByDept(value);
+    debugger
+    if(value===undefined){
+      let { searchParam} = this.state;
+      delete searchParam['userId'];
+
+      this.setState({ searchParam ,userData: []});
+     
+      Object.assign(searchParam,{ pageNumber: 0,pageSize: 10 });
+      this.setState({ searchParam});
+      searchParam && this.props.setSearchParam(searchParam);
+    }else{
+      this.queryUserByDept(value);
+    }
+    
   }
 
+  
+
   queryUserByDept = deptId => {
+
     queryUserByDeptIdAction(deptId).then(data => {
+      debugger
       let userData = data;
       this.setState({ userData: userData });
     });
@@ -100,7 +117,7 @@ class PointSearch extends Component {
 
       data.departments ? data.departments.map(e => {
         if (e) {
-          departmentList.push(<Option value={`${e.id}`}>{e.departmentName}</Option>);
+          departmentList.push(<Option value={`${e.sequenceNbr}`}>{e.departmentName}</Option>);
         }
       }) : [];
 
@@ -130,8 +147,8 @@ class PointSearch extends Component {
   }
 
   render() {
-    let { userData, dataTypeOptions, departmentOptions, statusData, pointLevelOptions ,selectData } = this.state;
-    const checkUserOptions = userData.map(d => <Option key={d.id}>{d.label}</Option>);
+    let { userData, dataTypeOptions, departmentOptions, statusData, pointLevelOptions ,selectData,searchParam } = this.state;
+    const checkUserOptions = userData.map(d => <Option key={d.id}>{d.name}</Option>);
     return (
       <div className='create-device-search-root'>
         <div className='catalog-select'>
@@ -179,6 +196,7 @@ class PointSearch extends Component {
             onChange={(e)=>this.onSelectedChange(e,'userId')}
             placeholder='巡检人员'
             allowClear
+            value={searchParam.userId}
           >
           {checkUserOptions}
           </Select>

src/view/bizview/task/taskSearch.js

@@ -74,7 +74,7 @@ class TaskSearch extends Component {
 
       data.users
         ? data.users.map(e => {
-          userlist.push(<Option value={`${e.id}`}>{e.name}</Option>);
+          userlist.push(<Option value={`${e.userId}`}>{e.realName}</Option>);
         })
         : [];
 

src/view/common/mainframe/MainFrameView.js

@@ -90,9 +90,10 @@ class MainFrame extends Component {
       isArray(menus) && menus.forEach(element => {
         if (element.permissionType === 'MENU' && element.path === 'biz') {
           userMenus.push(element.children);
-        } else if(element.permissionType === 'MENU' && element.path === 'main') {
-          userMenus.push(element.children);
-        }
+        } 
+        // else if(element.permissionType === 'MENU' && element.path === 'main') {
+        //   userMenus.push(element.children);
+        // }
       });
       const lsTool = Store.lsTool;
       lsTool.write(SysConsts.permissions, JSON.stringify(menus));