diff --git a/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue b/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue
index cfa626d..2879d52 100644
--- a/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue
+++ b/src/views/Gw/powerFrequancyTesting/PowerFrequancyTestingForm.vue
@@ -1,69 +1,71 @@
 <template>
-    <div class="xyp-power-frequancy-testing-form" v-if="refShow">
-        <vxe-form title-colon ref="refFormA" title-align="right" title-width="220" :data="formDataA" :rules="formRulesA"
-            @submit="fnSubmitA" @reset="fnResetA" custom-layout title-overflow="title">
-            <vxe-modal v-model="refShow" width="1300" height="770" show-zoom show-footer>
-                <template #title>
-                    <span style="color:#ffffff">{{ modalTitle }}</span>
-                </template>
-
-                <template #default>
-                    <a-card title="基本数据" :bordered="false" style="margin: 10px">
-                        <vxe-form-item title="采集规范版本号" field="StandardVersion" span="12">
+    <vxe-modal class-name="csty-power-frequancy-testing-form" v-model="refShow" width="1200" height="770" show-zoom
+        show-footer :mask-closable=true>
+        <template #title>
+            <span style="color:#ffffff">{{ modalTitle }}</span>
+        </template>
+        <template #default>
+            <a-card :bordered="false">
+                <vxe-form title-colon ref="refFormA" title-align="right" title-width="220" :data="formDataA"
+                    :rules="formRulesA">
+                    <vxe-form-gather span="24">
+                        <vxe-form-item span="24">
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.StandardVersion }}</div>
+                                <div
+                                    style="font-size: larger;border-bottom: solid 1px #606266;padding: 0px 0px 5px 0px;">
+                                    基本数据
+                                </div>
                             </template>
                         </vxe-form-item>
+                    </vxe-form-gather>
+                    <vxe-form-gather span="24">
+                        <!-- <vxe-form-item title="采集规范版本号" field="StandardVersion" span="12">
+                            <template #default="params">
+                                <spsn>{{ params.data.StandardVersion }}</spsn>
+                            </template>
+                        </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
-
                             <template #default="params">
                                 <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
                                     @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item>
-                        <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
-
+                        <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.SupplierCode }}</div>
+                                <spsn>{{ params.data.SupplierCode }}</spsn>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="规格型号编码" field="ModelCode" span="12">
-
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.ModelCode }}</div>
+                                <spsn>{{ params.data.ModelCode }}</spsn>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="物资种类编码" field="CategoryType" span="12">
-
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.CategoryType }}</div>
+                                <spsn>{{ params.data.CategoryType }}</spsn>
                             </template>
-                        </vxe-form-item>
+                        </vxe-form-item> -->
                         <vxe-form-item title="生产设备唯一识别号" field="EquipmentUniqueCode" span="12">
-
                             <template #default="params">
                                 <vxe-input v-model="params.data.EquipmentUniqueCode" placeholder="请输入生产设备唯一识别号"
                                     clearable @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="厂区编号" field="FactoryCode" span="12">
-
                             <template #default="params">
                                 <vxe-input v-model="params.data.FactoryCode" placeholder="请输入厂区编号" clearable
                                     @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="供应商产品编号" field="SupplierSupportId" span="12">
-
                             <template #default="params">
                                 <vxe-input v-model="params.data.SupplierSupportId" placeholder="请输入供应商产品编号" clearable
                                     @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item>
-                        <vxe-form-item title="工序" field="PdCode" span="12">
-
+                        <!-- <vxe-form-item title="工序" field="PdCode" span="12">
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.PdCode }}</div>
+                                <spsn>{{ params.data.PdCode }}</spsn>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="感知过程" field="ProcessType" span="12">
@@ -76,33 +78,28 @@
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="采集时间" field="CheckTime" span="12">
-
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.CheckTime }}</div>
+                                <spsn>{{ params.data.CheckTime }}</spsn>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="入数采中心时间" field="PutCenterTime" span="12">
-
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.PutCenterTime }}</div>
+                                <spsn>{{ params.data.PutCenterTime }}</spsn>
                             </template>
-                        </vxe-form-item>
+                        </vxe-form-item> -->
                         <vxe-form-item title="试验开始时间" field="StartTime" span="12">
-
                             <template #default="params">
                                 <vxe-input v-model="params.data.StartTime" type="datetime" placeholder="请输入试验开始时间"
-                                    clearable @change="fnChangeA(params)" style="width: 196px;"></vxe-input>
+                                    clearable @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="试验结束时间" field="StopTime" span="12">
-
                             <template #default="params">
                                 <vxe-input v-model="params.data.StopTime" type="datetime" placeholder="请输入试验结束时间"
