diff --git a/pages/assembleInfo/assembleInfo.vue b/pages/assembleInfo/assembleInfo.vue
index 061bcda..7790357 100644
--- a/pages/assembleInfo/assembleInfo.vue
+++ b/pages/assembleInfo/assembleInfo.vue
@@ -87,15 +87,17 @@
-
- 规格: {{value.val}} ±{{((value.top - value.bottom)/2).toFixed(2)}} {{ value.title }}
+
+
+ 规格:{{value.val}} (+{{(value.top).toFixed(2)}} -{{(value.bottom).toFixed(2)}}) {{ value.title }}
+
- {{value.bottom}}
+ {{(value.val-value.bottom).toFixed(2)}}
- {{value.top}}
+ />
+ {{(value.val+value.top).toFixed(2)}}
-
+
@@ -229,7 +231,7 @@
if (!item.input) {
this.configSet[index].product_tcq_conf[idx].inputState = false;
} else {
- if (item.input < item.bottom || item.input > item.top) {
+ if (item.input < (item.val-item.bottom).toFixed(2) || item.input > (item.val+item.top).toFixed(2)) {
this.configSet[index].product_tcq_conf[idx].inputState = false;
}
else {
diff --git a/pages/assembleInfo/index.scss b/pages/assembleInfo/index.scss
index 62f9db9..52ef08c 100644
--- a/pages/assembleInfo/index.scss
+++ b/pages/assembleInfo/index.scss
@@ -434,28 +434,28 @@
.tx-ul{
width: 710upx;
- @include flex(center,space-bteween);
- .tx-title{
- width: 500upx;
- @include fonts(24upx,#666,400);
- }
- .tx-in-nav{
+ @include flex(center,space-between);
+ .tx-title{
+ //width: 200upx;
+ @include fonts(24upx,#666,400);
+ }
+ }
+ .tx-in-nav{
+ //width:250upx;
+ @include flex(center,flex-start);
+ margin-top: 20upx;
+ input{
width: 200upx;
- @include flex(center,space-bteween);
- input{
- width: 100upx;
- padding: 20upx;
- border: 1upx solid #F1F1F1;
- font-size: 24upx;
- text-align: right;
- margin-left: 5upx;
- margin-right: 5upx;
- text-align: center;
- }
- view{
- font-size: 24upx;
- color:#007AFF;
- }
+ padding: 20upx;
+ border: 1upx solid #F1F1F1;
+ font-size: 24upx;
+ text-align: right;
+ margin-left: 5upx;
+ margin-right: 5upx;
+ text-align: center;
+ }
+ view{
+ font-size: 24upx;
+ color:#007AFF;
}
-
}
\ No newline at end of file
diff --git a/pages/hardwareInfo/hardwareInfo.vue b/pages/hardwareInfo/hardwareInfo.vue
index ee431d3..a31515e 100644
--- a/pages/hardwareInfo/hardwareInfo.vue
+++ b/pages/hardwareInfo/hardwareInfo.vue
@@ -104,18 +104,17 @@
-
- 规格: {{value.val}} ±{{((value.top - value.bottom)/2).toFixed(2)}} {{ value.title }}
+
+
+ 规格:{{value.val}} (+{{(value.top).toFixed(2)}} -{{(value.bottom).toFixed(2)}}) {{ value.title }}
+
- {{value.bottom}}
+ {{(value.val-value.bottom).toFixed(2)}}
- {{value.top}}
+ />
+ {{(value.val+value.top).toFixed(2)}}
-
-
- 请输入范围内的值
-
+
@@ -254,7 +253,7 @@
if (!item.input) {
this.configSet[index].check_conf_msg[idx].inputState = false;
} else {
- if (item.input < item.bottom || item.input > item.top) {
+ if (item.input < (item.val-item.bottom).toFixed(2) || item.input > (item.val+item.top).toFixed(2)) {
this.configSet[index].check_conf_msg[idx].inputState = false;
}
else {
diff --git a/pages/hardwareInfo/index.scss b/pages/hardwareInfo/index.scss
index 62f9db9..52ef08c 100644
--- a/pages/hardwareInfo/index.scss
+++ b/pages/hardwareInfo/index.scss
@@ -434,28 +434,28 @@
.tx-ul{
width: 710upx;
- @include flex(center,space-bteween);
- .tx-title{
- width: 500upx;
- @include fonts(24upx,#666,400);
- }
- .tx-in-nav{
+ @include flex(center,space-between);
+ .tx-title{
+ //width: 200upx;
+ @include fonts(24upx,#666,400);
+ }
+ }
+ .tx-in-nav{
+ //width:250upx;
+ @include flex(center,flex-start);
+ margin-top: 20upx;
+ input{
width: 200upx;
- @include flex(center,space-bteween);
- input{
- width: 100upx;
- padding: 20upx;
- border: 1upx solid #F1F1F1;
- font-size: 24upx;
- text-align: right;
- margin-left: 5upx;
- margin-right: 5upx;
- text-align: center;
- }
- view{
- font-size: 24upx;
- color:#007AFF;
- }
+ padding: 20upx;
+ border: 1upx solid #F1F1F1;
+ font-size: 24upx;
+ text-align: right;
+ margin-left: 5upx;
+ margin-right: 5upx;
+ text-align: center;
+ }
+ view{
+ font-size: 24upx;
+ color:#007AFF;
}
-
}
\ No newline at end of file
diff --git a/pages/rawMaterialInfo/rawMaterialInfo.vue b/pages/rawMaterialInfo/rawMaterialInfo.vue
index 1cff8fe..67c8df8 100644
--- a/pages/rawMaterialInfo/rawMaterialInfo.vue
+++ b/pages/rawMaterialInfo/rawMaterialInfo.vue
@@ -63,11 +63,11 @@
最大值
- {{item.up}}
+ {{Number(item.size) + item.up}}
最小值
- {{item.down}}
+ {{Number(item.size) - item.down}}
@@ -83,7 +83,7 @@
no1
@@ -91,7 +91,7 @@
no2
@@ -99,7 +99,7 @@
no3
@@ -107,7 +107,7 @@
no4
@@ -115,7 +115,7 @@
no5
diff --git a/pages/sprayInfo/index.scss b/pages/sprayInfo/index.scss
index 62f9db9..52ef08c 100644
--- a/pages/sprayInfo/index.scss
+++ b/pages/sprayInfo/index.scss
@@ -434,28 +434,28 @@
.tx-ul{
width: 710upx;
- @include flex(center,space-bteween);
- .tx-title{
- width: 500upx;
- @include fonts(24upx,#666,400);
- }
- .tx-in-nav{
+ @include flex(center,space-between);
+ .tx-title{
+ //width: 200upx;
+ @include fonts(24upx,#666,400);
+ }
+ }
+ .tx-in-nav{
+ //width:250upx;
+ @include flex(center,flex-start);
+ margin-top: 20upx;
+ input{
width: 200upx;
- @include flex(center,space-bteween);
- input{
- width: 100upx;
- padding: 20upx;
- border: 1upx solid #F1F1F1;
- font-size: 24upx;
- text-align: right;
- margin-left: 5upx;
- margin-right: 5upx;
- text-align: center;
- }
- view{
- font-size: 24upx;
- color:#007AFF;
- }
+ padding: 20upx;
+ border: 1upx solid #F1F1F1;
+ font-size: 24upx;
+ text-align: right;
+ margin-left: 5upx;
+ margin-right: 5upx;
+ text-align: center;
+ }
+ view{
+ font-size: 24upx;
+ color:#007AFF;
}
-
}
\ No newline at end of file
diff --git a/pages/sprayInfo/sprayInfo.vue b/pages/sprayInfo/sprayInfo.vue
index a858ef4..21e91e8 100644
--- a/pages/sprayInfo/sprayInfo.vue
+++ b/pages/sprayInfo/sprayInfo.vue
@@ -88,15 +88,17 @@
-
- 规格: {{value.val}} ±{{((value.top - value.bottom)/2).toFixed(2)}} {{ value.title }}
+
+
+ 规格:{{value.val}} (+{{(value.top).toFixed(2)}} -{{(value.bottom).toFixed(2)}}) {{ value.title }}
+
- {{value.bottom}}
+ {{(value.val-value.bottom).toFixed(2)}}
- {{value.top}}
+ />
+ {{(value.val+value.top).toFixed(2)}}
-
+
@@ -231,7 +233,7 @@
if (!item.input) {
this.configSet[index].check_conf_msg[idx].inputState = false;
} else {
- if (item.input < item.bottom || item.input > item.top) {
+ if (item.input < (item.val-item.bottom).toFixed(2) || item.input > (item.val+item.top).toFixed(2)) {
this.configSet[index].check_conf_msg[idx].inputState = false;
}
else {
diff --git a/pages/stampingInspectionInfo/index.scss b/pages/stampingInspectionInfo/index.scss
index dd6b17b..3806c3a 100644
--- a/pages/stampingInspectionInfo/index.scss
+++ b/pages/stampingInspectionInfo/index.scss
@@ -422,28 +422,28 @@
.tx-ul{
width: 710upx;
- @include flex(center,space-bteween);
- .tx-title{
- width: 500upx;
- @include fonts(24upx,#666,400);
- }
- .tx-in-nav{
+ @include flex(center,space-between);
+ .tx-title{
+ //width: 200upx;
+ @include fonts(24upx,#666,400);
+ }
+ }
+ .tx-in-nav{
+ //width:250upx;
+ @include flex(center,flex-start);
+ margin-top: 20upx;
+ input{
width: 200upx;
- @include flex(center,space-bteween);
- input{
- width: 100upx;
- padding: 20upx;
- border: 1upx solid #F1F1F1;
- font-size: 24upx;
- text-align: right;
- margin-left: 5upx;
- margin-right: 5upx;
- text-align: center;
- }
- view{
- font-size: 24upx;
- color:#007AFF;
- }
+ padding: 20upx;
+ border: 1upx solid #F1F1F1;
+ font-size: 24upx;
+ text-align: right;
+ margin-left: 5upx;
+ margin-right: 5upx;
+ text-align: center;
+ }
+ view{
+ font-size: 24upx;
+ color:#007AFF;
}
-
}
\ No newline at end of file
diff --git a/pages/stampingInspectionInfo/stampingInspectionInfo.vue b/pages/stampingInspectionInfo/stampingInspectionInfo.vue
index 718efb2..a35c109 100644
--- a/pages/stampingInspectionInfo/stampingInspectionInfo.vue
+++ b/pages/stampingInspectionInfo/stampingInspectionInfo.vue
@@ -69,15 +69,17 @@
-
- 规格: {{value.val}} ±{{((value.top - value.bottom)/2).toFixed(2)}} {{ value.title }}
+
+
+ 规格:{{value.val}} (+{{(value.top).toFixed(2)}} -{{(value.bottom).toFixed(2)}}) {{ value.title }}
+
- {{value.bottom}}
+ {{(value.val-value.bottom).toFixed(2)}}
- {{value.top}}
+ {{(value.val+value.top).toFixed(2)}}
-
+
@@ -211,7 +213,7 @@ console.log("xinshuzu", this.jurisdiction)
if (!item.input) {
this.configSet[index].check_conf_msg[idx].inputState = false;
} else {
- if (item.input < item.bottom || item.input > item.top) {
+ if (item.input < (item.val-item.bottom).toFixed(2) || item.input > (item.val+item.top).toFixed(2)) {
this.configSet[index].check_conf_msg[idx].inputState = false;
}
else {
diff --git a/pages/tcqInfo/index.scss b/pages/tcqInfo/index.scss
index 3a572e7..acbc1d1 100644
--- a/pages/tcqInfo/index.scss
+++ b/pages/tcqInfo/index.scss
@@ -434,28 +434,28 @@
.tx-ul{
width: 710upx;
- @include flex(center,space-between);
- .tx-title{
+ @include flex(center,space-between);
+ .tx-title{
+ width: 200upx;
+ @include fonts(24upx,#666,400);
+ }
+ }
+ .tx-in-nav{
+ //width:250upx;
+ @include flex(center,flex-start);
+ margin-top: 20upx;
+ input{
width: 200upx;
- @include fonts(24upx,#666,400);
+ padding: 20upx;
+ border: 1upx solid #F1F1F1;
+ font-size: 24upx;
+ text-align: right;
+ margin-left: 5upx;
+ margin-right: 5upx;
+ text-align: center;
}
- .tx-in-nav{
- width:250upx;
- @include flex(center,space-between);
- input{
- //width: 200upx;
- padding: 20upx;
- border: 1upx solid #F1F1F1;
- font-size: 24upx;
- text-align: right;
- margin-left: 5upx;
- margin-right: 5upx;
- text-align: center;
- }
- view{
- font-size: 24upx;
- color:#007AFF;
- }
+ view{
+ font-size: 24upx;
+ color:#007AFF;
}
-
}
\ No newline at end of file
diff --git a/pages/tcqInfo/tcqInfo.vue b/pages/tcqInfo/tcqInfo.vue
index 2a8d2cf..4b088f6 100644
--- a/pages/tcqInfo/tcqInfo.vue
+++ b/pages/tcqInfo/tcqInfo.vue
@@ -87,16 +87,19 @@
-
- 规格:{{ value.spec }} ±{{((value.top - value.bottom)/2).toFixed(2)}}
+
+
+ 规格:{{ value.spec }} (+{{(value.top).toFixed(2)}} -{{(value.bottom).toFixed(2)}})
+
- {{value.bottom}}
+ {{(value.spec-value.bottom).toFixed(2)}}
- {{value.top}}
+ {{(value.spec+value.top).toFixed(2)}}
+