diff --git a/frontend/src/views/machine/device/components/devicePopup.vue b/frontend/src/views/machine/device/components/devicePopup.vue
index 00f161e..ea7108f 100644
--- a/frontend/src/views/machine/device/components/devicePopup.vue
+++ b/frontend/src/views/machine/device/components/devicePopup.vue
@@ -221,231 +221,6 @@
             </div>
         </template>
     </el-dialog>
-=======
-  <el-dialog :title='dialogTitle' v-model='dialogVisible' @close='close' v-bind='dialogBig'>
-    <el-tabs type='border-card'>
-      <el-tab-pane label='设备台账信息'>
-        <div class='form-grid'>
-          <el-form :model='formContent' ref='dialogFormRef' :rules='rules' :disabled='false'>
-            <el-row :gutter='24'>
-              <el-col :span='8'>
-                <el-form-item label='设备名称' prop='name'>
-                  <el-input v-model='formContent.name' placeholder='请输入设备名称' />
-                </el-form-item>
-              </el-col>
-              <el-col :span='8'>
-                <el-form-item label='设备类型' prop='devType'>
-                  <el-select v-model='formContent.devType' clearable placeholder='请选择设备类型'>
-                    <el-option
-                      v-for="item in dictStore.getDictData('Dev_Type')"
-                      :key='item.id'
-                      :label='item.name'
-                      :value='item.code'
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span='8'>
-                <el-form-item label='通讯协议' prop='protocol'>
-                  <el-select v-model='formContent.protocol' clearable placeholder='请选择通讯协议'>
-                    <el-option
-                      v-for="item in dictStore.getDictData('Event_Type')"
-                      :key='item.id'
-                      :label='item.name'
-                      :value='item.code'
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-
-            </el-row>
-            <el-row :gutter='24'>
-              <el-col :span='8'>
-                <el-form-item label='设备通道数' prop='devChns'>
-                  <el-select v-model='formContent.devChns' clearable placeholder='请选择设备通道数'>
-                    <el-option
-                      v-for="item in dictStore.getDictData('Dev_Chns')"
-                      :key='item.id'
-                      :label='item.name'
-                      :value='item.code'
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span='8'>
-                <el-form-item label='额定电压(V)' prop='devVolt'>
-                  <el-select v-model='formContent.devVolt' clearable placeholder='请选择额定电压'>
-                    <el-option
-                      v-for="item in dictStore.getDictData('Dev_Volt')"
-                      :key='item.id'
-                      :label='item.name'
-                      :value='item.code'
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span='8'>
-                <el-form-item label='额定电流(A)' prop='devCurr'>
-                  <el-select v-model='formContent.devCurr' clearable placeholder='请选择额定电流'>
-                    <el-option
-                      v-for="item in dictStore.getDictData('Dev_Curr')"
-                      :key='item.id'
-                      :label='item.name'
-                      :value='item.code'
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-
-            </el-row>
-            <el-row :gutter='24'>
-              <el-col :span='8'>
-                <el-form-item label='生产厂商' prop='manufacturer'>
-                  <el-select v-model='formContent.manufacturer' clearable placeholder='请选择生产厂商'>
-                    <el-option
-                      v-for="item in dictStore.getDictData('Dev_Manufacturers')"
-                      :key='item.id'
-                      :label='item.name'
-                      :value='item.code'
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span='8'>
-                <el-form-item label='生产日期' prop='createDate'>
-                  <el-date-picker
-                    v-model='formContent.createDate'
-                    placeholder='请选择生产日期'
-                    :disabled-date='disabledDate'
-                  />
-
-                </el-form-item>
-              </el-col>
-              <el-col :span='8'>
-                <el-form-item label='出厂编号' prop='createId' placeholder='请输入出厂编号'>
-                  <el-input v-model='formContent.createId' />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter='24'>
-              <el-col :span='8'>
-                <el-form-item label='固件版本' prop='hardwareVersion'>
-                  <el-input v-model='formContent.hardwareVersion' placeholder='请输入固件版本' />
-                </el-form-item>
-              </el-col>
-              <el-col :span='8'>
-                <el-form-item label='软件版本' prop='softwareVersion'>
-                  <el-input v-model='formContent.softwareVersion' placeholder='请输入软件版本' />
-                </el-form-item>
-              </el-col>
-              <el-col :span='8'>
-                <el-form-item label='设备模式' prop='pattern'>
-                  <el-input v-model='formContent.pattern' disabled />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter='24'>
-              <el-col :span='8'>
-                <el-form-item label='IP地址' prop='ip'>
-                  <IPAddress v-model:value='formContent.ip' />
-                </el-form-item>
-              </el-col>
-              <el-col :span='8'>
-                <el-form-item label='端口号' prop='port' placeholder='请输入端口号'>
-                  <el-input v-model='formContent.port' />
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row :gutter='24'>
-              <el-col :span='8'>
-                <el-form-item label='是否加密' prop='encryptionFlag'>
-                  <el-select v-model='formContent.encryptionFlag' clearable placeholder='请选择是否加密'
-                             @change='handleEncryptionChange'>
-                    <el-option label='是' :value='1'></el-option>
-                    <el-option label='否' :value='0'></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span='8' v-if='IsPasswordShow'>
-                <el-form-item label='识别码' prop='series' clearable placeholder='请输入识别码'>
-                  <el-input v-model='formContent.series' show-password />
-                </el-form-item>
-              </el-col>
-              <el-col :span='8' v-if='IsPasswordShow'>
-                <el-form-item label='密钥' prop='devKey' clearable placeholder='请输入密钥'>
-                  <el-input v-model='formContent.devKey' show-password />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter='24' v-if='DevIsShow'>
-              <el-col :span='8'>
-                <el-form-item label='样品编号' prop='sampleID' clearable placeholder='请输入样品编号'>
-                  <el-input v-model='formContent.sampleID' />
-                </el-form-item>
-              </el-col>
-              <el-col :span='8'>
-                <el-form-item label='送样日期' prop='arrivedDate'>
-                  <el-date-picker
-                    v-model='formContent.arrivedDate'
-                    placeholder='请选择送样日期'
-                    :disabled-date='disabledDate'
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter='24' v-if='MonIsShow'>
-              <el-col :span='8'>
-                <el-form-item label='所属地市' prop='cityName' clearable placeholder='请输入所属地市'>
-                  <el-input v-model='formContent.cityName' />
-                </el-form-item>
-              </el-col>
-              <el-col :span='8'>
-                <el-form-item label='所属供电公司' prop='gDName' clearable placeholder='请输入所属供电公司'>
-                  <el-input v-model='formContent.gDName' />
-                </el-form-item>
-              </el-col>
-              <el-col :span='8'>
-                <el-form-item label='所属电站' prop='subName' clearable placeholder='请输入所属电站'>
-                  <el-input v-model='formContent.subName' />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label='监测点台账信息' v-if='MonIsShow'>
-        <div class='table-box' ref='popupBaseView'>
-          <ProTable
-            ref='proTable'
-            :columns='columns'
-            :request-api='getPqMonList'
-          >
-            <!-- 表格 header 按钮 -->
-            <template #tableHeader='scope'>
-              <el-button type='primary' :icon='CirclePlus'>新增</el-button>
-              <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'>批量删除</el-button>
-            </template>
-            <!-- 表格操作 -->
-            <template #operation>
-              <el-button type='primary' link :icon='EditPen'>复制</el-button>
-              <el-button type='primary' link :icon='EditPen'>编辑</el-button>
-              <el-button type='primary' link :icon='Delete'>删除</el-button>
-            </template>
-          </ProTable>
-        </div>
-      </el-tab-pane>
-
-    </el-tabs>
-    <template #footer>
-      <div>
-        <el-button @click='close()'>取 消</el-button>
-        <el-button type='primary' @click='save()'>保存</el-button>
-      </div>
-    </template>
-  </el-dialog>
->>>>>>> 91eea8cc8ab3fd2cf06e074f25c2adf40548a4b9
-
 
 </template>
 <script setup lang='ts'>