-                                    clearable @change="fnChangeA(params)" style="width: 196px;"></vxe-input>
+                                    clearable @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="试验结果" field="InspectionResults" span="12">
-
                             <template #default="params">
                                 <vxe-select v-model="params.data.InspectionResults" clearable>
                                     <vxe-option :key="1" :value="1" :label="`通过`"></vxe-option>
@@ -110,35 +107,40 @@
                                 </vxe-select>
                             </template>
                         </vxe-form-item>
-                        <vxe-form-item title="ecode码" field="Ecode" span="12">
-
+                        <!-- <vxe-form-item title="ecode码" field="Ecode" span="12">
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.Ecode }}</div>
+                                <spsn>{{ params.data.Ecode }}</spsn>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="国网实物Id" field="SgEntityId" span="12">
-
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.SgEntityId }}</div>
+                                <spsn>{{ params.data.SgEntityId }}</spsn>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="数据唯一标识" field="DataUniqueIdentifier" span="12">
-
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.DataUniqueIdentifier }}</div>
+                                <spsn>{{ params.data.DataUniqueIdentifier }}</spsn>
+                            </template>
+                        </vxe-form-item> -->
+                    </vxe-form-gather>
+                    <vxe-form-gather span="24">
+                        <vxe-form-item span="24">
+                            <template #default="params">
+                                <div
+                                    style="font-size: larger;border-bottom: solid 1px #606266;padding: 0px 0px 5px 0px;">
+                                    采集数据
+                                </div>
                             </template>
                         </vxe-form-item>
-                    </a-card>
-                    <a-card title="采集数据" :bordered="false" style="margin: 10px">
+                    </vxe-form-gather>
+                    <vxe-form-gather span="24">
                         <vxe-form-item title="极对地之间耐受电压(V)" field="WithstandVoltage1" span="12">
-
                             <template #default="params">
                                 <vxe-input v-model="params.data.WithstandVoltage1" placeholder="" clearable
                                     @change="fnChangeA(params)" disabled></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="极对地耐压持续时间(s)" field="PressureTime1" span="10">
-
                             <template #default="params">
                                 <vxe-input v-model="params.data.PressureTime1" placeholder="" clearable
                                     @change="fnChangeA(params)" disabled></vxe-input>
@@ -148,14 +150,12 @@
                             <vxe-button status="primary" content="检测" @click="fnTestVoltage(1)"></vxe-button>
                         </vxe-form-item>
                         <vxe-form-item title="极对极之间耐受电压(V)" field="WithstandVoltage2" span="12">
-
                             <template #default="params">
                                 <vxe-input v-model="params.data.WithstandVoltage2" placeholder="" clearable
                                     @change="fnChangeA(params)" disabled></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="极对极耐压持续时间(s)" field="PressureTime2" span="10">
-
                             <template #default="params">
                                 <vxe-input v-model="params.data.PressureTime2" placeholder="" clearable
                                     @change="fnChangeA(params)" disabled></vxe-input>
@@ -165,14 +165,12 @@
                             <vxe-button status="primary" content="检测" @click="fnTestVoltage(2)"></vxe-button>
                         </vxe-form-item>
                         <vxe-form-item title="极与辅助回路之间耐受电压(V)" field="WithstandVoltage3" span="12">
-
                             <template #default="params">
                                 <vxe-input v-model="params.data.WithstandVoltage3" placeholder="" clearable
                                     @change="fnChangeA(params)" disabled></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="极与辅助回路耐压持续时间(s)" field="PressureTime3" span="10">
-
                             <template #default="params">
                                 <vxe-input v-model="params.data.PressureTime3" placeholder="" clearable
                                     @change="fnChangeA(params)" disabled></vxe-input>
@@ -182,14 +180,12 @@
                             <vxe-button status="primary" content="检测" @click="fnTestVoltage(3)"></vxe-button>
                         </vxe-form-item>
                         <vxe-form-item title="手柄与地之间耐受电压(V)" field="WithstandVoltage4" span="12">
-
                             <template #default="params">
                                 <vxe-input v-model="params.data.WithstandVoltage4" placeholder="" clearable
                                     @change="fnChangeA(params)" disabled></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="手柄与地耐压持续时间(s)" field="PressureTime4" span="10">
-
                             <template #default="params">
                                 <vxe-input v-model="params.data.PressureTime4" placeholder="" clearable
                                     @change="fnChangeA(params)" disabled></vxe-input>
@@ -198,16 +194,16 @@
                         <vxe-form-item span="2">
                             <vxe-button status="primary" content="检测" @click="fnTestVoltage(4)"></vxe-button>
                         </vxe-form-item>
-                    </a-card>
-                </template>
+                    </vxe-form-gather>
+                </vxe-form>
+            </a-card>
+        </template>
 
