Luolei 6 năm trước cách đây
mục cha
commit
9bd0b47764

+ 1 - 1
src/common/components/ComplexModal/index.less

@@ -1,8 +1,8 @@
 @import "~@less/mixin.less";
 .container {
   // position: relative;
+  // padding-top: 40px;  //改为绝对定位,拖拽元素不在监听document,改为这个
   z-index: 2000;
-  // padding-top: 40px;
   position: absolute;
   width: 100%;
   height: 100%;

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

@@ -327,7 +327,7 @@ class ChronicInfo extends React.Component{
     })
   }
   getDetail(){
-    const {data,formulaResult,calcuResult} = this.props;
+    const {data,formulaResult,calcuResult,indexs} = this.props;
     const {formulaId,optionId,possible,radioVal,calcuValues,currentIndex,hasEnterImg} = this.state;
     let list = data&&data.map((v,i)=>{
                     return <div className={style["list"]}>

+ 1 - 0
src/utils/config.js

@@ -1,6 +1,7 @@
 // const host='http://192.168.3.1:5050';//赵
 // const host='http://192.168.3.100:5050';//王峰
 // const host='http://192.168.2.241:5050';//后端接口访问地址
+// const host='http://192.168.2.121:5050';//后端接口访问地址
 const host='http://192.168.2.236:5050';//后端接口访问地址
 // const host='http://192.168.3.11:5050';//王宇
 //const host='http://192.168.2.164:8080';

+ 13 - 6
src/utils/tools.js

@@ -770,6 +770,18 @@ function dragBox(domWrap,domDrag,dragMove){
   let width = window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;//屏幕宽度
   let height = window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight;//屏幕高度
   let mouseX = 0,mouseY = 0,dragX = 0,dragY = 0,isDrag = false,isMove = false;
+  // $(drag).mousedown(()=>{
+  //   let page = getPageCoordinate(event,'0');
+  //   mouseX = page.boxLeft - wrap.offsetLeft      //鼠标到拖拽元素的左边界的距离
+  //   mouseY = page.boxTop - wrap.offsetTop       //鼠标到拖拽元素的上边界的距离
+  //   isDrag = true
+  // })
+  // $(move).mouseup(()=>{
+  //   console.log('mouseup')
+  //   isDrag = false
+  //   return false
+  // })
+  // $(move).mousemove(handleMove)
   windowEventHandler('mousedown',function(event){    //鼠标位置获取,计算点击位置到拖拽元素左边的距离
     let page = getPageCoordinate(event,'0');
     mouseX = page.boxLeft - wrap.offsetLeft      //鼠标到拖拽元素的左边界的距离
@@ -777,12 +789,6 @@ function dragBox(domWrap,domDrag,dragMove){
     isDrag = true
     // isMove = false
   },drag)
-  // $(move).mouseup(()=>{
-  //   console.log(123)
-  //   isDrag = false
-  //   return false
-  // })
-  // $(move).mousemove(handleMove)
   windowEventHandler('mousemove',handleMove,document)
   windowEventHandler('mouseup',()=>{
     // if(isMove){ //有move就设置位置没有移动就不处理
@@ -795,6 +801,7 @@ function dragBox(domWrap,domDrag,dragMove){
   },dragMove)
 
   function handleMove(event){      //移动的
+    // console.log('move')
     let dragDes = document.getElementById('treatDescBox');//展開区域
     let page = getPageCoordinate(event,'0');
     let maxDragX = 0,dragDesWidth = 0;