*）解决package版本问题

.stylelintignore

+node_modules/
\ No newline at end of file

amos.config.js

@@ -9,25 +9,18 @@
     // 普通http
     httpURI: {
       // 根url
-      baseURI: 'http://172.16.3.41:10002/',
-     // baseURI: 'http://localhost:9000/',
+      baseURI: 'http://172.16.11.20:10005/',
       // 安全模块api地址
-      //securityBaseURI: 'http://39.100.239.237:7800/',
-     securityBaseURI: 'http://172.16.11.20:10005/',
-      //预控系统
-     // preControl: 'http://172.16.10.91:8083/',
-	  //APP图片
-	  picURI: 'http://172.16.3.41:8080',
-
-      //loginURI: 'http://39.100.239.237:3000/'//基础平台
-     // loginURI: 'http://47.108.89.109:5000/'//基础平台
+      securityBaseURI: 'http://172.16.10.72:10005/',
+      //APP图片
+      picURI: 'http://172.16.11.20:8080',
     },
     // websocket 地址
     wsURI: {
       securityBaseURI: 'ws://172.16.11.20:10600/'
     },
     // 外部链接地址
-    outterURI: { 
+    outterURI: {
       publish: '/main/morphic/publish?appId={appId}&id={id}&token={token}&isPublish={isPublish}'
     },
     // 系统配置信息 主要是为了区分各子系统

package.json

@@ -53,8 +53,8 @@
     "ray-eventpool": "^1.0.0",
     "ray-mediaquery": "^1.0.0",
     "ray-progress": "^1.0.0",
-    "react": "~16.0.0",
-    "react-dom": "~16.0.0"
+    "react": "~16.7.0",
+    "react-dom": "~16.7.0"
   },
   "devDependencies": {
     "amos-build": "^3.x",

src/view/patrol/catalogTree/CatalogTreeInput.js

@@ -52,8 +52,8 @@ class CatalogTreeInput extends Component {
   queryCatalogTree = () => {
     queryCatalogTreeAction().then(data => {
       let treeData = data;
-      data.push({key: '0',value: '0',label: '',children: []});
-      console.log('queryCatalogTree',data);
+      data.push({ key: '0', value: '0', label: '', children: [] });
+      console.log('queryCatalogTree', data);
       this.setState({ treeData });
     });
   };
@@ -64,8 +64,7 @@ class CatalogTreeInput extends Component {
         let { form } = this.state;
         addCatalogTreeAction(form).then(
           data => {
-            debugger
-            if(data===null){
+            if (data === null) {
               AmosAlert.success('提示', '保存成功');
             } else {
               AmosAlert.error('提示', '添加分类失败：目录名称已存在');
@@ -88,7 +87,7 @@ class CatalogTreeInput extends Component {
 
   render() {
     const { form, treeData, rules } = this.state;
-    console.log('form',form);
+    console.log('form', form);
     const formItemLayout = {
       labelCol: {
         xs: { span: 24 },

src/view/patrol/route/newRoute.js

@@ -55,7 +55,6 @@ class NewRoute extends Component {
   };
 
   onDeptChange = (key, value) => {
-    debugger
     const { form } = this.state;
     form[key] = value;
     this.queryUserByDept(value);
@@ -85,14 +84,14 @@ class NewRoute extends Component {
   };
 
   queryDeptByOrgCode = () => {
-    
+
     queryDeptByOrgCodeAction().then(data => {
       this.setState({ deptData: data });
     });
   };
 
   queryUserByDept = deptId => {
-    
+
     queryUserByDeptIdAction(deptId).then(data => {
       this.setState({ userData: data });
     });

src/view/patrol/routeNew/RouteInfo.js

@@ -35,9 +35,8 @@ class RouteInfo extends Component {
     forword && this.setState({ forword });
   }
 
- 
+
   onClickBootBar = (type) => {
-    debugger
     if (type === '1') {
       browserHistory.goBack();
     } else if (type === '2') {
@@ -45,7 +44,7 @@ class RouteInfo extends Component {
     }
   };
 
- 
+
 
   setRoutePoint =(dataList)=>{
     this.setState({ dataList });

src/view/patrol/routeNew/RouteInfoxq.js

@@ -32,9 +32,8 @@ class RouteInfoxq extends Component {
     forword && this.setState({ forword });
   }
 
- 
+
   onClickBootBar = (type) => {
-    debugger
     if (type === '1') {
       browserHistory.goBack();
     } else if (type === '2') {
@@ -42,7 +41,7 @@ class RouteInfoxq extends Component {
     }
   };
 
- 
+
 
   setRoutePoint =(dataList)=>{
     this.setState({ dataList });
@@ -97,7 +96,7 @@ class RouteInfoxq extends Component {
     return (
       <div className='route-info'>
         {/* <BootBar dropnavs={dropnavs} callBack={this.onClickBootBar} /> */}
-      
+
         <RouteMainxq routeId={routeId}  ref={component => this.routeMain = component} />
         <RoutePointTablexq  routeId={routeId} forword={forword} ref={component =>this.routePoint = component} />
       </div>

src/view/patrol/routeNew/RouteMain.js

@@ -9,7 +9,7 @@ import {
 } from '../../../services/checkService';
 import { AmosAlert } from 'amos-framework';
 
-import {  Store } from 'amos-tool';
+import { Store } from 'amos-tool';
 const lsTool = Store.lsTool;
 
 
@@ -64,7 +64,7 @@ class RouteMain extends Component {
 
   onInit = id => {
     queryRouteDetailAction(id).then(data => {
-      
+
       let deptId = data.deptId;
       deptId && this.queryUserByDept(deptId);
       this.setState({ form: data });
@@ -78,36 +78,35 @@ class RouteMain extends Component {
   };
 
   onDeptChange = (key, value) => {
-   let keyd= lsTool.read('departmentdate');
-
-   const { form } = this.state;
- 
- 
-debugger
- // if(keyd!='null'){
-  //     if(value!=keyd){
-        
-  //       AmosAlert.error('提示', '只能选择本部门');
-  //       form[key] = '';
-  //       this.setState({ userData: [] });
-  //      this.setState({ form });
-
-  //     }else{
-  //       form[key] = value;
-  //       this.queryUserByDept(value);
-  //       this.setState({ form });
-  //     }
-
-  // }else{
+    let keyd = lsTool.read('departmentdate');
+
+    const { form } = this.state;
+
+
+    // if(keyd!='null'){
+    //     if(value!=keyd){
+
+    //       AmosAlert.error('提示', '只能选择本部门');
+    //       form[key] = '';
+    //       this.setState({ userData: [] });
+    //      this.setState({ form });
+
+    //     }else{
+    //       form[key] = value;
+    //       this.queryUserByDept(value);
+    //       this.setState({ form });
+    //     }
+
+    // }else{
     form[key] = value;
     this.queryUserByDept(value);
     this.setState({ form });
 
-  //}
+    //}
+
 
 
 
-  
   };
 
   handleExecutorsChange = (userId, user) => {
@@ -149,7 +148,7 @@ debugger
         <Form model={form} rules={rules} ref={component => this.form = component}>
           <div className="input-item-div-left">
             <FormItem label={<span>路线名称</span>} field="name" {...formItemLayout}>
-              <Input className="input-item-input" value={form.name} maxLength = "50" onChange={e => this.onChange('name', e.target.value)} />
+              <Input className="input-item-input" value={form.name} maxLength="50" onChange={e => this.onChange('name', e.target.value)} />
             </FormItem>
             <FormItem label={<span>责任人</span>} field="boss" {...formItemLayout}>
               <Select
@@ -169,7 +168,7 @@ debugger
             <FormItem label={<span>责任部门</span>} field="deptId" {...formItemLayout}>
               <Select
                 className="input-item-input"
-                searchable                
+                searchable
                 data={deptData ? deptData : []}
                 defaultValue={<Option value=''>请选择</Option>}
                 renderOption={item => <Option value={item.sequenceNbr}>{item.departmentName}</Option>}

src/view/patrol/task/newTask.js

 import React, { Component } from 'react';
 import moment from 'moment';
-import { Form, Input, AmosAlert, Button, Checkbox, InputNumber , Select} from 'amos-framework';
+import { Form, Input, AmosAlert, Button, Checkbox, InputNumber, Select } from 'amos-framework';
 import { TreeSelect, DatePicker } from 'amos-antd';
 import PropTypes from 'prop-types';
 import { browserHistory } from 'amos-react-router';
@@ -96,15 +96,15 @@ class NewTask extends Component {
             text ? (
               text
             ) : (
-              '否'
-            )
+                '否'
+              )
           ) : (
-            <Checkbox
-              onChange={e => this.onChangePicCheckBox(record, e.target.checked)}
-              checked={text === undefined || text === '否' ? false : true}
-              defaultChecked={text === undefined || text === '否' ? false : true}
-            />
-          );
+              <Checkbox
+                onChange={e => this.onChangePicCheckBox(record, e.target.checked)}
+                checked={text === undefined || text === '否' ? false : true}
+                defaultChecked={text === undefined || text === '否' ? false : true}
+              />
+            );
         }
       }
     ];
@@ -112,7 +112,7 @@ class NewTask extends Component {
 
   loadexecutor = () => {
     queryDeptUserTree().then(data => {
-      
+
       let deptPersons = data.filter(item => item.children !== null);
       deptPersons.map(item => {
         if (item.children.length > 0) {
@@ -134,10 +134,10 @@ class NewTask extends Component {
 
   onSelectChange = (value, item) => {
     const { form } = this.state;
-    form.executor =item.name;
+    form.executor = item.name;
     form.executorId = parseInt(value);
     this.setState({ form });
-  
+
   }
 
 
@@ -180,12 +180,12 @@ class NewTask extends Component {
         //   obj.name = item.name;
         //   return obj;
         // });
-        taskInfo.finishTime = moment(taskInfo.finishTime).format('YYYY-MM-DD HH:mm:ss') ;
-        if (taskInfo.warnTime !== ''){
-          taskInfo.warnTime = moment(taskInfo.warnTime).format('YYYY-MM-DD HH:mm:ss') ;
+        taskInfo.finishTime = moment(taskInfo.finishTime).format('YYYY-MM-DD HH:mm:ss');
+        if (taskInfo.warnTime !== '') {
+          taskInfo.warnTime = moment(taskInfo.warnTime).format('YYYY-MM-DD HH:mm:ss');
         }
         let pic = new Object();
-        let config =new Array();
+        let config = new Array();
         pic.start = form.shotMinNumber;
         pic.end = form.shotMaxNumber;
         if (form.isPicture === true) {
@@ -193,27 +193,26 @@ class NewTask extends Component {
         } else {
           pic.isMust = '否';
         }
-       // pic.isMust = form.isPicture;
+        // pic.isMust = form.isPicture;
         config.push(pic);
         let requestBody = new Object();
         requestBody.taskInfo = taskInfo;
         requestBody.taskInfo.config = config;
         // JSON.stringify(config);
         saveTaskAction(requestBody).then(
-         
+
           data => {
-            if(data===null){
+            if (data === null) {
               AmosAlert.success('提示', '保存成功');
-            }else{
-              if(data.result==="FAILURE"){
-                AmosAlert.error('提示', data.message );
-               
+            } else {
+              if (data.result === "FAILURE") {
+                AmosAlert.error('提示', data.message);
+
               } else {
                 AmosAlert.success('提示', '保存成功');
               }
             }
-            debugger
-           
+
             browserHistory.goBack('/main/patrol/task');
           },
           err => {
@@ -263,14 +262,14 @@ class NewTask extends Component {
       <div className="input_item_div">
         <Form model={form} rules={rules} ref={component => this.form = component}>
           <FormItem label={<span>任务标题</span>} field="title" {...formItemLayout}>
-            <Input className="input_item_Input" value={form.title} maxLength = "50" placeholder="请输入任务标题" onChange={e => this.onChange('title', e.target.value)} />
+            <Input className="input_item_Input" value={form.title} maxLength="50" placeholder="请输入任务标题" onChange={e => this.onChange('title', e.target.value)} />
           </FormItem>
           <FormItem label={<span>说明</span>} field="remark" {...formItemLayout}>
             <TextArea className="input_item_Input" rows={6} disableResize onChange={e => this.onChange('remark', e.target.value)} />
           </FormItem>
           <FormItem label={<span>执行人</span>} field="executor" {...formItemLayout}>
 
-          {/* <Select data={executors}
+            {/* <Select data={executors}
            renderOption={item => <Option value={item.id}>{item.name}</Option>}
            defaultOption={<Option>执行人选择</Option>}
            onChange={this.onSelectChange}/> */}

src/view/region/index.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { browserHistory } from 'amos-react-router';
 import { Select, Form, Button } from 'amos-framework';
 import { Store } from 'amos-tool';
-import { getCurrentUser, regionSelectAction} from './../../services/securityService';
+import { getCurrentUser, regionSelectAction } from './../../services/securityService';
 const lsTool = Store.lsTool;
 
 const FormItem = Form.Item;
@@ -32,27 +32,22 @@ class RegionSelect extends Component {
   onClick = () => {
     const { reginParams } = this.state;
     lsTool.remove('selectedRole');
-    
+
     const { sequenceNbr } = reginParams.role || {};
     lsTool.write('selectedRole', sequenceNbr);
-    lsTool.write('curCompanyName', reginParams.company.companyName);  
-    debugger
-
-    if('department' in reginParams&&reginParams.department!=null ){
-      lsTool.write('departmentdate', reginParams.department.sequenceNbr);  
-      lsTool.write('departmentname', reginParams.department.departmentName);  
-    }else{
-      lsTool.write('departmentdate', null);  
-      lsTool.write('departmentname', null);  
+    lsTool.write('curCompanyName', reginParams.company.companyName);
+
+    if ('department' in reginParams && reginParams.department != null) {
+      lsTool.write('departmentdate', reginParams.department.sequenceNbr);
+      lsTool.write('departmentname', reginParams.department.departmentName);
+    } else {
+      lsTool.write('departmentdate', null);
+      lsTool.write('departmentname', null);
     }
-   
-
-
-
 
     regionSelectAction(reginParams).then(
       data => {
-        browserHistory.push('/main/patrol');   
+        browserHistory.push('/main/patrol');
       }
     );
   }
@@ -64,25 +59,18 @@ class RegionSelect extends Component {
     let { departments = [], roles = [] } = this.state;
     if (key === 'company') {
       reginParams.company = companys.find(item => item.sequenceNbr === value);
-     
-        departments = companyDepartments[value];
-        
-      
+      departments = companyDepartments[value];
       roles = orgRoles[value];
     }
     if (key === 'department') {
-      debugger
-      if(value){
-        reginParams.department = departments.find(item =>      
-          item!=null&&item.sequenceNbr === value
-          
-          );
+      if (value) {
+        reginParams.department = departments.find(item =>
+          item != null && item.sequenceNbr === value
+        );
         roles = orgRoles[value];
-      }else{
-        
+      } else {
         roles = orgRoles[reginParams.company.sequenceNbr];
       }
-      
     }
     if (key === 'role') {
       reginParams.role = roles.find(item => item.sequenceNbr === value);
@@ -90,23 +78,23 @@ class RegionSelect extends Component {
     this.setState({ reginParams, departments, roles });
   }
 
-  getCurrentUser =()=>{
+  getCurrentUser = () => {
     getCurrentUser().then(data => {
       const { reginParams } = this.state;
       const { companys = [], companyDepartments = {}, orgRoles = {} } = data;
       if (companys.length === 1) {
         let company = companys[0];
         let departments = companyDepartments[company.sequenceNbr] || [];
-        if (departments.length === 1 && ((orgRoles[company.sequenceNbr] || orgRoles[departments[0].sequenceNbr]) || []).length === 1 ) {
+        if (departments.length === 1 && ((orgRoles[company.sequenceNbr] || orgRoles[departments[0].sequenceNbr]) || []).length === 1) {
           reginParams.company = company;
           reginParams.department = departments[0];
           reginParams.role = orgRoles[company.sequenceNbr] ? orgRoles[company.sequenceNbr][0] : orgRoles[departments[0].sequenceNbr] ? orgRoles[departments[0].sequenceNbr][0] : {};
-          this.setState({ reginParams },()=>this.onClick());
-        } else if (departments.length === 0 && (orgRoles[company.sequenceNbr] || []).length === 1){
+          this.setState({ reginParams }, () => this.onClick());
+        } else if (departments.length === 0 && (orgRoles[company.sequenceNbr] || []).length === 1) {
           reginParams.company = company;
           reginParams.department = {};
           reginParams.role = orgRoles[company.sequenceNbr][0];
-          this.setState({ reginParams },()=>this.onClick());
+          this.setState({ reginParams }, () => this.onClick());
         } else {
           this.setState({ userInfo: data });
         }
@@ -117,31 +105,26 @@ class RegionSelect extends Component {
   }
 
 
-   uniq=(array)=>{
-     debugger
-     if(array&&array.length>0){
+  uniq = (array) => {
+    if (array && array.length > 0) {
       array.sort();
-      var temp=[array[0]];
-      for(var i = 1; i < array.length; i++){
-          if( array[i].sequenceNbr !== temp[temp.length-1].sequenceNbr){
-              temp.push(array[i]);
-          }
+      var temp = [array[0]];
+      for (var i = 1; i < array.length; i++) {
+        if (array[i].sequenceNbr !== temp[temp.length - 1].sequenceNbr) {
+          temp.push(array[i]);
+        }
       }
       return temp;
-
-     }else{
-
+    } else {
       return [];
-     }
-   
-}
+    }
+  }
 
 
   renderItem = (item) => {
     const { userId, companys = [] } = item;
-
     let { departments = [], roles = [] } = this.state;
-    let newDepartments =  departments.filter(d => d != null && void 0 !== d);
+    let newDepartments = departments.filter(d => d != null && void 0 !== d);
     const formItemLayout = {
       wrapperCol: {
         xs: { span: 24 },
@@ -195,7 +178,7 @@ class RegionSelect extends Component {
 
   render() {
     const { userInfo } = this.state;
-    return  Object.keys(userInfo).length > 0 ? (
+    return Object.keys(userInfo).length > 0 ? (
       <div className="region-select">
         {
           this.renderItem(userInfo)