-                <template #footer>
-                    <vxe-button type="submit" status="primary" content="提交"></vxe-button>
-                    <vxe-button type="reset" content="重置"></vxe-button>
-                </template>
-            </vxe-modal>
-        </vxe-form>
-    </div>
+        <template #footer>
+            <vxe-button type="submit" status="primary" content="保存" @click="fnSubmitA"></vxe-button>
+            <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
+        </template>
+    </vxe-modal>
 </template>
 
 <script lang="ts" setup name="PowerFrequancyTestingForm">
@@ -218,52 +214,53 @@ import { map as _map } from 'lodash'
 import * as PowerFrequancyTestingApi from '@/api/gw/powerFrequancyTesting'
 import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
-
+// 字典
 const dictStore = useDictStore()
 const { dictPdCode, dictProcessType } = storeToRefs(dictStore)
 // 定义事件[success]
 const emit = defineEmits(['success'])
 // 是否显示
 const refShow = ref(false)
-// 表单
-const refFormA = ref()
-// 表单类型[add - 新增|update - 修改|del - 删除]
-const formTypeA: any = ref('')
 // 弹窗标题
 const modalTitle = ref('未知表单')
-// 表单数据
-const formDataA: any = ref(
-    {
-        "ID": 0,
-        "StandardVersion": 1,
-        "SupplierWorkNo": "",
-        "SupplierCode": "1000032215",
-        "ModelCode": "dtb00003",
-        "CategoryType": "90003",
-        "EquipmentUniqueCode": '',
-        "FactoryCode": '',
-        "SupplierSupportId": '',
-        "PdCode": "GX000092",
-        "ProcessType": 3,
-        "CheckTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "PutCenterTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "StartTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "StopTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "InspectionResults": undefined,
-        "Ecode": "NotImp",
-        "SgEntityId": "NotImp",
-        "DataUniqueIdentifier": "NotImp",
-        "WithstandVoltage1": undefined,
-        "PressureTime1": undefined,
-        "WithstandVoltage2": undefined,
-        "PressureTime2": undefined,
-        "WithstandVoltage3": undefined,
-        "PressureTime3": undefined,
-        "WithstandVoltage4": undefined,
-        "PressureTime4": undefined,
-        "Sended": 0
-    })
-// 表单规则
+// 表单类型[add - 新增|update - 修改|del - 删除]
+const formType: any = ref('')
+// 表单
+const refFormA = ref()
+// 表单A - 初始数据
+const formDataAInit: any = {
+    ID: 0,
+    StandardVersion: 1,
+    SupplierWorkNo: "",
+    SupplierCode: "1000032215",
+    ModelCode: "dtb00003",
+    CategoryType: "90003",
+    EquipmentUniqueCode: '',
+    FactoryCode: '',
+    SupplierSupportId: '',
+    PdCode: "GX000092",
+    ProcessType: 3,
+    CheckTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+    PutCenterTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+    StartTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+    StopTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+    InspectionResults: undefined,
+    Ecode: "NotImp",
+    SgEntityId: "NotImp",
+    DataUniqueIdentifier: "NotImp",
+    WithstandVoltage1: undefined,
+    PressureTime1: undefined,
+    WithstandVoltage2: undefined,
+    PressureTime2: undefined,
+    WithstandVoltage3: undefined,
+    PressureTime3: undefined,
+    WithstandVoltage4: undefined,
+    PressureTime4: undefined,
+    Sended: 0
+}
+// 表单A - 数据
+const formDataA: any = ref(formDataAInit)
+// 表单A - 规则
 const formRulesA: any = ref({
     SupplierWorkNo: [
         { required: true, message: '请输入供应商工单编号' }
@@ -310,15 +307,14 @@ onMounted(() => {
 })
 // 打开弹窗
 const open = async (type: string, row?: any) => {
-    formTypeA.value = type
+    formType.value = type
+    await fnResetA()
     switch (type) {
         case 'add':
-            await fnResetA()
             modalTitle.value = '新增工频耐受试验'
             refShow.value = true
             break;
         case 'edit':
-            await fnResetA()
             modalTitle.value = '编辑工频耐受试验'
             refShow.value = true
             const paramsA = {
@@ -333,7 +329,6 @@ const open = async (type: string, row?: any) => {
             formDataA.value = rowInfoA.Data
             break;
         case 'copy':
-            await fnResetA()
             modalTitle.value = '复制工频耐受试验'
             refShow.value = true
             const paramsB = {
@@ -347,6 +342,8 @@ const open = async (type: string, row?: any) => {
             rowInfoB.Data.ID = 0
             rowInfoB.Data.CheckTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
             rowInfoB.Data.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+            rowInfoB.Data.StartTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+            rowInfoB.Data.StopTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
             rowInfoB.Data.Sended = 0
             formDataA.value = rowInfoB.Data
             break;
@@ -417,77 +414,50 @@ const fnDeleteA = async (row: any) => {
 }
 // 提交
 const fnSubmitA = async () => {
-    switch (formTypeA.value) {
-        case 'add':
-            formDataA.value.CheckTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
-            formDataA.value.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
-            const paramsA = {
-                data: formDataA.value
+    await refFormA.value.validate().then(async (res: any) => {
+        if (!res) {
+            switch (formType.value) {
+                case 'add':
+                    const paramsA = {
+                        data: formDataA.value
+                    }
+                    await PowerFrequancyTestingApi.savePowerFrequancyTesting(paramsA)
+                    VXETable.modal.message({ content: '新增成功', status: 'success' })
+                    break;
+                case 'edit':
+                    let setVal: any = _map(formDataA.value, (o1, k1) => {
+                        return { field: k1, value: o1 }
+                    })
+                    const paramsB = {
+                        filter: {
+                            field: 'ID',
+                            value: formDataA.value.ID
+                        },
+                        set: setVal
+                    }
+                    await PowerFrequancyTestingApi.editPowerFrequancyTesting(paramsB)
+                    VXETable.modal.message({ content: '编辑成功', status: 'success' })
+                    break;
+                case 'copy':
+                    const paramsC = {
+                        data: formDataA.value
+                    }
+                    await PowerFrequancyTestingApi.savePowerFrequancyTesting(paramsC)
+                    VXETable.modal.message({ content: '复制成功', status: 'success' })
+                    break;
             }
-            await PowerFrequancyTestingApi.savePowerFrequancyTesting(paramsA)
-            VXETable.modal.message({ content: '新增成功', status: 'success' })
-            break;
-        case 'edit':
-            formDataA.value.CheckTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
-            formDataA.value.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
-            let setVal: any = _map(formDataA.value, (o1, k1) => {
-                return { field: k1, value: o1 }
-            })
-            const paramsB = {
-                filter: {
-                    field: 'ID',
-                    value: formDataA.value.ID
-                },
-                set: setVal
-            }
-            await PowerFrequancyTestingApi.editPowerFrequancyTesting(paramsB)
-            VXETable.modal.message({ content: '编辑成功', status: 'success' })
-            break;
-        case 'copy':
-            formDataA.value.CheckTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
-            formDataA.value.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
-            const paramsC = {
-                data: formDataA.value
-            }
-            await PowerFrequancyTestingApi.savePowerFrequancyTesting(paramsC)
-            VXETable.modal.message({ content: '复制成功', status: 'success' })
-            break;
-    }
-    refShow.value = false
-    emit('success')
+            refShow.value = false
+            emit('success')
+        }
+    })
 }
 // 重置
 const fnResetA = () => {
-    formDataA.value = {
-        "ID": 0,
-        "StandardVersion": 1,
-        "SupplierWorkNo": "",
-        "SupplierCode": "1000032215",
-        "ModelCode": "dtb00003",
-        "CategoryType": "90003",
-        "EquipmentUniqueCode": '',
-        "FactoryCode": '',
-        "SupplierSupportId": '',
-        "PdCode": "GX000092",
-        "ProcessType": 3,
-        "CheckTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "PutCenterTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "StartTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "StopTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "InspectionResults": undefined,
-        "Ecode": "NotImp",
-        "SgEntityId": "NotImp",
-        "DataUniqueIdentifier": "NotImp",
-        "WithstandVoltage1": undefined,
-        "PressureTime1": undefined,
-        "WithstandVoltage2": undefined,
-        "PressureTime2": undefined,
-        "WithstandVoltage3": undefined,
-        "PressureTime3": undefined,
-        "WithstandVoltage4": undefined,
-        "PressureTime4": undefined,
-        "Sended": 0
-    }
+    formDataA.value = formDataAInit
+}
+// 关闭窗体
+const fnEventCancel = () => {
+    refShow.value = false
 }
 </script>
 
diff --git a/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue b/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue
index 7bf5710..673472c 100644
--- a/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue
+++ b/src/views/Gw/protectionCircuit/ProtectionCircuitForm.vue
@@ -1,39 +1,50 @@
 <template>
-    <div class="xyp-protection-circuit-form" v-if="refShow">
-        <vxe-form title-colon ref="refFormA" title-align="right" title-width="220" :data="formDataA" :rules="formRulesA"
-            @submit="fnSubmitA" @reset="fnResetA" custom-layout title-overflow="title">
-            <vxe-modal v-model="refShow" width="1300" height="770" show-zoom show-footer>
-                <template #title>
-                    <span style="color:#ffffff">{{ modalTitle }}</span>
-                </template>
-                <template #default>
-                    <a-card title="基本数据" :bordered="false" style="margin: 10px">
-                        <vxe-form-item title="采集规范版本号" field="StandardVersion" span="12">
+    <vxe-modal class-name="csty-protection-circuit-form" v-model="refShow" width="1200" height="770" show-zoom
+        show-footer :mask-closable=true>
+        <template #title>
+            <span style="color:#ffffff">{{ modalTitle }}</span>
+        </template>
+        <template #default>
+            <a-card :bordered="false">
+                <vxe-form title-colon ref="refFormA" title-align="right" title-width="220" :data="formDataA"
+                    :rules="formRulesA">
+                    <vxe-form-gather span="24">
+                        <vxe-form-item span="24">
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.StandardVersion }}</div>
+                                <div
+                                    style="font-size: larger;border-bottom: solid 1px #606266;padding: 0px 0px 5px 0px;">
+                                    基本数据
+                                </div>
                             </template>
                         </vxe-form-item>
+                    </vxe-form-gather>
+                    <vxe-form-gather span="24">
+                        <!-- <vxe-form-item title="采集规范版本号" field="StandardVersion" span="12">
+                            <template #default="params">
+                                <spsn>{{ params.data.StandardVersion }}</spsn>
+                            </template>
+                        </vxe-form-item> -->
                         <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
                                     @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item>
-                        <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
+                        <!-- <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.SupplierCode }}</div>
+                                <spsn>{{ params.data.SupplierCode }}</spsn>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="规格型号编码" field="ModelCode" span="12">
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.ModelCode }}</div>
+                                <spsn>{{ params.data.ModelCode }}</spsn>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="物资种类编码" field="CategoryType" span="12">
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.CategoryType }}</div>
+                                <spsn>{{ params.data.CategoryType }}</spsn>
                             </template>
-                        </vxe-form-item>
+                        </vxe-form-item> -->
                         <vxe-form-item title="生产设备唯一识别号" field="EquipmentUniqueCode" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.EquipmentUniqueCode" placeholder="请输入生产设备唯一识别号"
@@ -52,9 +63,9 @@
                                     @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item>
-                        <vxe-form-item title="工序" field="PdCode" span="12">
+                        <!-- <vxe-form-item title="工序" field="PdCode" span="12">
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.PdCode }}</div>
+                                <spsn>{{ params.data.PdCode }}</spsn>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="感知过程" field="ProcessType" span="12">
@@ -68,24 +79,24 @@
                         </vxe-form-item>
                         <vxe-form-item title="采集时间" field="CheckTime" span="12">
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.CheckTime }}</div>
+                                <spsn>{{ params.data.CheckTime }}</spsn>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="入数采中心时间" field="PutCenterTime" span="12">
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.PutCenterTime }}</div>
+                                <spsn>{{ params.data.PutCenterTime }}</spsn>
                             </template>
