luolei 4 年之前
父节点
当前提交
01bf7ce15d

+ 4 - 4
src/components/AddAssistCheck/AssistName/index.jsx

@@ -24,16 +24,16 @@ class AssistName extends Component {
 			return name
 		}
 	}
-  checkOnOff(item){
+  checkOnOff(item,idx){
     const {checkOnOff,handlePush} = this.props
-    checkOnOff(item)
+    checkOnOff(item,idx)
     handlePush && handlePush({mode:8});       //右侧推送
   }
 	render() {
-		const { winWidth, name, getInfomation,normal,item } = this.props;
+		const { winWidth, name, getInfomation,normal,item,idx } = this.props;
 		return (
 				<span className={`${styles.assistName} ${setFontColorSize(2)}`} style={{ width: winWidth < 1150 ? '120px' : 'auto',fontWeight:normal?'normal':'bold'}} ref={this.$assistName}>
-          <img className={styles.imgCheck} src={item.check?checkOn:checkOff} onClick={()=>this.checkOnOff(item)} alt=""/>
+          <img className={styles.imgCheck} src={item.check?checkOn:checkOff} onClick={()=>this.checkOnOff(item,idx)} alt=""/>
 					<span className={styles.tagSpan} title={name}>
 						{name&&this.splitName(name)}:
             {/* <span className={styles.imgInfo} title='点击i图标可查看详细说明' onClick={() => getInfomation({ name: name, position: 1, type: 6 })}></span> */}

+ 1 - 1
src/components/AddAssistCheck/index.jsx

@@ -231,7 +231,7 @@ class AddAssistCheck extends React.Component {
                   <span className={styles.imgInfo} title='点击i图标可查看详细说明' onClick={()=>getInfomation({name: item.name, position: 1, type: 6})}></span>
                 </span>
               </span> */}
-              <AssistName item={item} checkOnOff={checkOnOff} name={item.name} winWidth={winWidth} handlePush={handlePush} getInfomation={getInfomation}></AssistName>
+              <AssistName item={item} idx={idx} checkOnOff={checkOnOff} name={item.name} winWidth={winWidth} handlePush={handlePush} getInfomation={getInfomation}></AssistName>
               <div className={`${styles.textareaWrap} ${setFontColorSize(2,1)}`}>
                 <ScrollArea speed={0.8}
                             horizontal={false}

+ 2 - 2
src/containers/AssistCheck.js

@@ -37,8 +37,8 @@ function mapDispatchToProps(dispatch, store) {
         setTipValue(item,val,idx){
           dispatch(setTipVal(item,val,idx))
         },
-        checkOnOff(item){
-          dispatch(checkOffOn(item))
+        checkOnOff(item,idx){
+          dispatch(checkOffOn(item,idx))
         },
         showInIcss(){
           dispatch(showInIcsss())

+ 2 - 2
src/containers/Inspect.js

@@ -52,8 +52,8 @@ function mapStateToProps(state) {//console.log(state)
 
 function mapDispatchToProps(dispatch) {
   return {
-    checkOnOff(item){
-      dispatch(checkOffOn(item))
+    checkOnOff(item,idx){
+      dispatch(checkOffOn(item,idx))
     },
     detailClick(val){
       dispatch(searchType(val))

+ 2 - 2
src/store/actions/assistCheck.js

@@ -30,9 +30,9 @@ export const changeDate = (date,idx) => ({         //更改时间
     date,
     idx
 })
-export const checkOffOn = (item) => ({
+export const checkOffOn = (item,tip) => ({
     type:CHECK_OFF_ON,
-    item
+    item,tip
 })
 export const setTipVal = (item,val,idx) => ({
     type:SET_TIP_VAL,

+ 2 - 1
src/store/reducers/assistCheck.js

@@ -59,6 +59,7 @@ export default (state = initSearchList, action) => {
     for (let i = 0; i < tempArr.length; i++) {
       if (i == action.idx) {
         tempArr[i].time = action.date
+        tempArr[i].dateValue = action.date
         newState.assistLabel = [...tempArr]
       }
     }
@@ -95,7 +96,7 @@ export default (state = initSearchList, action) => {
     let tempArrs = newState.assistLabel;
     let tempList = action.item,tempOrder=[]
     for(let i = 0;i < tempArrs.length;i++){
-        if(tempArrs[i].time == tempList.time){
+        if(action.tip == i){
             let flg = tempArrs[i].check;
             tempArrs[i].check = !flg
         }

+ 3 - 0
src/store/reducers/inspect.js

@@ -106,6 +106,7 @@ export default (state = initSearchList, action) => {
             tempArr = tempArr.filter((item,idx)=>{
                 if(action.sign==idx){
                     item.time = action.value
+                    item.dateValue = action.value
                 }
                 return item
             })
@@ -114,6 +115,7 @@ export default (state = initSearchList, action) => {
                 if(action.sign == idx){
                     if(action.tip==1){//小项改时间
                         item.time = action.value
+                        item.dateValue = action.value
                     }else{//小项该数值
                         if(isNumber(action.value-0)){
                             item.value = action.value
@@ -249,6 +251,7 @@ export default (state = initSearchList, action) => {
         // const tempArrAct = newState.fillActive;
         const tempArr = action.arr;
         tempArr.time = action.time;
+        tempArr.dateValue = action.time
         let tmpArr = newState.getExcelDataList;
         const tempArrs = newState.labelList;
         tempArrs[action.idx] = tempArr;