微调

frontend/src/views/machine/device/components/devicePopup.vue

@@ -131,7 +131,13 @@
                                 </el-form-item>           
                                 <el-form-item label='所属电站'  prop='subName' clearable placeholder="请输入所属电站" v-if="MonIsShow">
                                     <el-input v-model='formContent.subName' />
-                                </el-form-item>           
+                                </el-form-item>    
+                                <el-form-item  v-auth.device="'factorFlag'"  label="是否支持系数校准"  prop='factorFlag'>
+                                  <el-radio-group v-model="formContent.factorFlag" >
+                                    <el-radio :value="1">是</el-radio>
+                                    <el-radio :value="0">否</el-radio>
+                                  </el-radio-group>
+                              </el-form-item>
                     </el-form>            
                 </div>  
             </el-tab-pane>
@@ -195,6 +201,7 @@ const disabledDate = (time: Date) => {
       encryptionFlag: 0,
       reCheckNum:0,
       state: 1,
+      factorFlag:0,
     })
     return { dialogVisible, titleType, formContent }
   }
@@ -221,6 +228,7 @@ const disabledDate = (time: Date) => {
         encryptionFlag: 0,
         reCheckNum:0,
         state: 1,
+        factorFlag:0,
     }
   }
   

frontend/src/views/machine/device/index.vue

@@ -51,7 +51,10 @@ const proTable = ref<ProTableInstance>()
 const devicePopup = ref()
 // 定义包含和排除的单位
 
-const getTableList = (params: any) => {
+
+const boundPqDevList=ref<Device.ReqPqDevParams[]>([])//根据检测计划id查询出所有已绑定的设备 
+
+const getTableList = async (params: any) => {
   let newParams = JSON.parse(JSON.stringify(params))
   newParams.searchEndTime = endDate.value
   newParams.searchBeginTime = startDate.value

frontend/src/views/machine/errorSystem/components/errorSystemPopup.vue

@@ -4,14 +4,15 @@
             <el-tab-pane label="基础信息">
                 <div >
                     <el-form :model="formContent" ref='dialogFormRef' :rules='rules' label-width="auto" class="form-three">
-                        <el-form-item label="误差体系名称" prop="name" >
-                            <el-input v-model='formContent.name' placeholder="标准号+年份+设备等级"/>
+                        <el-form-item  label="标准号" prop="standardName" >
+                            <el-input  v-model='formContent.standardName'   placeholder="请填写标准号"/>
                         </el-form-item>
-                        <el-form-item  label="参照标准名称" prop="standardName" >
-                            <el-input  v-model='formContent.standardName'/>
-                        </el-form-item>
-                        <el-form-item label="发布时间" prop="standardTime" >
-                            <el-input v-model="formContent.standardTime" />
+                        <el-form-item label="标准推行年份" prop="standardTime" >
+                            <el-date-picker
+                                v-model="formContent.standardTime"
+                                type="year"
+                                placeholder="请选择标准推行年份"
+                                />
                         </el-form-item>
                         <el-form-item label="适用设备等级" prop="devLevel" >
                             <el-select v-model='formContent.devLevel' placeholder="请选择设备等级">
@@ -104,7 +105,7 @@
     const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
     name: [{ required: true, message: '误差体系名称必填！', trigger: 'blur' }],
     standardName: [{ required: true, message: '参照标准名称必填！', trigger: 'blur' }],
-    standardTime: [{ required: true, message: '标准推行时间必填！', trigger: 'blur' }],
+    standardTime: [{ required: true, message: '标准推行年份必选！', trigger: 'blur' }],
     devLevel:[{ required: true, message: '请选择一项设备等级', trigger: 'change' },],
     enable:[{ required: true, message: '请选择一项状态', trigger: 'change '},]
 });    
