ADD:ICD添加检测是否两个开关字段

frontend/src/api/device/interface/icd.ts

@@ -24,6 +24,8 @@ export namespace ICD {
     createTime?: string| null; //创建时间
     updateBy?: string| null; //更新用户
     updateTime?: string| null; //更新时间
+    angle: number; // 是否支持电压相角、电流相角指标
+    usePhaseIndex: number; // 角型接线时是否使用相别的指标来进行检测
   }
 
   /**

frontend/src/views/machine/icd/components/icdPopup.vue

@@ -1,40 +1,62 @@
 <template>
     <!-- 基础信息弹出框 -->
-  <el-dialog :model-value="dialogVisible" :title="dialogTitle" v-bind="dialogSmall" @close="close" align-center>
+    <el-dialog :model-value="dialogVisible" :title="dialogTitle" v-bind="dialogSmall" @close="close" align-center>
-    <div>
+        <div>
-        <el-form :model="formContent"  ref='dialogFormRef' :rules='rules'>
+            <el-form :model="formContent" label-position="right" label-width="80" ref="dialogFormRef" :rules="rules">
-            <el-form-item label="名称" prop="name" >
+                <el-form-item label="名称" prop="name">
-                <el-input v-model='formContent.name' placeholder="请输入icd名称" maxlength="32" show-word-limit/>
+                    <el-input v-model="formContent.name" placeholder="请输入icd名称" maxlength="32" show-word-limit />
-            </el-form-item>
+                </el-form-item>
-            <el-form-item label="存储地址" prop="path" >
+                <el-form-item label="存储地址" prop="path">
-                <el-input v-model='formContent.path' placeholder="请输入icd存储地址" maxlength="32" show-word-limit/>
+                    <el-input
-            </el-form-item>
+                        v-model="formContent.path"
-      </el-form>
+                        placeholder="请输入icd存储地址"
-      </div>
+                        maxlength="32"
-    <template #footer>
+                        show-word-limit
-      <div class="dialog-footer">
+                    />
-        <el-button @click="close()">取消</el-button>
+                </el-form-item>
-        <el-button type="primary" @click="save()" >
+                <el-form-item label="是否支持电压相角、电流相角指标" prop="angle" label-width="auto">
-          保存
+                    <el-switch
-        </el-button>
+                        v-model="formContent.angle"
-      </div>
+                        :active-value="1"
-    </template>
+                        :inactive-value="0"
-  </el-dialog>
+                        inline-prompt
+                        active-text="是"
+                        inactive-text="否"
+                    />
+                </el-form-item>
+                <el-form-item label="角型接线时是否使用相别的指标来进行检测" prop="usePhaseIndex" label-width="auto">
+                    <el-switch
+                        v-model="formContent.usePhaseIndex"
+                        :active-value="1"
+                        :inactive-value="0"
+                        inline-prompt
+                        active-text="是"
+                        inactive-text="否"
+                    />
+                </el-form-item>
+            </el-form>
+        </div>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button @click="close()">取消</el-button>
+                <el-button type="primary" @click="save()">保存</el-button>
+            </div>
+        </template>
+    </el-dialog>
+</template>
 
-  </template>
+<script lang="ts" setup>
+import { ElMessage, type FormInstance, type FormItemRule } from 'element-plus'
+import { computed, ref, Ref } from 'vue'
+import { type ICD } from '@/api/device/interface/icd'
+import { dialogSmall } from '@/utils/elementBind'
+import { useDictStore } from '@/stores/modules/dict'
+import { addICD, updateICD } from '@/api/device/icd'
 
-  <script lang="ts" setup>
+const dictStore = useDictStore()
-  import{  ElMessage, type FormInstance,type FormItemRule } from 'element-plus'
+// 定义弹出组件元信息
-  import type { ProTableInstance } from '@/components/ProTable/interface'
+const dialogFormRef = ref()
-  import { ref,computed, Ref} from 'vue'
+function useMetaInfo() {
-  import { type ICD } from '@/api/device/interface/icd'
-  import {dialogSmall} from '@/utils/elementBind'
-  import { useDictStore } from '@/stores/modules/dict'
-  import {addICD,updateICD} from '@/api/device/icd'
-  const dictStore = useDictStore()
-  // 定义弹出组件元信息
-  const dialogFormRef = ref()
- function useMetaInfo() {
     const dialogVisible = ref(false)
     const titleType = ref('add')
     const formContent = ref<ICD.ResICD>({
@@ -42,12 +64,13 @@
         name: '',
         path: '',
         state: 1,
+        angle: 0,
+        usePhaseIndex: 0
     })
     return { dialogVisible, titleType, formContent }
-  }
+}
-  
-  const { dialogVisible, titleType, formContent } = useMetaInfo()
 
+const { dialogVisible, titleType, formContent } = useMetaInfo()
 
 // 清空formContent
 const resetFormContent = () => {
@@ -56,23 +79,22 @@ const resetFormContent = () => {
         name: '',
         path: '',
         state: 1,
+        angle: 0,
+        usePhaseIndex: 0
     }
-  }
+}
 
-  let dialogTitle = computed(() => {
+let dialogTitle = computed(() => {
     return titleType.value === 'add' ? '新增ICD' : '编辑ICD'
-  })
+})
 
-
+//定义规则
-
+const formRuleRef = ref<FormInstance>()
-  //定义规则
+//定义校验规则
-  const formRuleRef = ref<FormInstance>()
+const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
-  //定义校验规则
-  const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
     name: [{ required: true, message: 'icd名称必填！', trigger: 'blur' }],
-    path: [{ required: true, message: 'icd存储地址必填！', trigger: 'blur' }],
+    path: [{ required: true, message: 'icd存储地址必填！', trigger: 'blur' }]
-  })
+})
-
 
 // 关闭弹窗
 const close = () => {
@@ -81,47 +103,46 @@ const close = () => {
     resetFormContent()
     // 重置表单
     dialogFormRef.value?.resetFields()
-  }
+}
 
-  // 保存数据
+// 保存数据
-  const save = () => {
+const save = () => {
     try {
         dialogFormRef.value?.validate(async (valid: boolean) => {
-        if (valid) {
+            if (valid) {
-          if (formContent.value.id) {
+                if (formContent.value.id) {
-              await updateICD(formContent.value);
+                    await updateICD(formContent.value)
-            } else {
+                } else {
-               await addICD(formContent.value);
+                    await addICD(formContent.value)
-          }
+                }
-          ElMessage.success({ message: `${dialogTitle.value}成功！` })
+                ElMessage.success({ message: `${dialogTitle.value}成功！` })
-          close()
+                close()
-          // 刷新表格
+                // 刷新表格
-          await props.refreshTable!()
+                await props.refreshTable!()
-        }
+            }
-      })
+        })
     } catch (err) {
-      //error('验证过程中出现错误', err)
+        //error('验证过程中出现错误', err)
     }
-  }
+}
 
-  // 打开弹窗，可能是新增，也可能是编辑
+// 打开弹窗，可能是新增，也可能是编辑
-  const open = async (sign: string, data: ICD.ResICD) => {
+const open = async (sign: string, data: ICD.ResICD) => {
     // 重置表单
     dialogFormRef.value?.resetFields()
     titleType.value = sign
     dialogVisible.value = true
 
     if (data.id) {
-      formContent.value = { ...data }
+        formContent.value = { ...data }
     } else {
-      resetFormContent()
+        resetFormContent()
     }
-  }
+}
 
-  // 对外映射
+// 对外映射
-  defineExpose({ open })
+defineExpose({ open })
-  const props = defineProps<{
+const props = defineProps<{
-    refreshTable: (() => Promise<void>) | undefined;
+    refreshTable: (() => Promise<void>) | undefined
-  }>()
+}>()
-  
+</script>
-  </script>