完成需求168接口调用

client/actions/uploadError.js

@@ -63,13 +63,37 @@ const uploadError = (info,exceptionType,getTask=true)=>{
                 }
                 }
             }).catch(e=>{console.error(e)});
             }).catch(e=>{console.error(e)});
     })
     })
-}
+};
 
 
 const addErrorInfo = (errMsg)=>{
 const addErrorInfo = (errMsg)=>{
     return{
     return{
         type : actionType.ADDERRORINFO,
         type : actionType.ADDERRORINFO,
         errMsg
         errMsg
     }
     }
+};
+
+const timeoutAlarm = (info)=>{
+    let {storeInfo={},taskInfo={},userInfo={}} = info;
+    let bodyData = Object.assign({},{
+        storeId : storeInfo.id || 0,
+        taskId : taskInfo.taskId || 0,
+        userId : userInfo.employeeId || 0,
+        area : taskInfo.area || ""
+    });
+    return (dispatch=>{
+        fetch(domain + 'machine_pad/expired_send_error_msg.action',{
+            credentials : 'include',
+            method : 'POST',
+            mode : 'cors',
+            headers:myHeaders,
+            body : JSON.stringify(bodyData)
+
+        }).then((response)=>response.json())
+            .then(json=>{
+
+
+            }).catch(e=>{console.error(e)});
+    })
 }
 }
 
 
-export {uploadError,addErrorInfo}
+export {uploadError,addErrorInfo,timeoutAlarm}

client/containers/FinishAskContainer/FinishAskContainer.jsx

@@ -45,7 +45,7 @@ export default class FinishAskContainer extends React.Component{
         />;
         />;
         let popDom = <PopModel classNames={"popupExtClass"} popupText={"检测到店铺反常，请站出店铺，关闭店铺门后重新验证您的身份"} popupButtons={[btnDom,clockDom]}/>
         let popDom = <PopModel classNames={"popupExtClass"} popupText={"检测到店铺反常，请站出店铺，关闭店铺门后重新验证您的身份"} popupButtons={[btnDom,clockDom]}/>
         this.props.showPopup({popupChild:popDom});
         this.props.showPopup({popupChild:popDom});
-        this.props.uploadErrs(2);
+        this.props.uploadErrs();
     }
     }
 
 
 
 