@@ -124,7 +125,7 @@
         try {      
             dialogFormRef.value?.validate(async (valid: boolean) => {
             if (valid) {
-             
+        
                 formContent.value.pqErrSysDtlsList = tableData.value
                 if (formContent.value.id) {
                     await updatePqErrSys(formContent.value);

frontend/src/views/machine/errorSystem/index.vue

@@ -52,11 +52,11 @@ const columns = ref<ColumnProps<ErrorSystem.ErrorSystemList>[]>([
   },
   {
     prop: 'standardName',
-    label: '参照标准名称',
+    label: '标准号',
   },
   {
     prop: 'standardTime',
-    label: '标准实施年份',
+    label: '标准推行年份',
     width: 200,
     search: { el: 'input' },
   },

frontend/src/views/machine/testSource/components/parameterPopup.vue

@@ -15,15 +15,15 @@
               :props="defaultProps"
           />
         </el-form-item>
-        <el-form-item label="源参数描述" :label-width="100" prop="sourceParamDesc">
-          <el-input v-model="formContent.sourceParamDesc" autocomplete="off"/>
+        <el-form-item label="源参数描述" :label-width="100" prop="desc">
+          <el-input v-model="formContent.desc" autocomplete="off"/>
         </el-form-item>
-        <el-form-item label="源参数类型" :label-width="100" prop="sourceParamType">
-          <el-input v-model="formContent.sourceParamType" autocomplete="off"/>
+        <el-form-item label="源参数类型" :label-width="100" prop="type">
+          <el-input v-model="formContent.type" autocomplete="off"/>
         </el-form-item>
         <el-form-item  label="源参数值" :label-width="100"
-                      prop="sourceParamValue">
-          <el-input v-model="formContent.sourceParamValue" autocomplete="off"/>
+                      prop="value">
+          <el-input v-model="formContent.value" autocomplete="off"/>
         </el-form-item>
         <el-form-item label="排序" :label-width="100">
           <el-input-number v-model="formContent.sort" :min='1' :max='999'/>
@@ -69,7 +69,7 @@ const displayPid = computed({
 // 树形节点配置
 const defaultProps = {
   children: 'children',
-  label: 'sourceParamDesc',
+  label: 'desc',
   value: 'id'
 };
 
@@ -82,9 +82,9 @@ function useMetaInfo() {
 
   const formContent = reactive<TestSource.ParameterType>({
     id: "",
-    sourceParamType: "",
-    sourceParamValue: "",
-    sourceParamDesc: "",
+    type: "",
+    value: "",
+    desc: "",
     sort: 100,
     pId: "0",
   })
@@ -93,8 +93,8 @@ function useMetaInfo() {
 }
 
 const rules: reactive<Record<string, Array<FormItemRule>>> = reactive({
-  sourceParamDesc: [{required: true, message: '源参数描述必填！', trigger: 'blur'}],
-  sourceParamType: [{required: true, message: '源参数类型必填！', trigger: 'blur'}],
+  desc: [{required: true, message: '源参数描述必填！', trigger: 'blur'}],
+  type: [{required: true, message: '源参数类型必填！', trigger: 'blur'}],
   sort: [{required: true, message: '排序必填！', trigger: 'blur'}]
 })
 
@@ -114,9 +114,9 @@ let dialogTitle = computed(() => {
 const resetFormContent = () => {
   Object.assign(formContent, {
     id: "",
-    sourceParamType: "",
-    sourceParamValue: "",
-    sourceParamDesc: "",
+    type: "",
+    value: "",
+    desc: "",
     sort: 100,
     pId: "0",
   })

frontend/src/views/machine/testSource/components/parameterTable.vue

@@ -123,17 +123,17 @@ const columns = reactive<ColumnProps<any>[]>([
   },
   {type: 'index', fixed: 'left', width: 70, label: '序号'},
   {
-    prop: 'sourceParamType',
+    prop: 'type',
     label: '参数类型',
     minWidth: 180,
   },
   {
-    prop: 'sourceParamDesc',
+    prop: 'desc',
     label: '参数描述',
     minWidth: 220,
   },
   {
-    prop: 'sourceParamValue',
+    prop: 'value',
     label: '值',
     minWidth: 150,
   },
@@ -193,7 +193,7 @@ const copyRow = (row) => {
 }
 
 const getParameter = (data: TestSource.ParameterType) => {
-  if (originalParameterArr.some(item => item.sourceParamType == data.sourceParamType)) {
+  if (originalParameterArr.some(item => item.type == data.type)) {
     ElMessage.error({message: '参数类型已存在！'})
     return;
   }