diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index 7553d9d..202fd7e 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -20,6 +20,11 @@
+
+
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/clfcz.vue b/src/components/Template/StepComponents/ry/clfcz.vue
index f0b48fb..5941c90 100644
--- a/src/components/Template/StepComponents/ry/clfcz.vue
+++ b/src/components/Template/StepComponents/ry/clfcz.vue
@@ -1,73 +1,76 @@
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/cs.vue b/src/components/Template/StepComponents/ry/cs.vue
index 3b2fe39..ed607d7 100644
--- a/src/components/Template/StepComponents/ry/cs.vue
+++ b/src/components/Template/StepComponents/ry/cs.vue
@@ -1,99 +1,103 @@
-
+
+export default {
+ mixins: [stepMixins],
+ components: {
+ StepFormPackage
+ },
+ computed: {
+ formConfig() {
+ return [{
+ config: {
+ text1: {
+ label: "使用超声波清洗机",
+ type: "text",
+ },
+ yq: {
+ type: "instrument",
+ fillType: "actFill",
+ },
+ text2: {
+ label: "仪器,设置预计频率为",
+ type: "text",
+ },
+ yjpl: {
+ type: "inputNumber",
+ fillType: "preFill",
+ },
+ text3: {
+ label: "Hz,实际频率为",
+ type: "text",
+ },
+ sjpl: {
+ type: "inputNumber",
+ fillType: "actFill",
+ compareTo: "yjpl",
+ copyFrom: "yjpl",
+ },
+ text4: {
+ label: "Hz,设置预计时长为",
+ type: "text",
+ },
+ yjsc: {
+ type: "inputNumber",
+ fillType: "preFill",
+ },
+ yjscdw: {
+ type: "select",
+ options: this.getDictOptions("business_tjdw"),
+ selectTo: "sjscdw",
+ fillType: "preFill",
+ },
+ text5: {
+ label: ",实际时长为",
+ type: "text",
+ },
+ sjsc: {
+ type: "inputNumber",
+ fillType: "preFill",
+ compareTo: "yjsc",
+ copyFrom: "yjsc",
+ },
+ sjscdw: {
+ type: "select",
+ options: this.getDictOptions("business_tjdw"),
+ fillType: "preFill",
+ },
+ text6: {
+ label: ",进行",
+ type: "text",
+ },
+ cssr: {
+ type: "input",
+ fillType: "preFill",
+ },
+ text7: {
+ label: "超声,超声",
+ type: "text",
+ },
+ button1: {
+ type: "button",
+ buttonName: "开始"
+ },
+ text9: {
+ type: "text",
+ label: "。",
+ },
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/czdd.vue b/src/components/Template/StepComponents/ry/czdd.vue
index eeff93c..e30c3f2 100644
--- a/src/components/Template/StepComponents/ry/czdd.vue
+++ b/src/components/Template/StepComponents/ry/czdd.vue
@@ -29,7 +29,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
fillType:"actFill",
},
text2:{
- label:"环境下,操作下述步骤",
+ label:"环境下,操作下述步骤。",
type:"text",
}
}
diff --git a/src/components/Template/StepComponents/ry/czhj.vue b/src/components/Template/StepComponents/ry/czhj.vue
index ff3f1db..8283d78 100644
--- a/src/components/Template/StepComponents/ry/czhj.vue
+++ b/src/components/Template/StepComponents/ry/czhj.vue
@@ -51,7 +51,7 @@ export default {
copyFrom:"ytczhj"
},
text4: {
- label: "条件下操作下述步骤",
+ label: "条件下操作下述步骤。",
type: "text",
},
}
diff --git a/src/components/Template/StepComponents/ry/dc.vue b/src/components/Template/StepComponents/ry/dc.vue
index 6eb0b11..52273d5 100644
--- a/src/components/Template/StepComponents/ry/dc.vue
+++ b/src/components/Template/StepComponents/ry/dc.vue
@@ -43,7 +43,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
copyFrom:"temp",
},
text4:{
- label:"°C,进行氮吹",
+ label:"°C,进行氮吹。",
type:"text",
}
}
diff --git a/src/components/Template/StepComponents/ry/ddhy.vue b/src/components/Template/StepComponents/ry/ddhy.vue
index 1a8d496..705c804 100644
--- a/src/components/Template/StepComponents/ry/ddhy.vue
+++ b/src/components/Template/StepComponents/ry/ddhy.vue
@@ -35,7 +35,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
copyFrom:"ddcs1"
},
text3:{
- label:"次",
+ label:"次。",
type:"text",
}
}
diff --git a/src/components/Template/StepComponents/ry/fb.vue b/src/components/Template/StepComponents/ry/fb.vue
new file mode 100644
index 0000000..7d881fa
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/fb.vue
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/fr.vue b/src/components/Template/StepComponents/ry/fr.vue
new file mode 100644
index 0000000..1fb2586
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/fr.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/frdrq.vue b/src/components/Template/StepComponents/ry/frdrq.vue
new file mode 100644
index 0000000..e988e0c
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/frdrq.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/fs.vue b/src/components/Template/StepComponents/ry/fs.vue
new file mode 100644
index 0000000..eff20d4
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/fs.vue
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/fy.vue b/src/components/Template/StepComponents/ry/fy.vue
new file mode 100644
index 0000000..7c233df
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/fy.vue
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/glsd.vue b/src/components/Template/StepComponents/ry/glsd.vue
index 84510db..09c4582 100644
--- a/src/components/Template/StepComponents/ry/glsd.vue
+++ b/src/components/Template/StepComponents/ry/glsd.vue
@@ -29,7 +29,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
fillType:"actFill",
},
text3:{
- label:"进行过滤",
+ label:"进行过滤。",
type:"text",
},
}
diff --git a/src/components/Template/StepComponents/ry/glzd.vue b/src/components/Template/StepComponents/ry/glzd.vue
index 4450740..8c6eb0a 100644
--- a/src/components/Template/StepComponents/ry/glzd.vue
+++ b/src/components/Template/StepComponents/ry/glzd.vue
@@ -37,7 +37,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
fillType:"actFill",
},
text3:{
- label:"进行过滤",
+ label:"进行过滤。",
type:"text",
},
}
diff --git a/src/components/Template/StepComponents/ry/hb.vue b/src/components/Template/StepComponents/ry/hb.vue
new file mode 100644
index 0000000..4c66606
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/hb.vue
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/hwhy.vue b/src/components/Template/StepComponents/ry/hwhy.vue
index 5eaa366..7e897ec 100644
--- a/src/components/Template/StepComponents/ry/hwhy.vue
+++ b/src/components/Template/StepComponents/ry/hwhy.vue
@@ -1,120 +1,123 @@
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/jb.vue b/src/components/Template/StepComponents/ry/jb.vue
index 1af9a33..97d3f0e 100644
--- a/src/components/Template/StepComponents/ry/jb.vue
+++ b/src/components/Template/StepComponents/ry/jb.vue
@@ -1,82 +1,85 @@
-
+
+export default {
+ mixins: [stepMixins],
+ components: {
+ StepFormPackage
+ },
+ computed: {
+ formConfig() {
+ return [{
+ config: {
+ text1: {
+ label: "使用搅拌仪",
+ type: "text",
+ },
+ yq: {
+ type: "instrument",
+ fillType: "actFill",
+ },
+ text4: {
+ label: ",设置预计转速为",
+ type: "text",
+ },
+ yjzs2: {
+ type: "inputNumber",
+ fillType: "preFill",
+ },
+ yjzsdw: {
+ type: "select",
+ options: this.getDictOptions("business_zsdw"),
+ selectTo: "sjzsdw",
+ fillType: "preFill",
+ },
+ text5: {
+ label: "实际转速为",
+ type: "text",
+ },
+ sjzs: {
+ type: "inputNumber",
+ fillType: "actFill",
+ compareTo: "yjzs2",
+ copyFrom: "yjzs2"
+ },
+ sjzsdw: {
+ type: "select",
+ options: this.getDictOptions("business_zsdw"),
+ fillType: "preFill",
+ },
+ text6: {
+ label: "进行搅拌,搅拌",
+ type: "text",
+ },
+ button1: {
+ type: "button",
+ buttonName: "开始",
+ },
+ text7: {
+ label: "搅拌",
+ type: "text",
+ },
+ button2: {
+ type: "button",
+ buttonName: "结束",
+ },
+ text9: {
+ type: "text",
+ label: "。",
+ },
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/jd.vue b/src/components/Template/StepComponents/ry/jd.vue
index 5a4421e..620d9c9 100644
--- a/src/components/Template/StepComponents/ry/jd.vue
+++ b/src/components/Template/StepComponents/ry/jd.vue
@@ -73,13 +73,13 @@ export default {
sjwd: {
type: "select",
options: this.getDictOptions("business_wddw"),
- fillType: "preFill",
+ fillType: "actFill",
otherCode: "sjwdOther",
},
sjhj: {
type: "select",
options: this.getDictOptions("business_hjxx"),
- fillType: "preFill",
+ fillType: "actFill",
otherCode: "sjhjOther",
},
text6: {
@@ -106,6 +106,10 @@ export default {
type:"button",
buttonName:"结束",
},
+ text9: {
+ type: "text",
+ label: "。",
+ },
}
diff --git a/src/components/Template/StepComponents/ry/jrjb.vue b/src/components/Template/StepComponents/ry/jrjb.vue
index e8212b1..321e66c 100644
--- a/src/components/Template/StepComponents/ry/jrjb.vue
+++ b/src/components/Template/StepComponents/ry/jrjb.vue
@@ -87,6 +87,10 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
type:"button",
buttonName:"结束",
},
+ text8: {
+ type: "text",
+ label: "。",
+ },
}
}]
diff --git a/src/components/Template/StepComponents/ry/js.vue b/src/components/Template/StepComponents/ry/js.vue
new file mode 100644
index 0000000..59669d1
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/js.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/jz.vue b/src/components/Template/StepComponents/ry/jz.vue
index 82bce04..e45c925 100644
--- a/src/components/Template/StepComponents/ry/jz.vue
+++ b/src/components/Template/StepComponents/ry/jz.vue
@@ -62,6 +62,10 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
type:"button",
buttonName:"结束",
},
+ text6: {
+ type: "text",
+ label: "。",
+ },
}
}]
}
diff --git a/src/components/Template/StepComponents/ry/lx.vue b/src/components/Template/StepComponents/ry/lx.vue
index 1d972ea..2d5ea34 100644
--- a/src/components/Template/StepComponents/ry/lx.vue
+++ b/src/components/Template/StepComponents/ry/lx.vue
@@ -111,6 +111,10 @@ export default {
type: "button",
buttonName: "开始",
},
+ text9: {
+ type: "text",
+ label: "。",
+ },
}
}]
}
diff --git a/src/components/Template/StepComponents/ry/mj.vue b/src/components/Template/StepComponents/ry/mj.vue
new file mode 100644
index 0000000..4bda7cb
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/mj.vue
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/qcyy.vue b/src/components/Template/StepComponents/ry/qcyy.vue
new file mode 100644
index 0000000..9d79639
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/qcyy.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/qywz.vue b/src/components/Template/StepComponents/ry/qywz.vue
index 0f1c148..c4705dd 100644
--- a/src/components/Template/StepComponents/ry/qywz.vue
+++ b/src/components/Template/StepComponents/ry/qywz.vue
@@ -35,7 +35,11 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
zl:{
type:"span",
- }
+ },
+ text3:{
+ label:"。",
+ type:"text",
+ },
}
}]
}
diff --git a/src/components/Template/StepComponents/ry/rs.vue b/src/components/Template/StepComponents/ry/rs.vue
new file mode 100644
index 0000000..74fbbee
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/rs.vue
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/sy.vue b/src/components/Template/StepComponents/ry/sy.vue
index 796e946..7fca675 100644
--- a/src/components/Template/StepComponents/ry/sy.vue
+++ b/src/components/Template/StepComponents/ry/sy.vue
@@ -57,7 +57,11 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
button2:{
type:"button",
buttonName:"结束"
- }
+ },
+ text6: {
+ type: "text",
+ label: "。",
+ },
}
}]
}
diff --git a/src/components/Template/StepComponents/ry/tjphcz.vue b/src/components/Template/StepComponents/ry/tjphcz.vue
index 402da1a..19404e3 100644
--- a/src/components/Template/StepComponents/ry/tjphcz.vue
+++ b/src/components/Template/StepComponents/ry/tjphcz.vue
@@ -97,6 +97,10 @@ export default {
type: "button",
buttonName: "获取值",
},
+ text8: {
+ type: "text",
+ label: "。",
+ },
}
}]
}
diff --git a/src/components/Template/StepComponents/ry/tjphfcz.vue b/src/components/Template/StepComponents/ry/tjphfcz.vue
index 85cd403..464ef72 100644
--- a/src/components/Template/StepComponents/ry/tjphfcz.vue
+++ b/src/components/Template/StepComponents/ry/tjphfcz.vue
@@ -93,6 +93,11 @@ export default {
type: "inputNumber",
fillType: "actFill",
},
+
+ text8: {
+ type: "text",
+ label: "。",
+ },
}
}]
}
diff --git a/src/components/Template/StepComponents/ry/tpjydd.vue b/src/components/Template/StepComponents/ry/tpjydd.vue
index eb5874e..929147c 100644
--- a/src/components/Template/StepComponents/ry/tpjydd.vue
+++ b/src/components/Template/StepComponents/ry/tpjydd.vue
@@ -107,6 +107,10 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
jgpd:{
label:"通过/不通过",
type:"span",
+ },
+ text9:{
+ label:"。",
+ type:"text",
}
}
}]
diff --git a/src/components/Template/StepComponents/ry/tpjysd.vue b/src/components/Template/StepComponents/ry/tpjysd.vue
index 3910b82..82e4017 100644
--- a/src/components/Template/StepComponents/ry/tpjysd.vue
+++ b/src/components/Template/StepComponents/ry/tpjysd.vue
@@ -206,6 +206,10 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
jgpd:{
label:"通过/不通过",
type:"span",
+ },
+ text9:{
+ label:"。",
+ type:"text",
}
}
}
diff --git a/src/components/Template/StepComponents/ry/wxhy.vue b/src/components/Template/StepComponents/ry/wxhy.vue
index f144101..0cfc4e1 100644
--- a/src/components/Template/StepComponents/ry/wxhy.vue
+++ b/src/components/Template/StepComponents/ry/wxhy.vue
@@ -25,7 +25,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
fillType:"actFill",
},
text2:{
- label:"仪器,进行涡旋混匀",
+ label:"仪器,进行涡旋混匀。",
type:"text",
},
}
diff --git a/src/components/Template/StepComponents/ry/xzrq.vue b/src/components/Template/StepComponents/ry/xzrq.vue
index 5c1b1ac..66c5e91 100644
--- a/src/components/Template/StepComponents/ry/xzrq.vue
+++ b/src/components/Template/StepComponents/ry/xzrq.vue
@@ -31,7 +31,7 @@ export default {
options: this.getDictOptions('business_rqcz'),
},
text2: {
- label: "作为容器",
+ label: "作为容器。",
type: "text",
},
}
diff --git a/src/components/Template/StepComponents/ry/ym.vue b/src/components/Template/StepComponents/ry/ym.vue
index 678cbe2..c62b860 100644
--- a/src/components/Template/StepComponents/ry/ym.vue
+++ b/src/components/Template/StepComponents/ry/ym.vue
@@ -101,6 +101,10 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
type:"button",
buttonName:"结束"
},
+ text9:{
+ label:"。",
+ type:"text",
+ }
}
}]
}
diff --git a/src/components/Template/StepComponents/ry/zy.vue b/src/components/Template/StepComponents/ry/zy.vue
index 1616d7a..83a2845 100644
--- a/src/components/Template/StepComponents/ry/zy.vue
+++ b/src/components/Template/StepComponents/ry/zy.vue
@@ -25,7 +25,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
fillType:"actFill",
},
text2:{
- label:"进行正压操作",
+ label:"进行正压操作。",
type:"text",
}
}
diff --git a/src/components/Template/StepComponents/ry/zyhy.vue b/src/components/Template/StepComponents/ry/zyhy.vue
index 8574815..9107d8c 100644
--- a/src/components/Template/StepComponents/ry/zyhy.vue
+++ b/src/components/Template/StepComponents/ry/zyhy.vue
@@ -93,6 +93,10 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
button1:{
type:"button",
buttonName:"开始"
+ },
+ text7:{
+ label:"。",
+ type:"text",
}
}
}]
diff --git a/src/components/Template/StepFormPackage.vue b/src/components/Template/StepFormPackage.vue
index 34a1299..6fb7feb 100644
--- a/src/components/Template/StepFormPackage.vue
+++ b/src/components/Template/StepFormPackage.vue
@@ -21,8 +21,15 @@
@copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
:orange-bg="orangeBgFields[key]" />
+
+
+
-
+
\ No newline at end of file
diff --git a/src/components/Template/mixins/stepMixins.js b/src/components/Template/mixins/stepMixins.js
index 3f26f53..c5ad0d1 100644
--- a/src/components/Template/mixins/stepMixins.js
+++ b/src/components/Template/mixins/stepMixins.js
@@ -1,5 +1,5 @@
export default {
- dicts:["business_tjdw","business_czhj","business_rqcz","business_zldw","business_yqscdw","business_zsdw","business_wddw","business_ccwz"],
+ dicts:["business_tjdw","business_czhj","business_rqcz","business_zldw","business_yqscdw","business_zsdw","business_wddw","business_ccwz","business_ggdw"],
props: {
formData: {
type: Object,