设置样式修改，切换清空的删除-未完

src/components/Banner/ModeChange/index.jsx

@@ -1,26 +1,33 @@
 import React, { Component } from "react";
 import style from "./index.less";
 import ReactDom from "react-dom";
-import close from '../../../common/images/icon_close.png';
-import ok from '../../../common/images/confirm.png'
+import close from '@images/icon_close.png';
+import sopen from '@images/btn-open.png'
+import sclose from '@images/btn-closed.png'
 
 class ModeChange extends Component {
 
 
     render(){
-        const {closeConfigModal, changeType, confirmType, mode} = this.props
+        const {closeConfigModal, changeType, confirmType, mode} = this.props;
         const domNode = document.getElementById('root');
+        const isOpen = mode==='1';
         return ReactDom.createPortal(<React.Fragment>
             <div className={style['modal']}>
-            <div className={style['shade']} onClick={closeConfigModal}></div>
-            <div className={style['content']}>
-            <div className={style['close']}>设置<img src={close} onClick={closeConfigModal} /></div>
-            <p className={style['title']}>模式切换<i>（模式说明：切换模式会清空当前所有的数据）</i></p>
-            <ul>
-                <li className={+mode===0?style['selected']:''} onClick={() => changeType(0)}><img src={ok} />智能推送模式</li>
-                <li className={+mode===1?style['selected']:''} onClick={() => changeType(1)}><img src={ok} />纯文本模式</li>
-            </ul>
-            <div className={style['btn']} onClick={confirmType}>确认</div>
+              <div className={style['shade']} onClick={closeConfigModal}></div>
+              <div className={style['content']}>
+                <div className={style['close']}>设置<img src={close} onClick={closeConfigModal} /></div>
+                <div className={style["oper"]}>
+                    <p>
+                      <span>开启模板智能推送：</span>
+                      <a className={style['switch']} href="javascript:void(0)" onClick={()=>changeType(isOpen?'0':'1')}><img src={isOpen?sclose:sopen} alt=""/>{isOpen?'关':'开'}</a>
+                    </p>
+                </div>
+                <div className={style["explain"]}>
+                    <p>说明：</p>
+                    <p>该设置只针对问诊模块中的“主诉”、“现病史”、“其他史”功能；</p>
+                </div>
+                <div className={style['btn']} onClick={confirmType}>保存修改</div>
             </div>
         </div>
       </React.Fragment>,domNode)

src/components/Banner/ModeChange/index.less

@@ -16,14 +16,32 @@
       .maskContentZIndex1;
       position: fixed;
       top: 100px;
-      width: 820px;
+      width: 432px;
       left:50%;
-      margin-left: -410px;
-      height: 283px;
+      margin-left: -216px;
+      height: 277px;
       background: #fff;
+      .oper{
+        margin: 20px 30px;
+      }
+      .explain{
+        margin: 50px 30px 20px;
+        p{
+          font-size: 12px;
+          line-height: 20px;
+        }
+      }
+      .switch{
+        text-decoration: none;
+        color:inherit ;
+        img{
+          vertical-align: middle;
+          margin: 0 12px 0 20px;
+        }
+      }
       .close{
         line-height: 24px;
-        padding: 3px 3px 5px 10px;
+        padding: 8px 3px 7px 10px;
         border-bottom: 1px solid #EAEDF1;
         img{
           float: right;
@@ -45,12 +63,6 @@
           margin: 0px 0px 2px 0px;
           padding: 0px 0px 0px 10px;
           cursor: pointer;
-          &.selected{
-            background: rgba(59,158,208,0.1);
-            img{
-              visibility: visible;
-            }
-          }
           img{
             margin: -1px 4px 0 0;
             visibility: hidden;
@@ -71,12 +83,4 @@
         top: 30px;
       }
     }
-  }
-  .title{
-    font-size: 16px;
-    text-indent: 10px;
-    margin: 22px 0px 21px 0;
-    i{
-      color: red;
-    }
   }

src/components/OtherHistory/index.jsx

@@ -76,6 +76,7 @@ class OtherHistory extends Component{
   }
   render(){
     const {hasMain,searchData,totalHide,isRead,type,fetchPushInfos,handleInput,saveText,boxTop,boxLeft} = this.props;
+    //智能模式有数据时不切换文本，文本模式有数据时不切换智能
     if(+type===1){      //文本模式
       return <Textarea title='其他史' boxMark='3'
                        isRead={isRead}

src/containers/TypeConfigContainer.js

@@ -2,21 +2,13 @@ import React from "react";
 import { connect } from "react-redux";
 import Banner from "../components/Banner";
 import { SHOW_CONFIG_MODAL, CLOSE_CONFIG_MODAL, CHANGE_TYPE, CONFIRM_TYPE } from "../store/types/typeConfig";
-import { BILLING_ADVICE} from '@store/types/pushMessage';
 
-import {pushAllDataList} from '@utils/tools';
-import {saveMode,getOtherHisRecord} from '@store/async-actions/fetchModules';
+import {saveMode} from '@store/async-actions/fetchModules';
 import config from "@config/index";
-import { initItemList } from '@store/async-actions/tabTemplate';
-import { allCheckedShow } from '@store/actions/tabTemplate';
 import {Notify} from '@commonComp';
-import {SETOTHERHISTORY} from "../store/types/homePage";
 
 function mapStateToProps(state) {
   return {
-    disVisible:state.copyRight.disVisible,
-    copyVisible:state.copyRight.copyVisible,
-    //failed:state.typeConfig.failed,
     typeConfig:state.typeConfig.typeConfig||config.defaultValue.mode,
     visible:state.typeConfig.visible
   };
@@ -37,36 +29,11 @@ function mapDispatchToProps(dispatch) {
       //保存模式切换结果
       dispatch(saveMode(confirmType)).then((res)=>{
         if(res.data.code=='0'&&res.data.data){
-          //清空所有数据
-          pushAllDataList('','clear');
+          //切换后只会影响下一个点的模块（主诉、现病史、其他史）是否有模板
           dispatch({type: CONFIRM_TYPE, confirmType});
-          //切换模式是要重新获取其他史数据
-          dispatch({
-            type:SETOTHERHISTORY,
-            data:[],
-            save:[],
-            otherIsHis:false
-          });
-          dispatch(getOtherHisRecord());        //获取其他史最近记录
           Notify.success("模式切换成功");
-          dispatch(initItemList(confirmType,1));//切换模式调用模板接口
-          dispatch(allCheckedShow(false))    //全选反选显示重置
-          dispatch({//推送重置
-            type: BILLING_ADVICE,
-            determine:[],
-            doubt:[],
-            possible:[],
-            vigilant: [],
-            likely:[],
-            lab: [],
-            pacs:[],
-            setPushEmergency:[],
-            setPushEmergencyIdx:''
-          });
         }else{
           Notify.error(res.data.msg+",请稍后再试");
-          //dispatch({type:MODE_CHANGE_FAIL,data:true});      //保存失败弹窗提示
-          //alert('模式保存失败')
         }
       });
 

src/store/actions/typeConfig.js

@@ -14,10 +14,4 @@ export const confirmType=(state,action)=>{
   const res=Object.assign({},state);
   res.typeConfig = action.confirmType;
   return res;
-};
-
-export const modeChangeFail = (state,action)=>{
-  const res=Object.assign({},state);
-  res.failed = action.data;
-  return res;
 };

src/store/reducers/typeConfig.js

@@ -1,11 +1,10 @@
-import { SHOW_CONFIG_MODAL, CLOSE_CONFIG_MODAL, CONFIRM_TYPE ,MODE_CHANGE_FAIL} from "../types/typeConfig";
-import { showConfigModal, closeConfigModal, changeType, confirmType,modeChangeFail } from "../actions/typeConfig";
+import { SHOW_CONFIG_MODAL, CLOSE_CONFIG_MODAL, CONFIRM_TYPE } from "../types/typeConfig";
+import { showConfigModal, closeConfigModal, changeType, confirmType } from "../actions/typeConfig";
 import config from '@config/index';
 
 const initState = {
   visible: false,
   typeConfig: config.defaultValue.mode, // 0:智能推送模式， 1：纯文本模式,用于切换选中状态
-  failed:false
 };
 export default function(state = initState, action) {
   switch (action.type) {
@@ -15,8 +14,6 @@ export default function(state = initState, action) {
       return closeConfigModal(state, action);
     case CONFIRM_TYPE:
       return confirmType(state, action);
-    case MODE_CHANGE_FAIL:
-      return modeChangeFail(state,action);
     default:
       return state;
   }

src/store/types/typeConfig.js

@@ -1,5 +1,4 @@
 export const SHOW_CONFIG_MODAL = 'SHOW_CONFIG_MODAL';
 export const CLOSE_CONFIG_MODAL = 'CLOSE_CONFIG_MODAL';
 export const CHANGE_TYPE = 'CHANGE_TYPE';
-export const CONFIRM_TYPE = 'CONFIRM_TYPE';
-export const MODE_CHANGE_FAIL = 'MODE_CHANGE_FAIL';
+export const CONFIRM_TYPE = 'CONFIRM_TYPE';