Merge branch 'dev5.3.2' of http://192.168.2.236:10080/zhouna/newICSS into dev5.3.2

src/components/MainSuit/index.jsx

@@ -162,8 +162,7 @@ class MainSuit extends Component{
         return
       }
       ev.target.blur();
-      ev.target.innerText?(ev.target.innerText = data.substr(0,config.limited)):(ev.target.innerHTML = data.substr(0,config.limited));  //输入法内输入多个字再按enter的情况
-      console.log(333,data,ev)
+      // ev.target.innerText?(ev.target.innerText = data.substr(0,config.limited)):(ev.target.innerHTML = data.substr(0,config.limited));  //输入法内输入多个字再按enter的情况
       // ev.target.blur();
       this.setState({
         inpText:data.substr(0,config.limited),

src/components/TimeInterval/index.jsx

@@ -64,7 +64,7 @@ class TimeInterval extends React.Component {
       let arr = this.state.endTime.replace(/ |:/g, '-').split('-');
       let dateBegin = (new Date(Date.UTC(tmpTime[0],tmpTime[1],tmpTime[2],tmpTime[3],tmpTime[4]))).getTime();
       let dateEnd = (new Date(Date.UTC(arr[0], arr[1], arr[2], arr[3],arr[4]))).getTime();
-      let dateDes = (dateEnd - dateBegin)/(24 * 3600 * 1000)
+      let dateDes = (dateEnd - dateBegin)/(24 * 3600 * 1000) 
       if(dateEnd - dateBegin < 0){
         Notify.info("终止时间不能早于起始时间");
         return