1.4.0.2版本修改代码提交

package.json

@@ -54,7 +54,8 @@
     "ray-mediaquery": "^1.0.0",
     "ray-progress": "^1.0.0",
     "react": "~16.7.0",
-    "react-dom": "~16.7.0"
+    "react-dom": "~16.7.0",
+    "react-transition-group": "^4.4.1"
   },
   "devDependencies": {
     "amos-build": "^3.x",

src/services/checkService.js

 import formatUrl from 'amos-processor/lib/utils/urlFormat';
 import { patrolUrls, secExtUrl } from './../consts/urlConsts';
 import { commonGet, commonPost, commonDelete, commonPut } from './../utils/request';
-
 import { Store } from 'amos-tool';
-const selectedRole = Store.lsTool.read('selectedRole');
+
+const lsTool = Store.lsTool;
 
 export const queryInputItemAction = (filter, page, size) => {
   return commonPost(formatUrl(patrolUrls.inputItemTablesUrl, { page, size }), filter);
 };
 
-export const batchDelInputItemAction = (ids) => {
+export const batchDelInputItemAction = ids => {
   return commonDelete(formatUrl(patrolUrls.inputItemBatchDelUrl, { ids }));
 };
 
-export const saveAsInputItemAction = (ids) => {
+export const saveAsInputItemAction = ids => {
   return commonGet(formatUrl(patrolUrls.inputItemSaveAsUrl, { ids }));
 };
 
-export const saveInputItemAction = (body) => {
+export const saveInputItemAction = body => {
   return commonPost(patrolUrls.inputItemSaveUrl, body);
 };
 
@@ -25,22 +25,22 @@ export const queryPlanInfoAction = (filter, page, size) => {
   return commonPost(formatUrl(patrolUrls.planInfoTablesUrl, { page, size }), filter);
 };
 
-export const queryInputItemDetailAction = (itemID) => {
+export const queryInputItemDetailAction = itemID => {
   return commonGet(formatUrl(patrolUrls.inputItemDetailUrl, { itemID }));
 };
 
 export const btnAuthAction = routePath => {
   const menuAgent = 'WEB';
-  const url = formatUrl(secExtUrl.buttonAuthUrl, { menuAgent, path: routePath,roleSeq:selectedRole});
+  const selectedRole = lsTool.read('selectedRole');
+  const url = formatUrl(secExtUrl.buttonAuthUrl, { menuAgent, path: routePath, roleSeq: selectedRole });
   return commonGet(url);
 };
 
-
 /**
  *
  * @param {*巡检计划新增} body
  */
-export const createPlanAction = (body) => {
+export const createPlanAction = body => {
   return commonPost(patrolUrls.planSaveUrl, body);
 };
 
@@ -54,8 +54,7 @@ export const queryDeptByOrgCodeAction2 = () => {
   return commonGet(formatUrl(patrolUrls.deptByOrgCodeUrl2, {}));
 };
 
-
-export const queryUserByDeptIdAction = (deptId) => {
+export const queryUserByDeptIdAction = deptId => {
   return commonGet(formatUrl(patrolUrls.userInfoByDeptIdUrl, { deptId }));
 };
 
@@ -63,19 +62,19 @@ export const queryTaskAction = (filter, page, size) => {
   return commonPost(formatUrl(patrolUrls.taskPageUrl, { page, size }), filter);
 };
 
-export const batchDelTaskAction = (ids) => {
+export const batchDelTaskAction = ids => {
   return commonDelete(formatUrl(patrolUrls.taskBatchDelUrl, { ids }));
 };
 
-export const queryTaskDetailAction = ( id ) => {
+export const queryTaskDetailAction = id => {
   return commonGet(formatUrl(patrolUrls.taskDetailUrl, { id }));
 };
 
 export const handleTaskAction = (ids, status) => {
-  return commonPut(formatUrl(patrolUrls.taskHandleUrl, { ids , status }));
+  return commonPut(formatUrl(patrolUrls.taskHandleUrl, { ids, status }));
 };
 
-export const saveTaskAction = (body) => {
+export const saveTaskAction = body => {
   return commonPost(patrolUrls.taskAddUrl, body);
 };
 
@@ -83,7 +82,7 @@ export const queryDeptUserTree = () => {
   return commonGet(patrolUrls.deptUserTreeUrl2);
 };
 
-export const feedbackTaskAction = (body) => {
+export const feedbackTaskAction = body => {
   return commonPost(patrolUrls.taskFeedbackTaskUrl, body);
 };
 
@@ -91,19 +90,19 @@ export const queryRouteAction = (filter, page, size) => {
   return commonPost(formatUrl(patrolUrls.routePageUrl, { page, size }), filter);
 };
 
-export const batchDelRouteAction = (ids) => {
+export const batchDelRouteAction = ids => {
   return commonDelete(formatUrl(patrolUrls.routeBatchDelUrl, { ids }));
 };
 
-export const saveRouteAction = (body) => {
+export const saveRouteAction = body => {
   return commonPost(patrolUrls.routeAddUrl, body);
 };
 
-export const queryRouteDetailAction = (id) => {
+export const queryRouteDetailAction = id => {
   return commonGet(formatUrl(patrolUrls.routeDetailUrl, { id }));
 };
 
-export const updateRouteAction = (body) => {
+export const updateRouteAction = body => {
   return commonPut(patrolUrls.routeUpdateUrl, body);
 };
 
@@ -111,7 +110,7 @@ export const queryRoutePointAction = (filter, page, size, id) => {
   return commonPost(formatUrl(patrolUrls.routePointPageUrl, { id, page, size }), filter);
 };
 
-export const queryPlanDetByIdAction = (planId) => {
+export const queryPlanDetByIdAction = planId => {
   return commonGet(formatUrl(patrolUrls.planDetByPlanIdUrl, { planId }));
 };
 
@@ -127,11 +126,11 @@ export const queryAllRouteAction = () => {
   return commonGet(patrolUrls.routeUrl);
 };
 
-export const queryInputItemByConditionAction = (searchParams) => {
+export const queryInputItemByConditionAction = searchParams => {
   return commonPost(formatUrl(patrolUrls.inputItemQueryByConditionUrl, {}), searchParams);
 };
 
-export const queryInputItemByConditionAction1 = (searchParams) => {
+export const queryInputItemByConditionAction1 = searchParams => {
   return commonPost(formatUrl(patrolUrls.inputItemQueryByConditionUrl1, {}), searchParams);
 };
 
@@ -139,50 +138,47 @@ export const queryAuthPointAction = (code = '', name = '') => {
   return commonGet(formatUrl(patrolUrls.routePointsAuthUrl, { code, name }));
 };
 
-
 export const addRoutePointAction = (routeId, pointIds) => {
   return commonPost(formatUrl(patrolUrls.routePointAddUrl, { routeId, pointIds }));
 };
 
-export const queryPointInputItemAction = (pointId,body) => {
-  return commonPost(formatUrl(patrolUrls.pointInputItemUrl, { pointId }),body);
+export const queryPointInputItemAction = (pointId, body) => {
+  return commonPost(formatUrl(patrolUrls.pointInputItemUrl, { pointId }), body);
 };
 
-export const saveAsPlanAction = (body) => {
+export const saveAsPlanAction = body => {
   return commonPost(patrolUrls.planSaveAsUrl, body);
 };
 
-
-export const batchDetPlanAction = (body) => {
+export const batchDetPlanAction = body => {
   return commonPost(patrolUrls.planBatchDetUrl, body);
 };
 
-export const endplanAction = (body) => {
+export const endplanAction = body => {
   return commonPost(patrolUrls.endplan, body);
 };
-export const startplanAction = (body) => {
+export const startplanAction = body => {
   return commonPost(patrolUrls.startplan, body);
 };
 
-
 export const queryPlanTaskInfoAction = (filter, page, size) => {
   return commonPost(formatUrl(patrolUrls.planTaskTablesUrl, { page, size }), filter);
 };
 
-export const reGenPlanTaskAction = (body) => {
-  var params = {timeout: 40000}//设置超时时间
+export const reGenPlanTaskAction = body => {
+  var params = { timeout: 40000 }; //设置超时时间
   return commonPost(patrolUrls.reGenplanTaskUrl, body, params);
 };
 
-export const deleteplanTaskAction = (body) => {
+export const deleteplanTaskAction = body => {
   return commonPost(patrolUrls.deleteplanTaskUrl, body);
 };
 
-export const queryPlanByOrgNoPageAction = (body) => {
+export const queryPlanByOrgNoPageAction = body => {
   return commonPost(patrolUrls.planInfoNoPageUrl, body);
 };
 
-export const printTaskDetailAction = (taskID) => {
+export const printTaskDetailAction = taskID => {
   return commonGet(formatUrl(patrolUrls.taskPrintUrl, { taskID }));
 };
 
@@ -190,7 +186,7 @@ export const queryCheckInfoAction = (filter, page, size) => {
   return commonPost(formatUrl(patrolUrls.checkTablesUrl, { page, size }), filter);
 };
 
-export const batchDeCheckAction = (body) => {
+export const batchDeCheckAction = body => {
   return commonPost(patrolUrls.checkBatchDetUrl, body);
 };
 
@@ -198,11 +194,11 @@ export const queryCatalogTreeAction = () => {
   return commonGet(formatUrl(patrolUrls.catalogTreeUrl, {}));
 };
 
-export const addCatalogTreeAction = (body) => {
+export const addCatalogTreeAction = body => {
   return commonPost(patrolUrls.catalogTreeSaveUrl, body);
 };
 
-export const batDelCatalogTreeAction = (body) => {
+export const batDelCatalogTreeAction = body => {
   return commonPost(patrolUrls.catalogTreeBatDelUrl, body);
 };
 
@@ -210,23 +206,20 @@ export const queryCatalogTreePageAction = (filter, page, size) => {
   return commonPost(formatUrl(patrolUrls.catalogTreeListUrl, { page, size }), filter);
 };
 
-export const queryCatalogTreeByIdAction = ( id ) => {
+export const queryCatalogTreeByIdAction = id => {
   return commonGet(formatUrl(patrolUrls.catalogTreeDetByIdUrl, { id }));
 };
 
-
-export const forwardTaskAction = ( userId, taskID ) => {
+export const forwardTaskAction = (userId, taskID) => {
   return commonGet(formatUrl(patrolUrls.forwardTaskUrl, { userId, taskID }));
 };
 
-
-export const queryCheckDetailAction = (checkId) => {
+export const queryCheckDetailAction = checkId => {
   return commonGet(formatUrl(patrolUrls.checkDetailUrl, { checkId }));
 };
 
-export const exportCheckRecordAction = (filter) => {
+export const exportCheckRecordAction = filter => {
   return commonPost(formatUrl(patrolUrls.exportCheckRecordUrl), filter);
-
 };
 
 export const seachPermissionAction = () => {
@@ -237,21 +230,18 @@ export const exchangeOrderNumberAction = (src, target) => {
   return commonPut(formatUrl(patrolUrls.exchangeOrderNumberUrl, { src, target }));
 };
 
-export const fetchCheckDetailById = (data) => {
+export const fetchCheckDetailById = data => {
   return commonPost(patrolUrls.SpecCheckDetailUrl, data);
 };
 
-export const fetchCheckInputById = (data) => {
+export const fetchCheckInputById = data => {
   return commonPost(patrolUrls.SpecCheckInputById, data);
 };
 
 export const fetchShortByCheckIdAndCheckInputId = (checkId, checkInputId, classifyId) => {
-  return commonGet(formatUrl(patrolUrls.searchCheckShortUrl, { checkId, checkInputId, classifyId}));
+  return commonGet(formatUrl(patrolUrls.searchCheckShortUrl, { checkId, checkInputId, classifyId }));
 };
 
-export const queryAllItemNoAction = (itemId) => {
+export const queryAllItemNoAction = itemId => {
   return commonGet(formatUrl(patrolUrls.itemNoQueryUrl, { itemId }));
 };
-
-
-

src/view/patrol/home/PatrolChart.js

@@ -22,7 +22,7 @@ class PatrolChart extends Component {
         right: '30px',
         left: '70px',
         top: '25px',
-        bottom: '60px'
+        bottom: '30px'
       },
       tooltip: {
         trigger: 'axis',

src/view/patrol/plan/PlanInput.js

@@ -640,6 +640,7 @@ class PlanInput extends Component {
             onChange={e => this.onDateChange('planEnd', e)}
           /> : <DatePicker
             format="YYYY-MM-DD"
+            value={form.planEnd}
             className="plan_task_gen_select"
             onChange={e => this.onDateChange('planEnd', e)}
           />;
@@ -651,6 +652,7 @@ class PlanInput extends Component {
             onChange={e => this.onWeekDateChange('planEnd', e)}
           /> :  <WeekPicker
             className="plan_task_gen_select"
+            value={form.planEnd}
             onChange={e => this.onWeekDateChange('planEnd', e)}
           />;
       case '3':
@@ -663,6 +665,7 @@ class PlanInput extends Component {
           /> : <MonthPicker
             className="plan_task_gen_select"
             format="YYYY-MM"
+            value={form.planEnd}
             onChange={e => this.onMonthDateChange('planEnd', e)}
           />;
       case '4':
@@ -673,6 +676,7 @@ class PlanInput extends Component {
             onChange={e => this.onYearDateChange('planEnd', e)}
           /> : <YearPicker
             isEmpty
+            value={form.planEnd}
             onChange={e => this.onYearDateChange('planEnd', e)}
           />;
     }