-                        </vxe-form-item>
+                        </vxe-form-item> -->
                         <vxe-form-item title="试验开始时间" field="StartTime" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.StartTime" type="datetime" placeholder="请输入试验开始时间"
-                                    clearable @change="fnChangeA(params)" style="width: 196px;"></vxe-input>
+                                    clearable @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="试验结束时间" field="StopTime" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.StopTime" type="datetime" placeholder="请输入试验结束时间"
-                                    clearable @change="fnChangeA(params)" style="width: 196px;"></vxe-input>
+                                    clearable @change="fnChangeA(params)"></vxe-input>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="试验结果" field="InspectionResults" span="12">
@@ -96,23 +107,33 @@
                                 </vxe-select>
                             </template>
                         </vxe-form-item>
-                        <vxe-form-item title="ecode码" field="Ecode" span="12">
+                        <!-- <vxe-form-item title="ecode码" field="Ecode" span="12">
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.Ecode }}</div>
+                                <spsn>{{ params.data.Ecode }}</spsn>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="国网实物Id" field="SgEntityId" span="12">
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.SgEntityId }}</div>
+                                <spsn>{{ params.data.SgEntityId }}</spsn>
                             </template>
                         </vxe-form-item>
                         <vxe-form-item title="数据唯一标识" field="DataUniqueIdentifier" span="12">
                             <template #default="params">
