Merge remote-tracking branch 'origin/CommonTemplate' into testedMerge

# Conflicts:
#	src/components/TemplateItems/index.jsx

src/components/Banner/index.jsx

@@ -107,7 +107,7 @@ class Banner extends Component {
     dragBox('previewWrapper','previewStatic','del')    
   }
   render() {
-    const {visible,ifShow,deptName, closeConfigModal,hasMain,hasCurrent,hasOther,preShow,show} = this.props;
+    const {visible,pre,ifShow,deptName, closeConfigModal,hasMain,hasCurrent,hasOther,preShow,show} = this.props;
     const {emergencyBox} = this.state;
     const {showConfigModal, changeType, confirmType} = this;
     const domNode = document.getElementById('root');
@@ -121,10 +121,10 @@ class Banner extends Component {
                       <img className={`${style["st"]} ${style["his"]}`} src={emergIcon} />
                       <i>本科室近期全部病历</i>
                     </div>:''}
-          <div className={style.prec} onClick={()=>preShow(show)}>
+          {pre == 1?<div className={style.prec} onClick={()=>preShow(show)}>
             <img className={style["st"]} src={prec} alt="预问诊"/>
             <i> 预问诊信息</i>
-          </div>
+          </div>:null}
           <div className={style["buon1"]} onClick={showConfigModal}>
             <img className={style["st"]} src={setup} />
             <i> 设置</i>
@@ -157,7 +157,8 @@ const mapStateToProps = function(state){
   return {
     ifShow:sysConfig.general_show,
     deptName:message.selfDeptName,
-    show:state.preIcss.preShow
+    show:state.preIcss.preShow,
+    pre:sysConfig.connect_prec
   }
 }
 

src/components/PreInIcss/RotateImg/index.jsx

@@ -57,9 +57,9 @@ class RotateImg extends Component {
       mgLeft:-width/2,
       mgTop:-height/2
     },()=>{
-      let overLenL = $("#drugImg").offset().left-$("#previewWrapper").offset().left
-      let overLenT = $("#drugImg").offset().top-$("#previewWrapper").offset().top
-      localStorage.setItem("changeImg",width>height?overLenT:overLenL)
+      let overLenL = $("#drugImg").offset().left-$("#previewWrapper").offset().left;
+      let overLenT = $("#drugImg").offset().top-$("#previewWrapper").offset().top;
+      localStorage.setItem("changeImg",width>height?overLenT:overLenL);
     })
   }
   handleNext(){
@@ -99,9 +99,9 @@ class RotateImg extends Component {
       mgTop:-height/2,
       de:0
     },()=>{
-      let overLenL = $("#drugImg").offset().left-$("#previewWrapper").offset().left
-      let overLenT = $("#drugImg").offset().top-$("#previewWrapper").offset().top
-      localStorage.setItem("changeImg",width>height?overLenT:overLenL)
+      let overLenL = $("#drugImg").offset().left-$("#previewWrapper").offset().left;
+      let overLenT = $("#drugImg").offset().top-$("#previewWrapper").offset().top;
+      localStorage.setItem("changeImg",width>height?overLenT:overLenL);
     })
   }
   handlePrev(){
@@ -148,6 +148,9 @@ class RotateImg extends Component {
   }
   handlePlus(){
     const {imgWidth,imgHeight,isMove} = this.state;
+    const { idx,imgLis } = this.props;
+    let width = imgLis[idx].width
+    let height = imgLis[idx].height
     if(this.props.isMove){
       this.setState({
         imgWidth:1.2*imgWidth,
@@ -155,8 +158,6 @@ class RotateImg extends Component {
       })
       return;
     }
-    localStorage.setItem("changeImg",true)
-
     this.setState({
       imgWidth:1.2*imgWidth,
       imgHeight:1.2*imgHeight,
@@ -173,8 +174,6 @@ class RotateImg extends Component {
       })
       return;
     }
-    localStorage.setItem("changeImg",true)
-
     this.setState({
       imgWidth:imgWidth*0.8,
       imgHeight:imgHeight*0.8,
@@ -192,10 +191,6 @@ class RotateImg extends Component {
       deg = deg-0+90
     }
     this.setState({
-      // imgWidth:tmpHeight,
-      // imgHeight:tmpWidth,
-      // mgLeft:-tmpHeight/2,
-      // mgTop:-tmpWidth/2,
       de:deg
     })
   }

src/components/PushContainer/index.jsx

@@ -73,6 +73,8 @@ class PushContainer extends Component {
    */
   handleActiveClick(id) {
     if (id == '2') {
+      document.getElementById("searchTmp").value = ""
+      // let searchVal = document.getElementById("searchTmp").value
       store.dispatch(initItemList(1,0));
     }
     store.dispatch(tabChange(id))

src/components/TemplateItems/index.jsx

@@ -143,8 +143,8 @@ class TemplateItems extends React.Component {
                         </div> :
                         <div className={style.wrapperTop}>
                             <div className={style.templateSearch}>
-                                <input placeholder="模板搜索" maxLength="30" ref={this.$search} type="text" onInput={this.handleChange} onPropertyChange={this.handleChange} onKeyUp={this.handleEnter}/>
-                                {this.state.val?<img src={delIcon} alt="清空" onClick={this.clear}/>:''}
+                                <input placeholder="模板搜索" id="searchTmp" maxLength="30" ref={this.$search} type="text" onInput={this.handleChange} onPropertyChange={this.handleChange} onKeyUp={this.handleEnter}/>
+                                {this.state.val?<img src={delIcon} id='clearTemplateSearch' alt="清空" onClick={this.clear}/>:''}
                                 <div className={style.search} onClick={this.templateSearch}>搜索</div>
                             </div>
                             {
@@ -156,7 +156,7 @@ class TemplateItems extends React.Component {
                     items&&!admin ? 
                         <div className={style.wrapperTop}>
                             <div className={style.templateSearch}>
-                                <input placeholder="模板搜索" id='templateSearch' maxLength="30" ref={this.$search} type="text" onInput={this.handleChange} onPropertyChange={this.handleChange} onKeyUp={this.handleEnter}/>
+                                <input placeholder="模板搜索" id="searchTmp" maxLength="30" ref={this.$search} type="text" onInput={this.handleChange} onPropertyChange={this.handleChange} onKeyUp={this.handleEnter}/>
                                 {this.state.val?<img src={delIcon} alt="清空" onClick={this.clear}/>:''}
                                 <div className={style.search} onClick={this.templateSearch}>搜索</div>
                             </div>

src/store/async-actions/patInfo.js

@@ -113,7 +113,7 @@ export const initHistoryDetails = (dispatch) => {
             "inquiryCode": state.recordId,
         }).then((res) => {
             const data = res.data;
-            let pre = baseList.homePage.sysConfig.connect_prec;
+            // let pre = baseList.homePage.sysConfig.connect_prec;
             if (data.code == 0) {
                 const detail = data.data;
                 if(detail.dataJson){

src/store/async-actions/tabTemplate.js

@@ -36,7 +36,7 @@ export const initItemList = (current,name) => {
 export const initCommonItemList = (current,name) => { //初始化数据
   let baseList = store.getState();
   let state = baseList.patInfo.message;
-
+  // let searchVal = document.getElementById("searchTmp").value
   return (dispatch) => {
     axios.json('/templateInfo/getTemplatePageAlls', {
       "doctorId": state.doctorId,
@@ -60,6 +60,7 @@ export const initCommonItemList = (current,name) => { //初始化数据
 };
 export const initAdminItemList = (current,name) => { //初始化数据
   let baseList = store.getState();
+  // let searchVal = document.getElementById("searchTmp").value
   let state = baseList.patInfo.message;
   return (dispatch) => {
     axios.json('/templateAdmin/getTemplatePageAlls', {

src/utils/drag.js

@@ -176,8 +176,8 @@ let imgXS = 0,//鼠标距离图片左侧的位置
     imgDYS = 0,//图片距离顶部的位置top
     drgLeft= 0,
     tmpValL=0,
-    tmpNum=0,
     tmpValR=0,
+    tmpVal=0,
     imgDrag = false;
 function imgDragMove(type){
   let wrap = $("#previewWrapper");
@@ -198,20 +198,7 @@ function imgDragMove(type){
       imgDYS = drag.offset().top;
       imgWXS = wrap.offset().left;
       imgWYS = wrap.offset().top;
-
-      if(localStorage.getItem('changeImg')){
-        tmpNum == 0
-        // localStorage.setItem("changeImg",false)
-        
-      }
-      
-      // if(tmpNum == 0){
-      //   tmpValL = imgDXS-imgWXS;
-      //   tmpValR = imgDYS-imgWYS;
-      //   ++tmpNum
-      // }
-
-      console.log(imgDXS,imgWXS,tmpNum,'hahaha')
+      tmpVal = localStorage.getItem('changeImg')-0;
 
       $(document).on('mousemove',handleMoveImg)
       $(document).on('mouseup',handleUpImg)
@@ -231,15 +218,14 @@ function handleMoveImg(event){
   let page = getPageCoordinate(event,'0');
   let wrapWidth = drag[0].offsetWidth;
   let wrapHeight = drag[0].offsetHeight;
+  
   if(imgDrag){
-      
     // console.log('鼠标左：'+page.boxLeft)
     // console.log('鼠标图左：'+imgXS)
     // console.log('容器左：'+imgWXS)
     // console.log('被拖图左：'+drag.offset().left)
     // console.log('bian1：'+tmpValL)
     // console.log('bian2：'+tmpValR)
-
     imgDXS = page.boxLeft - imgXS - imgWXS;//相对于父元素定位
     imgDYS = page.boxTop - imgYS - imgWYS;
 
@@ -249,8 +235,8 @@ function handleMoveImg(event){
         height:wrapHeight+'px',
         marginLeft:'0px',
         marginTop:'0px',
-        left:imgDXS+(de?tmpValL:0) + 'px',
-        top:imgDYS-(de?tmpValL:0) + 'px'
+        left:imgDXS+(de?tmpVal:0) + 'px',
+        top:imgDYS-(de?tmpVal:0) + 'px'
       })
     }
     else{
@@ -259,18 +245,10 @@ function handleMoveImg(event){
         height:wrapHeight+'px',
         marginLeft:'0px',
         marginTop:'0px',
-        left:imgDXS-(de?tmpValR:0) + 'px',
-        top:imgDYS+(de?tmpValR:0) + 'px'
+        left:imgDXS-(de?tmpVal:0) + 'px',
+        top:imgDYS+(de?tmpVal:0) + 'px'
       })
     }
-    // drag.css({
-    //   width:wrapWidth+'px',
-    //   height:wrapHeight+'px',
-    //   marginLeft:'0px',
-    //   marginTop:'0px',
-    //   left:imgDXS-(de?tmpValR:0) + 'px',
-    //   top:imgDYS+(de?tmpValR:0) + 'px'
-    // })
   }
 }
 module.exports = {