|
@@ -27,8 +27,6 @@ class ScaleTableHis extends React.Component{
|
|
|
}
|
|
|
|
|
|
getContent(datas){
|
|
|
- const {title,formulaResult,data} = this.props;
|
|
|
- // const datas = valueData&&valueData.group?valueData:mocks.newData;
|
|
|
let content = datas&&datas.group&&datas.group.map((v,i)=>{
|
|
|
return <div className={style['group']}>
|
|
|
<p className={style['groupName']}>{v.groupName}</p>
|
|
@@ -36,7 +34,7 @@ class ScaleTableHis extends React.Component{
|
|
|
return <div>
|
|
|
{it.row.map((item,index)=>{
|
|
|
if(item.controlType==0){
|
|
|
- return <div className={style['block']} style={{border:it.required==1&&!item.isSelect&&start?'1px solid #f00':'none'}}>
|
|
|
+ return <div className={style['block']}>
|
|
|
<p className={style['miniName']}>{item.name}</p>
|
|
|
{item.details&&item.details.map((vv,ii)=>{
|
|
|
return <div className={style['item']}>
|