-                                <div style="width: 196px;">{{ params.data.DataUniqueIdentifier }}</div>
+                                <spsn>{{ params.data.DataUniqueIdentifier }}</spsn>
+                            </template>
+                        </vxe-form-item> -->
+                    </vxe-form-gather>
+                    <vxe-form-gather span="24">
+                        <vxe-form-item span="24">
+                            <template #default="params">
+                                <div
+                                    style="font-size: larger;border-bottom: solid 1px #606266;padding: 0px 0px 5px 0px;">
+                                    采集数据
+                                </div>
                             </template>
                         </vxe-form-item>
-                    </a-card>
-                    <a-card title="采集数据" :bordered="false" style="margin: 10px">
+                    </vxe-form-gather>
+                    <vxe-form-gather span="24">
                         <vxe-form-item title="测量电流(A)" field="MeasureCurrent" span="12">
                             <template #default="params">
                                 <vxe-input v-model="params.data.MeasureCurrent" placeholder="请输入测量电流" clearable
@@ -128,15 +149,138 @@
                         <vxe-form-item span="2">
                             <vxe-button status="primary" content="检测" @click="fnCurrentResistance()"></vxe-button>
                         </vxe-form-item>
-                    </a-card>
-                </template>
-                <template #footer>
-                    <vxe-button type="submit" status="primary" content="提交"></vxe-button>
-                    <vxe-button type="reset" content="重置"></vxe-button>
-                </template>
-            </vxe-modal>
-        </vxe-form>
-    </div>
+                    </vxe-form-gather>
+                </vxe-form>
+            </a-card>
+            <!-- <a-card title="基本数据" :bordered="false" style="margin: 10px">
+                <vxe-form-item title="采集规范版本号" field="StandardVersion" span="12">
+                    <template #default="params">
+                        <div style="width: 196px;">{{ params.data.StandardVersion }}</div>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="供应商工单编号" field="SupplierWorkNo" span="12">
+                    <template #default="params">
+                        <vxe-input v-model="params.data.SupplierWorkNo" placeholder="请输入供应商工单编号" clearable
+                            @change="fnChangeA(params)"></vxe-input>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="国网侧供应商编码" field="SupplierCode" span="12">
+                    <template #default="params">
+                        <div style="width: 196px;">{{ params.data.SupplierCode }}</div>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="规格型号编码" field="ModelCode" span="12">
+                    <template #default="params">
+                        <div style="width: 196px;">{{ params.data.ModelCode }}</div>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="物资种类编码" field="CategoryType" span="12">
+                    <template #default="params">
+                        <div style="width: 196px;">{{ params.data.CategoryType }}</div>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="生产设备唯一识别号" field="EquipmentUniqueCode" span="12">
+                    <template #default="params">
+                        <vxe-input v-model="params.data.EquipmentUniqueCode" placeholder="请输入生产设备唯一识别号" clearable
+                            @change="fnChangeA(params)"></vxe-input>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="厂区编号" field="FactoryCode" span="12">
+                    <template #default="params">
+                        <vxe-input v-model="params.data.FactoryCode" placeholder="请输入厂区编号" clearable
+                            @change="fnChangeA(params)"></vxe-input>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="供应商产品编号" field="SupplierSupportId" span="12">
+                    <template #default="params">
+                        <vxe-input v-model="params.data.SupplierSupportId" placeholder="请输入供应商产品编号" clearable
+                            @change="fnChangeA(params)"></vxe-input>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="工序" field="PdCode" span="12">
+                    <template #default="params">
+                        <div style="width: 196px;">{{ params.data.PdCode }}</div>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="感知过程" field="ProcessType" span="12">
+                    <template #default="params">
+                        <vxe-select v-model="params.data.ProcessType" clearable filterable :disabled="true">
+                            <template v-for="(item) in dictProcessType">
+                                <vxe-option :value="item.key" :label="item.val"></vxe-option>
+                            </template>
+                        </vxe-select>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="采集时间" field="CheckTime" span="12">
+                    <template #default="params">
+                        <div style="width: 196px;">{{ params.data.CheckTime }}</div>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="入数采中心时间" field="PutCenterTime" span="12">
+                    <template #default="params">
+                        <div style="width: 196px;">{{ params.data.PutCenterTime }}</div>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="试验开始时间" field="StartTime" span="12">
+                    <template #default="params">
+                        <vxe-input v-model="params.data.StartTime" type="datetime" placeholder="请输入试验开始时间" clearable
+                            @change="fnChangeA(params)" style="width: 196px;"></vxe-input>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="试验结束时间" field="StopTime" span="12">
+                    <template #default="params">
+                        <vxe-input v-model="params.data.StopTime" type="datetime" placeholder="请输入试验结束时间" clearable
+                            @change="fnChangeA(params)" style="width: 196px;"></vxe-input>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="试验结果" field="InspectionResults" span="12">
+                    <template #default="params">
+                        <vxe-select v-model="params.data.InspectionResults" clearable>
+                            <vxe-option :key="1" :value="1" :label="`通过`"></vxe-option>
+                            <vxe-option :key="0" :value="0" :label="`未通过`"></vxe-option>
+                        </vxe-select>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="ecode码" field="Ecode" span="12">
+                    <template #default="params">
+                        <div style="width: 196px;">{{ params.data.Ecode }}</div>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="国网实物Id" field="SgEntityId" span="12">
+                    <template #default="params">
+                        <div style="width: 196px;">{{ params.data.SgEntityId }}</div>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="数据唯一标识" field="DataUniqueIdentifier" span="12">
+                    <template #default="params">
+                        <div style="width: 196px;">{{ params.data.DataUniqueIdentifier }}</div>
+                    </template>
+                </vxe-form-item>
+            </a-card>
+            <a-card title="采集数据" :bordered="false" style="margin: 10px">
+                <vxe-form-item title="测量电流(A)" field="MeasureCurrent" span="12">
+                    <template #default="params">
+                        <vxe-input v-model="params.data.MeasureCurrent" placeholder="请输入测量电流" clearable
+                            @change="fnChangeA(params)"></vxe-input>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item title="测量电阻值(mΩ)" field="MeasureResistance" span="10">
+                    <template #default="params">
+                        <vxe-input v-model="params.data.MeasureResistance" placeholder="请输入测量电阻值" clearable
+                            @change="fnChangeA(params)"></vxe-input>
+                    </template>
+                </vxe-form-item>
+                <vxe-form-item span="2">
+                    <vxe-button status="primary" content="检测" @click="fnCurrentResistance()"></vxe-button>
+                </vxe-form-item>
+            </a-card> -->
+        </template>
+        <template #footer>
+            <vxe-button type="submit" status="primary" content="保存" @click="fnSubmitA"></vxe-button>
+            <vxe-button type="reset" content="取消" @click="fnEventCancel"></vxe-button>
+        </template>
+    </vxe-modal>
+
 </template>
 
 <script lang="ts" setup name="ProtectionCircuitForm">