@@ -59,7 +59,7 @@ export default class FinishAskContainer extends React.Component{
         />;
         />;
         let popDom = <PopModel popupText={"您的任务是否已结束"} popupButtons={[btnDom,clockDom]}/>
         let popDom = <PopModel popupText={"您的任务是否已结束"} popupButtons={[btnDom,clockDom]}/>
         this.props.showPopup({popupChild:popDom});
         this.props.showPopup({popupChild:popDom});
-        this.props.uploadErrs(2);
+        this.props.uploadErrs();
     }
     }
 
 
     render(){
     render(){

client/containers/PageContainer/PageContainer.jsx

@@ -9,7 +9,7 @@ import {initGetOtherProblem,addNewProbem,deleteProblem,editProblemItem,submitPro
 import {scanBarCodeGetProductInfo,submitProductInfo,saveEditProductInfo,submitProductSuccess,clearProductSuccess} from "../../actions/ScanBarCode"
 import {scanBarCodeGetProductInfo,submitProductInfo,saveEditProductInfo,submitProductSuccess,clearProductSuccess} from "../../actions/ScanBarCode"
 import {getReportDamageList,deleteDamageItem} from '../../actions/reportDamageList'
 import {getReportDamageList,deleteDamageItem} from '../../actions/reportDamageList'
 import {getRefreshImg,deleteImg,emptyImg} from "../../actions/refreshImg"
 import {getRefreshImg,deleteImg,emptyImg} from "../../actions/refreshImg"
-import {uploadError,addErrorInfo} from '../../actions/uploadError'
+import {uploadError,addErrorInfo,timeoutAlarm} from '../../actions/uploadError'
 import PopupComponent from '../../components/CommonComponent/PopupComponent/PopupComponent'
 import PopupComponent from '../../components/CommonComponent/PopupComponent/PopupComponent'
 import TroubleContainer from '../TroubleContainer/TroubleContainer'
 import TroubleContainer from '../TroubleContainer/TroubleContainer'
 import ScanBarCodeContainer from '../ScanBarCodeContainer/ScanBarCodeContaienr'
 import ScanBarCodeContainer from '../ScanBarCodeContainer/ScanBarCodeContaienr'
@@ -447,10 +447,10 @@ class PageContainer extends React.Component {
 
 
     }
     }
 
 
-    uploadErrs(type){
+    uploadErrs(){
         let {dispatch,state} = this.props;
         let {dispatch,state} = this.props;
         let {commonInfo={}} = state;
         let {commonInfo={}} = state;
-        dispatch(uploadError(commonInfo,{exceptionType:type},false));
+        dispatch(timeoutAlarm(commonInfo));
     }
     }
 
 
 
 
@@ -475,7 +475,7 @@ class PageContainer extends React.Component {
         //屏幕超过300s无人操作
         //屏幕超过300s无人操作
 
 
         //TODO 上报300s无人操作
         //TODO 上报300s无人操作
-        this.uploadErrs(errorType[1]);
+        this.uploadErrs();
 
 
         this.setState({
         this.setState({
             showAlarm : true,
             showAlarm : true,
@@ -550,7 +550,7 @@ class PageContainer extends React.Component {
 
 
     failCloseDoor(){
     failCloseDoor(){
         this.playAlarmMusic();
         this.playAlarmMusic();
-        this.uploadErrs(errorType[3]);
+        this.uploadErrs();
     }
     }
 
 
     judgeDoorStatus(){
     judgeDoorStatus(){
@@ -756,7 +756,7 @@ class PageContainer extends React.Component {
                                             changePages={(data)=>this.changePages(data)}
                                             changePages={(data)=>this.changePages(data)}
                                             showOpenDoorPage={()=>this.showOpenDoorPage.bind(this)()}
                                             showOpenDoorPage={()=>this.showOpenDoorPage.bind(this)()}
                                             showPopup={(info)=>this.showPopup(info)}
                                             showPopup={(info)=>this.showPopup(info)}
-                                            uploadErrs={(type)=>this.uploadErrs(type)}
+                                            uploadErrs={()=>this.uploadErrs()}
                                             hidePopup={()=>this.hidePopup()}
                                             hidePopup={()=>this.hidePopup()}
                 />;
                 />;
                 break;
                 break;

package.json

@@ -7,9 +7,9 @@
   "scripts": {
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "test": "echo \"Error: no test specified\" && exit 1",
     "clean": "rm -rf static/*",
     "clean": "rm -rf static/*",
-    "start": "set NODE_ENV=development && webpack-dev-server --env=dev -d --history-api-fallback --hot --inline --progress --colors --port 80 --host 0.0.0.0",
-    "build": "set NODE_ENV=production && webpack --env=build --progress --color",
-    "build:prod": "set NODE_ENV=development && webpack --env=build --progress --color"
+    "start": "cross-env NODE_ENV=development webpack-dev-server --env=dev -d --history-api-fallback --hot --inline --progress --colors --port 80 --host 0.0.0.0",
+    "build": "cross-env NODE_ENV=production webpack --env=build --progress --color",
+    "build:prod": "cross-env NODE_ENV=development webpack --env=build --progress --color"
   },
   },
   "author": "",
   "author": "",
   "license": "MIT",
   "license": "MIT",
@@ -43,6 +43,7 @@
     "webpack-dev-server": "^2.11.2"
     "webpack-dev-server": "^2.11.2"
   },
   },
   "dependencies": {
   "dependencies": {
+    "cross-env": "^5.2.0",
     "react": "^16.4.1",
     "react": "^16.4.1",
     "react-dom": "^16.4.1",
     "react-dom": "^16.4.1",
     "react-redux": "^5.0.7",
     "react-redux": "^5.0.7",