Explorar o código

Merge branch 'dev5.3.3' of http://192.168.2.236:10080/zhouna/newICSS into dev5.3.3

zhangxc %!s(int64=5) %!d(string=hai) anos
pai
achega
d0a6a722d1

+ 3 - 1
src/components/AddInspect/index.jsx

@@ -316,7 +316,9 @@ class Inspect extends React.Component {
   }
   showDetails(val) {
     let min = val.minValue, max = val.maxValue, value = val.value, dom = '';
-    if (!isNaN(min) && !isNaN(max)) {//有最大值最小值
+    if(min == null&&max == null||min == undefined&&max == undefined||min == ''&&max == ''){
+      dom = getStatusImg(0, value, 1)
+    }else if (!isNaN(min) && !isNaN(max)) {//有最大值最小值
       if (isNaN(value)) {//输入的不是数据
         dom = getStatusImg(1, value, 1)
       } else if (value <= min) {//下降

+ 3 - 1
src/components/PreviewBody/index.jsx

@@ -52,7 +52,9 @@ class PreviewBody extends Component {
   }
   showDetails(val) {
     let min = val.minValue, max = val.maxValue, value = val.value, dom = '';
-    if (!isNaN(min) && !isNaN(max)) {//有最大值最小值
+    if(min == null&&max == null||min == undefined&&max == undefined||min == ''&&max == ''){
+      dom = getStatusImg(0, value, 1)
+    }else if (!isNaN(min) && !isNaN(max)) {//有最大值最小值
       if (isNaN(value)) {//输入的不是数据
         dom = getStatusImg(1, value, 1)
       } else if (value <= min) {//下降