@@ -147,46 +291,47 @@ import { map as _map } from 'lodash'
 import * as ProtectionCircuitApi from '@/api/gw/protectionCircuit'
 import { useDictStore } from '@/stores/dict'
 import { storeToRefs } from 'pinia'
-
+// 字典
 const dictStore = useDictStore()
 const { dictPdCode, dictProcessType } = storeToRefs(dictStore)
 // 定义事件[success]
 const emit = defineEmits(['success'])
 // 是否显示
 const refShow = ref(false)
-// 表单
-const refFormA = ref()
-// 表单类型[add - 新增|update - 修改|del - 删除]
-const formTypeA: any = ref('')
 // 弹窗标题
 const modalTitle = ref('未知表单')
-// 表单数据
-const formDataA: any = ref(
-    {
-        "ID": 0,
-        "StandardVersion": 1,
-        "SupplierWorkNo": "",
-        "SupplierCode": "1000032215",
-        "ModelCode": "dtb00003",
-        "CategoryType": "90003",
-        "EquipmentUniqueCode": '',
-        "FactoryCode": '',
-        "SupplierSupportId": '',
-        "PdCode": "GX000087",
-        "ProcessType": 3,
-        "CheckTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "PutCenterTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "StartTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "StopTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "InspectionResults": undefined,
-        "Ecode": "NotImp",
-        "SgEntityId": "NotImp",
-        "DataUniqueIdentifier": "NotImp",
-        "MeasureCurrent": undefined,
-        "MeasureResistance": undefined,
-        "Sended": 0
-    })
-// 表单规则
+// 表单类型[add - 新增|update - 修改|del - 删除]
+const formType: any = ref('')
+// 表单
+const refFormA = ref()
+// 表单A - 初始数据
+const formDataAInit: any = {
+    ID: 0,
+    StandardVersion: 1,
+    SupplierWorkNo: "",
+    SupplierCode: "1000032215",
+    ModelCode: "dtb00003",
+    CategoryType: "90003",
+    EquipmentUniqueCode: '',
+    FactoryCode: '',
+    SupplierSupportId: '',
+    PdCode: "GX000087",
+    ProcessType: 3,
+    CheckTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+    PutCenterTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+    StartTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+    StopTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+    InspectionResults: undefined,
+    Ecode: "NotImp",
+    SgEntityId: "NotImp",
+    DataUniqueIdentifier: "NotImp",
+    MeasureCurrent: undefined,
+    MeasureResistance: undefined,
+    Sended: 0
+}
+// 表单A - 数据
+const formDataA: any = ref(formDataAInit)
+// 表单A - 规则
 const formRulesA: any = ref({
     SupplierWorkNo: [
         { required: true, message: '请输入供应商工单编号' }
@@ -215,15 +360,14 @@ onMounted(() => {
 })
 // 打开弹窗
 const open = async (type: string, row?: any) => {
-    formTypeA.value = type
+    formType.value = type
+    await fnResetA()
     switch (type) {
         case 'add':
-            await fnResetA()
             modalTitle.value = '新增保护措施和保护电路连续性验证'
             refShow.value = true
             break;
         case 'edit':
-            await fnResetA()
             modalTitle.value = '编辑保护措施和保护电路连续性验证'
             refShow.value = true
             const paramsA = {
@@ -238,7 +382,6 @@ const open = async (type: string, row?: any) => {
             formDataA.value = rowInfoA.Data
             break;
         case 'copy':
-            await fnResetA()
             modalTitle.value = '复制保护措施和保护电路连续性验证'
             refShow.value = true
             const paramsB = {
@@ -252,6 +395,8 @@ const open = async (type: string, row?: any) => {
             rowInfoB.Data.ID = 0
             rowInfoB.Data.CheckTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
             rowInfoB.Data.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+            rowInfoB.Data.StartTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+            rowInfoB.Data.StopTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
             rowInfoB.Data.Sended = 0
             formDataA.value = rowInfoB.Data
             break;
@@ -306,71 +451,56 @@ const fnDeleteA = async (row: any) => {
 }
 // 提交
 const fnSubmitA = async () => {
-    switch (formTypeA.value) {
-        case 'add':
-            formDataA.value.CheckTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
-            formDataA.value.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
-            const paramsA = {
-                data: formDataA.value
-            }
-            await ProtectionCircuitApi.saveProtectionCircuit(paramsA)
-            VXETable.modal.message({ content: '新增成功', status: 'success' })
-            break;
-        case 'edit':
-            formDataA.value.CheckTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
-            formDataA.value.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
-            let setVal: any = _map(formDataA.value, (o1, k1) => {
-                return { field: k1, value: o1 }
-            })
-            const paramsB = {
-                filter: {
-                    field: 'ID',
-                    value: formDataA.value.ID
-                },
-                set: setVal
-            }
-            await ProtectionCircuitApi.editProtectionCircuit(paramsB)
-            VXETable.modal.message({ content: '编辑成功', status: 'success' })
-            break;
-        case 'copy':
-            formDataA.value.CheckTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
-            formDataA.value.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
-            const paramsC = {
-                data: formDataA.value
+    await refFormA.value.validate().then(async (res: any) => {
+        if (!res) {
+            switch (formType.value) {
+                case 'add':
+                    formDataA.value.CheckTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+                    formDataA.value.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+                    const paramsA = {
+                        data: formDataA.value
+                    }
+                    await ProtectionCircuitApi.saveProtectionCircuit(paramsA)
+                    VXETable.modal.message({ content: '新增成功', status: 'success' })
+                    break;
+                case 'edit':
+                    formDataA.value.CheckTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+                    formDataA.value.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+                    let setVal: any = _map(formDataA.value, (o1, k1) => {
+                        return { field: k1, value: o1 }
+                    })
+                    const paramsB = {
+                        filter: {
+                            field: 'ID',
+                            value: formDataA.value.ID
+                        },
+                        set: setVal
+                    }
+                    await ProtectionCircuitApi.editProtectionCircuit(paramsB)
+                    VXETable.modal.message({ content: '编辑成功', status: 'success' })
+                    break;
+                case 'copy':
+                    formDataA.value.CheckTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+                    formDataA.value.PutCenterTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
+                    const paramsC = {
+                        data: formDataA.value
+                    }
+                    await ProtectionCircuitApi.saveProtectionCircuit(paramsC)
+                    VXETable.modal.message({ content: '复制成功', status: 'success' })
+                    break;
             }
-            await ProtectionCircuitApi.saveProtectionCircuit(paramsC)
-            VXETable.modal.message({ content: '复制成功', status: 'success' })
-            break;
-    }
-    refShow.value = false
-    emit('success')
+            refShow.value = false
+            emit('success')
+        }
+    })
 }
 // 重置
 const fnResetA = () => {
-    formDataA.value = {
-        "ID": 0,
-        "StandardVersion": 1,
-        "SupplierWorkNo": "",
-        "SupplierCode": "1000032215",
-        "ModelCode": "dtb00003",
-        "CategoryType": "90003",
-        "EquipmentUniqueCode": '',
-        "FactoryCode": '',
-        "SupplierSupportId": '',
-        "PdCode": "GX000087",
-        "ProcessType": 3,
-        "CheckTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "PutCenterTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "StartTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "StopTime": dayjs().format("YYYY-MM-DD HH:mm:ss"),
-        "InspectionResults": undefined,
-        "Ecode": "NotImp",
-        "SgEntityId": "NotImp",
-        "DataUniqueIdentifier": "NotImp",
-        "MeasureCurrent": undefined,
-        "MeasureResistance": undefined,
-        "Sended": 0
-    }
+    formDataA.value = formDataAInit
+}
+// 关闭窗体
+const fnEventCancel = () => {
+    refShow.value = false
 }
 </script>
 <style scoped></style>
\ No newline at end of file