|
@@ -151,13 +151,31 @@ class PushItems extends Component {
|
|
showTips
|
|
showTips
|
|
} = this;
|
|
} = this;
|
|
let assayNum = 0;
|
|
let assayNum = 0;
|
|
|
|
+ let assayNum2 = 0;
|
|
let assayHide = assay.map((item, index) => {
|
|
let assayHide = assay.map((item, index) => {
|
|
assayNum = assayNum + item.name.length + 2;
|
|
assayNum = assayNum + item.name.length + 2;
|
|
- if (assayNum > 23) {
|
|
|
|
- return;
|
|
|
|
|
|
+ if (assayNum > 28) {
|
|
|
|
+ assayNum2 = assayNum2 + item.name.length + 2;
|
|
|
|
+ if(assayNum2 > 23) {
|
|
|
|
+ return;
|
|
|
|
+ } else {
|
|
|
|
+ return (
|
|
|
|
+ <span>
|
|
|
|
+
|
|
|
|
+ <input
|
|
|
|
+ id={item.id + item.name}
|
|
|
|
+ onChange={() => changeAssay(item)}
|
|
|
|
+ type="checkbox"
|
|
|
|
+ checked={item.checked}
|
|
|
|
+ />
|
|
|
|
+ <label for={item.id + item.name}>{item.name}</label>
|
|
|
|
+ </span>
|
|
|
|
+ );
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
return (
|
|
return (
|
|
<span>
|
|
<span>
|
|
|
|
+
|
|
<input
|
|
<input
|
|
id={item.id + item.name}
|
|
id={item.id + item.name}
|
|
onChange={() => changeAssay(item)}
|
|
onChange={() => changeAssay(item)}
|
|
@@ -185,10 +203,29 @@ class PushItems extends Component {
|
|
});
|
|
});
|
|
|
|
|
|
let checkNum = 0;
|
|
let checkNum = 0;
|
|
|
|
+ let checkNum2 = 0;
|
|
let checkHide = check.map((item, index) => {
|
|
let checkHide = check.map((item, index) => {
|
|
checkNum = checkNum + item.name.length + 2;
|
|
checkNum = checkNum + item.name.length + 2;
|
|
- if (checkNum > 23) {
|
|
|
|
- return;
|
|
|
|
|
|
+ if (checkNum > 28) {
|
|
|
|
+ checkNum2 = checkNum2 + item.name.length + 2;
|
|
|
|
+ if(checkNum2 > 23) {
|
|
|
|
+ return;
|
|
|
|
+ }else {
|
|
|
|
+ return (
|
|
|
|
+ <span>
|
|
|
|
+ <input
|
|
|
|
+ id={item.id + item.name}
|
|
|
|
+ onChange={() => changeCheck(item)}
|
|
|
|
+ type="checkbox"
|
|
|
|
+ checked={item.checked}
|
|
|
|
+ />
|
|
|
|
+ <label for={item.id + item.name}>{item.name}</label>
|
|
|
|
+ </span>
|
|
|
|
+ );
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
} else {
|
|
} else {
|
|
return (
|
|
return (
|
|
<span>
|
|
<span>
|
|
@@ -219,7 +256,7 @@ class PushItems extends Component {
|
|
});
|
|
});
|
|
|
|
|
|
const vigilants = vigilant.map((item, index) => {
|
|
const vigilants = vigilant.map((item, index) => {
|
|
- return <DiagnosticItem item={item} />;
|
|
|
|
|
|
+ return <div key={item.id} className={style['push-diag-item']}><DiagnosticItem item={item}/></div>;
|
|
});
|
|
});
|
|
|
|
|
|
return (
|
|
return (
|
|
@@ -293,7 +330,7 @@ class PushItems extends Component {
|
|
: moreAssay
|
|
: moreAssay
|
|
? assays
|
|
? assays
|
|
: assayHide}
|
|
: assayHide}
|
|
- {assayNum > 28 ? (
|
|
|
|
|
|
+ {assayNum2 > 23 ? (
|
|
<span
|
|
<span
|
|
style={
|
|
style={
|
|
moreAssay
|
|
moreAssay
|
|
@@ -331,7 +368,7 @@ class PushItems extends Component {
|
|
: moreCheck
|
|
: moreCheck
|
|
? checks
|
|
? checks
|
|
: checkHide}
|
|
: checkHide}
|
|
- {checkNum > 28 ? (
|
|
|
|
|
|
+ {checkNum2 > 23 ? (
|
|
<span
|
|
<span
|
|
style={
|
|
style={
|
|
moreCheck
|
|
moreCheck
|