Jelajahi Sumber

部分调整

liucf 6 tahun lalu
induk
melakukan
b970606b0b

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

@@ -357,7 +357,7 @@ class ChronicInfo extends React.Component{
       <span className={style['okBtn']} onClick={()=>this.closeTable()}>确定</span>
     </div>;
     const {chronicMagItem,showList,tableList,scaleInfo,data,saveAssessInfos,chronicDesease,formulaResult,showHide} = this.props;
-    const {showInfo,showOption,showAssess,isAssessConfirm,tableName,tableId,parentId} = this.state;
+    const {showInfo,showOption,showAssess,isAssessConfirm,tableName,tableId,parentId,possible,radioVal} = this.state;
     //console.log(8989,chronicMagItem,chronicDesease);
     return <div className={style["tips"]} style={{marginBottom:'15px'}}>
               <div className={`${style["tips-title"]} ${style["chronic"]}`}>

+ 4 - 11
src/components/ScaleTable/index.jsx

@@ -15,7 +15,6 @@ class ScaleTable extends React.Component{
   constructor(props){
     super(props);
     this.state={
-      originData:{},
       selecteds:{},  //当前页面的选中标识,保存后使用select标识
       valueData:{},
       start:false,   //点击计算
@@ -25,7 +24,7 @@ class ScaleTable extends React.Component{
   }
   // handleRadio(groupName,name,value){
   handleRadio(groupName,name,item){
-    const {selecteds,originData,valueData,score} = this.state;
+    const {selecteds,valueData,score} = this.state;
     const value = item.detailName;
     this.setState({
       selecteds:Object.assign({},selecteds,{[name]:value}),
@@ -117,7 +116,7 @@ class ScaleTable extends React.Component{
 
   handleFormula(data){//得分计算
     const {tableId,getResult,parentId,scaleInfo} = this.props; 
-    const {originData,valueData,score} = this.state; 
+    const {valueData,score} = this.state; 
     this.setState({
       start:true
     })
@@ -175,7 +174,6 @@ class ScaleTable extends React.Component{
     const {tableId} = this.props;
     if(JSON.stringify(nextProps.scaleInfo) !== '{}'){
       this.setState({
-        originData:mocks.newData,
         // valueData:nextProps.scaleInfo[tableId].length?mocks.newData:JSON.parse(nextProps.scaleInfo[tableId].content),
         valueData:JSON.parse(nextProps.scaleInfo[tableId][1].content),
       })
@@ -185,7 +183,6 @@ class ScaleTable extends React.Component{
     const {tableId,scaleInfo} = this.props;
     if(scaleInfo&&scaleInfo[tableId]){
       this.setState({
-        // originData:mocks.newData,
         // valueData:scaleInfo[tableId].length?mocks.newData:JSON.parse(scaleInfo[tableId].content)
         valueData:JSON.parse(scaleInfo[tableId][1].content)
       })
@@ -193,7 +190,7 @@ class ScaleTable extends React.Component{
     
   }
   getContent(){ 
-    let {selecteds,originData,valueData,start} = this.state;
+    let {selecteds,valueData,start} = this.state;
     // const datas = valueData&&valueData.group?valueData:mocks.newData;
     const datas = valueData&&valueData.group?valueData:'';
     let content =  datas&&datas.group&&datas.group.map((v,i)=>{
@@ -247,20 +244,16 @@ class ScaleTable extends React.Component{
   render(){
     const {title,scaleInfo,tableId,formulaResult} = this.props;
     const data = scaleInfo[tableId];
-    let {selecteds,originData,totalScore} = this.state;
+    let {selecteds,totalScore} = this.state;
     const content = data && data[1].content;//表格内容
     const preContent = data && data[0].content;//表前文字
     const footContent = data && data[2].content; //表后文字
     const datas = content && JSON.parse(content);
     const scaleResult = formulaResult&&formulaResult[tableId]; //量表计算结果
-    // const preContent = '';
-    // const footContent ='';
-    // const datas = mocks.newData;
     return <div className={style['tableBox']} id="printcontent">
             <div className={style['printShow']}>
               <Information></Information>
             </div> 
-            {/*<h1>{title}</h1>*/}
             <h1>{datas?datas.scaleName:''}</h1>
             <div dangerouslySetInnerHTML={{__html:preContent}} className={style['textlh']}></div>
             <div className={style['textContent']}>

+ 1 - 1
src/components/ScaleTable/index.less

@@ -114,7 +114,7 @@ strong{
       border-radius: 4px;
       margin-left: 40px;
       text-align: center;
-      cursor: auto;
+      cursor: pointer;
     }
   }
 }