+
Hz
-
确定
diff --git a/business-css/frontend/src/components/antvx6/editdevice.vue b/business-css/frontend/src/components/antvx6/editdevice.vue
index c5dbea5..339d046 100644
--- a/business-css/frontend/src/components/antvx6/editdevice.vue
+++ b/business-css/frontend/src/components/antvx6/editdevice.vue
@@ -39,6 +39,7 @@ const selectedDevice:any = ref({}) // 选中患者
function confirmClick(formEl: any) {
formEl.validate((valid: any) => {
+ debugger
if (valid) {
const params = {
...info.value,
@@ -57,6 +58,15 @@ function confirmClick(formEl: any) {
const sourceTempData:any = ref([])
onMounted(() => {
sourceTempData.value = props.sizeSchemaInfo[props.deviceTypetype].fields
+ let rulesTemp:any = ref({})
+ sourceTempData.value.forEach((item:any) => {
+ rulesTemp.value['size.' + item.key] = [{
+ validator: validator1,
+ trigger: 'blur'
+ }]
+ })
+ rules.value = {...rules.value,...rulesTemp.value}
+
editClick(props.deviceInfo)
});
@@ -70,9 +80,41 @@ const info: any = ref({
flowRate: null,
pulseVelocity: null
});
+const validator1 = (rule: any, value: any, callback: any) => { // 校验数字是否大于0
+ if (value == null || value === '') {
+ callback();
+ return;
+ }
+ if (!/^\d+(\.\d+)?$/.test(value)) {
+ callback(new Error('请输入有效的数字或小数'));
+ } else if (parseFloat(value) <= 0) {
+ callback(new Error('数字必须大于 0'));
+ } else {
+ callback();
+ }
+}
+
const rules = ref({
name: [{ required: true, message: "请输入设备名称", trigger: "blur" }],
code: [{ required: true, message: "请输入设备编码", trigger: "blur" }],
+ volume: [
+ {
+ validator: validator1,
+ trigger: 'blur'
+ }
+ ],
+ flowRate: [
+ {
+ validator: validator1,
+ trigger: 'blur'
+ }
+ ],
+ pulseVelocity: [
+ {
+ validator: validator1,
+ trigger: 'blur'
+ }
+ ],
});
const isEdit = ref(false) // 是否编辑设备
function editClick(row: any) {
@@ -96,7 +138,7 @@ info.value.size = JSON.parse(row.size)
-
+
{{item.unit}}
-
+
L
-
+
m³/h
-
+
{
refY: 0,
},
label: {
- refX: 45,
+ refX: 0.5,
refY: 80,
- textAnchor: 'start',
+ textAnchor: 'middle',
textVerticalAnchor: 'top',
fontSize: 14,
fill: '#000',
diff --git a/business-css/frontend/src/components/antvx6/materialmodel.vue b/business-css/frontend/src/components/antvx6/materialmodel.vue
index 7a5d1f4..f4878eb 100644
--- a/business-css/frontend/src/components/antvx6/materialmodel.vue
+++ b/business-css/frontend/src/components/antvx6/materialmodel.vue
@@ -84,8 +84,12 @@ onMounted(() => {
deviceName.value = props.deviceInfo.name
if(props.materialId != null){
materialsById(props.materialId).then((res:any) => {
+
+ if(res!= null && res != ""){
editClick(res)
info.value.iconBase64 = res.iconBase64;
+ }
+
});
}else{
editClick(props.materialInfo)
@@ -96,18 +100,145 @@ onMounted(() => {
});
const infoForm = ref();
const info: any = ref({
- name: "",
code: "",
type: null,
- size: null,
- volume: null,
- flowRate: null,
- pulseVelocity: null
+ size: {},
+ name: "",
+ description: "",
+ uConcentration: "",
+ uo2Density: "",
+ uEnrichment: "",
+ puConcentration: "",
+ puo2Density: "",
+ ePu238: "",
+ ePu239: "",
+ ePu240: "",
+ ePu241: "",
+ ePu242: "",
+ hno3Acidity: "",
+ h2c2o4Concentration: "",
+ organicRatio: "",
+ moistureContent: "",
+ iconBase64: ""
});
const josnInfo: any = ref({}) // 设备信息
+const validator1 = (rule: any, value: any, callback: any) => {
+ if (!value || value === '') {
+ callback();
+ return;
+ }
+ if (!/^\d+(\.\d+)?$/.test(value)) {
+ callback(new Error('请输入有效的数字或小数'));
+ } else if (parseFloat(value) <= 0) {
+ callback(new Error('数字必须大于 0'));
+ } else {
+ callback();
+ }
+}
+const validator2 = (rule: any, value: any, callback: any) => {
+ if (!value || value === '') {
+ callback();
+ return;
+ }
+ if (!/^\d+(\.\d+)?$/.test(value)) {
+ callback(new Error('请输入有效的数字或小数'));
+ } else if (parseFloat(value) <= 0) {
+ callback(new Error('数字必须大于 0'));
+ }else if (parseFloat(value) >= 1) {
+ callback(new Error('数字必须小于 1'));
+ } else {
+ callback();
+ }
+}
+//新建物料数据
const rules = ref({
- name: [{ required: true, message: "请输入设备名称", trigger: "blur" }],
- code: [{ required: true, message: "请输入设备编码", trigger: "blur" }],
+ name: [{ required: true, message: "请输入物料数据名称", trigger: "blur" }],
+ uConcentration: [
+ {
+ validator: validator1,
+ trigger: 'blur'
+ }
+ ],
+ uo2Density: [
+ {
+ validator: validator1,
+ trigger: 'blur'
+ }
+ ],
+ uEnrichment: [{
+ validator: validator2,
+ trigger: 'blur'
+ }],
+ puConcentration: [
+ {
+ validator: validator1,
+ trigger: 'blur'
+ }
+ ],
+ puo2Density: [
+ {
+ validator: validator1,
+ trigger: 'blur'
+ }
+ ],
+ ePu238: [
+ {
+ validator: validator2,
+ trigger: 'blur'
+ }
+ ],
+ ePu239: [
+ {
+ validator: validator2,
+ trigger: 'blur'
+ }
+ ],
+ ePu240: [
+ {
+ validator: validator2,
+ trigger: 'blur'
+ }
+ ],
+ ePu241: [
+ {
+ validator: validator2,
+ trigger: 'blur'
+ }
+ ],
+ ePu242: [
+ {
+ validator: validator2,
+ trigger: 'blur'
+ }
+ ],
+
+
+
+
+ hno3Acidity: [
+ {
+ validator: validator1,
+ trigger: 'blur'
+ }
+ ],
+ h2c2o4Concentration: [
+ {
+ validator: validator1,
+ trigger: 'blur'
+ }
+ ],
+ organicRatio: [
+ {
+ validator: validator2,
+ trigger: 'blur'
+ }
+ ],
+ moistureContent: [
+ {
+ validator: validator2,
+ trigger: 'blur'
+ }
+ ],
});
const isEdit = ref(false) // 是否编辑设备
function editClick(row: any) {
@@ -336,7 +467,7 @@ function delIconBase(){
-
+
@@ -471,32 +602,30 @@ function delIconBase(){
{{ item.value }}
-
+
-
+
-
+
-
+