@@ -473,7 +248,7 @@ const dialogFormRef = ref()
 const disabledDate = (time: Date) => {
   return time.getTime() > Date.now()
 }
-<<<<<<< HEAD
+
   function useMetaInfo() {
     const dialogVisible = ref(false)
     const titleType = ref('add')
@@ -528,66 +303,9 @@ const disabledDate = (time: Date) => {
 
   let dialogTitle = computed(() => {
     return titleType.value === 'add' ? '新增被检设备' : '编辑被检设备'
-=======
-
-function useMetaInfo() {
-  const dialogVisible = ref(false)
-  const titleType = ref('add')
-  const formContent = ref<Device.ResPqDev>({
-    id: '',
-    name: '',
-    pattern: '模拟式',
-    devType: '',
-    devChns: 0,
-    devVolt: 0,
-    devCurr: 0,
-    manufacturer: '',
-    createDate: '',
-    createId: '',
-    hardwareVersion: '',
-    softwareVersion: '',
-    protocol: '',
-    ip: '',
-    port: 0,
-    encryptionFlag: 1,
-    reCheckNum: 0,
-    state: 1,
->>>>>>> 91eea8cc8ab3fd2cf06e074f25c2adf40548a4b9
   })
-  return { dialogVisible, titleType, formContent }
-}
-
-const { dialogVisible, titleType, formContent } = useMetaInfo()
-// 清空formContent
-const resetFormContent = () => {
-  formContent.value = {
-    id: '',
-    name: '',
-    pattern: '模拟式',
-    devType: '',
-    devChns: 0,
-    devVolt: 0,
-    devCurr: 0,
-    manufacturer: '',
-    createDate: '',
-    createId: '',
-    hardwareVersion: '',
-    softwareVersion: '',
-    protocol: '',
-    ip: '',
-    port: 0,
-    encryptionFlag: 1,
-    reCheckNum: 0,
-    state: 1,
-  }
-}
-
-let dialogTitle = computed(() => {
-  return titleType.value === 'add' ? '新增被检设备' : '编辑被检设备'
-})
 
 
-<<<<<<< HEAD
   // 定义表单校验规则
   const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
     devType: [{ required: true, message: '设备类型必选！', trigger: 'change' }],
@@ -645,62 +363,8 @@ let dialogTitle = computed(() => {
           close()
           // 刷新表格
           await props.refreshTable!()
-=======
-// 定义表单校验规则
-const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
-  devType: [{ required: true, message: '设备类型必选！', trigger: 'change' }],
-  pattern: [{ required: true, message: '设备模式必填！', trigger: 'blur' }],
-  name: [{ required: true, message: '设备名称必填！', trigger: 'blur' }],
-  devChns: [{ required: true, message: '设备通道数必填！', trigger: 'blur' },
-    // 指定正则，此处是数字正则
-    { pattern: /^[1-9]\d*$/, message: '设备通道数为大于1的整数', trigger: 'blur' }],
-  devVolt: [{ required: true, message: '额定电压必填！', trigger: 'blur' },
-    { pattern: /^\d+(\.\d+)?$/, message: '额定电压格式错误', trigger: 'blur' }],
-  devCurr: [{ required: true, message: '额定电流必填！', trigger: 'blur' },
-    { pattern: /^\d+(\.\d+)?$/, message: '额定电流格式错误', trigger: 'blur' }],
-  createDate: [{ required: true, message: '生产日期必填！', trigger: 'blur' }],
-  createId: [{ required: true, message: '出厂编号必填！', trigger: 'blur' }],
-  hardwareVersion: [{ required: true, message: '固件版本必填！', trigger: 'blur' }],
-  softwareVersion: [{ required: true, message: '软件版本必填！', trigger: 'blur' }],
-  ip: [{ required: true, message: 'IP地址必填！', trigger: 'blur' },
-    { pattern: /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/, message: 'IP地址格式错误', trigger: 'blur' }],
-  port: [{ required: true, message: '端口号必填！', trigger: 'blur' },
-    { pattern: /^\d+$/, message: '端口号格式错误', trigger: 'blur' }],
-  manufacturer: [{ required: true, message: '生产厂家必选！', trigger: 'change' }],
-  encryptionFlag: [{ required: true, message: '是否加密必选！', trigger: 'change' }],
-  protocol: [{ required: true, message: '通讯协议必选！', trigger: 'change' }],
-})
 
-// 关闭弹窗
-const close = () => {
-  dialogVisible.value = false
-  // 清空dialogForm中的值
-  resetFormContent()
-  // 重置表单
-  dialogFormRef.value?.resetFields()
-}
-
-// 保存数据
-const save = () => {
-  try {
-    dialogFormRef.value?.validate(async (valid: boolean) => {
-      if (valid) {
-        formContent.value.createDate = dayjs(formContent.value.createDate).format('YYYY-MM-DD')
-        if (formContent.value.arrivedDate) {
-          formContent.value.arrivedDate = dayjs(formContent.value.arrivedDate).format('YYYY-MM-DD')
->>>>>>> 91eea8cc8ab3fd2cf06e074f25c2adf40548a4b9
         }
-        if (formContent.value.id) {
-          await updatePqDev(formContent.value)
-          ElMessage.success({ message: `${dialogTitle.value}成功！` })
-        } else {
-          await addPqDev(formContent.value)
-          ElMessage.success({ message: `${dialogTitle.value}成功！` })
-        }
-        close()
-        // 刷新表格
-        await props.refreshTable!()
-      }
     })
   } catch (err) {
     console.error('验证过程中出现错误', err)
@@ -716,15 +380,13 @@ const open = (sign: string, data: Device.ResPqDev) => {
   } else {
     handleEncryptionChange(0)
   }
-<<<<<<< HEAD
-  
-  // 对外映射
-  defineExpose({ open })
-  const props = defineProps<{
-    refreshTable: (() => Promise<void>) | undefined;
-  }>()
-  
-
+  if (data.id) {
+    formContent.value = { ...data }
+  } else {
+    resetFormContent()
+    handleEncryptionChange(1)
+  }
+}
   const handleEncryptionChange = (value: number) => {
     // 根据是否加密来显示或隐藏识别码和密钥
     if(value === 1){
@@ -746,22 +408,7 @@ const open = (sign: string, data: Device.ResPqDev) => {
     
     // 如果选择"是"，则显示；否则隐藏
     dialogFormRef.value?.clearValidate(); // 清除验证状态
-=======
-  if (data.pattern == '比对式') {
-    MonIsShow.value = true
-    DevIsShow.value = false
-  } else {
-    MonIsShow.value = false
-    DevIsShow.value = true
->>>>>>> 91eea8cc8ab3fd2cf06e074f25c2adf40548a4b9
-  }
 
-  if (data.id) {
-    formContent.value = { ...data }
-  } else {
-    resetFormContent()
-    handleEncryptionChange(1)
-  }
 }
 
 // 对外映射
@@ -771,18 +418,6 @@ const props = defineProps<{
 }>()
 
 
-const handleEncryptionChange = (value: number) => {
-  // 根据是否加密来显示或隐藏识别码和密钥
-  if (value === 1) {
-    IsPasswordShow.value = true
-  } else {
-    IsPasswordShow.value = false
-    formContent.value.series = ''
-    formContent.value.devKey = ''
-  }
-
-  // 如果选择"是"，则显示；否则隐藏
-}
 
 // 表格配置项
 const columns = reactive<ColumnProps<Monitor.ResPqMon>[]>([
diff --git a/frontend/src/views/machine/device/index.vue b/frontend/src/views/machine/device/index.vue
index 41247ed..2fba865 100644
--- a/frontend/src/views/machine/device/index.vue
+++ b/frontend/src/views/machine/device/index.vue
@@ -41,6 +41,7 @@ import { CirclePlus, Delete, EditPen, Download, Upload } from '@element-plus/ico
 import { useDictStore } from '@/stores/modules/dict'
 import { getPqDevList, deletePqDev, exportPqDev, downloadTemplate, importPqDev } from '@/api/device/device.ts'
 import { ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
 
 const dictStore = useDictStore()
 // ProTable 实例
@@ -81,21 +82,12 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
       span: 2,
       render: () => {
         return (
-<<<<<<< HEAD
-            <div class='flx-flex-start'>
-              <TimeControl
-                  default={'月'}
-                  onUpdate-dates={handleDateChange}
-              />
-            </div>
-=======
           <div class='flx-flex-start'>
             <TimeControl
               default={'月'}
               onUpdate-dates={handleDateChange}
             />
           </div>
->>>>>>> 91eea8cc8ab3fd2cf06e074f25c2adf40548a4b9
         )
       },
     },
@@ -157,7 +149,6 @@ const handleDelete = async (params: Device.ResPqDev) => {
 
 // 导出设备
 const downloadFile = async () => {
-<<<<<<< HEAD
     // 获取当前的搜索参数
     const searchParam = proTable.value?.searchParam || {};
 
@@ -167,15 +158,7 @@ const downloadFile = async () => {
 
     ElMessageBox.confirm('确认导出被检设备?', '温馨提示', { type: 'warning' }).then(() =>
     useDownload(exportPqDev,'被检设备导出数据', proTable.value?.searchParam, false,'.xlsx'),
-=======
-  // 获取当前的搜索参数
-  const searchParam = proTable.value?.searchParam || {}
-  // 将开始时间和结束时间添加到搜索参数中
-  searchParam.searchBeginTime = startDate.value
-  searchParam.searchEndTime = endDate.value
-  ElMessageBox.confirm('确认导出被检设备?', '温馨提示', { type: 'warning' }).then(() =>
-    useDownload(exportPqDev, '被检设备导出数据', proTable.value?.searchParam, false, '.xlsx'),
->>>>>>> 91eea8cc8ab3fd2cf06e074f25c2adf40548a4b9
+
   )
 }