diff --git a/src/components/DictSelect/src/DictSelect.vue b/src/components/DictSelect/src/DictSelect.vue
index 2d59e23c..b46f6bed 100644
--- a/src/components/DictSelect/src/DictSelect.vue
+++ b/src/components/DictSelect/src/DictSelect.vue
@@ -1,46 +1,46 @@
-<!-- 数据字典 Select 选择器 -->
-<template>
-  <el-select class="w-1/1" v-bind="attrs">
-    <template v-if="valueType === 'int'">
-      <el-option
-        v-for="(dict, index) in getIntDictOptions(dictType)"
-        :key="index"
-        :label="dict.label"
-        :value="dict.value"
-      />
-    </template>
-    <template v-if="valueType === 'str'">
-      <el-option
-        v-for="(dict, index) in getStrDictOptions(dictType)"
-        :key="index"
-        :label="dict.label"
-        :value="dict.value"
-      />
-    </template>
-    <template v-if="valueType === 'bool'">
-      <el-option
-        v-for="(dict, index) in getBoolDictOptions(dictType)"
-        :key="index"
-        :label="dict.label"
-        :value="dict.value"
-      />
-    </template>
-  </el-select>
-</template>
-
-<script lang="ts" setup>
-import { getBoolDictOptions, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
-
-// 接受父组件参数
-interface Props {
-  dictType: string // 字典类型
-  valueType: string // 字典值类型
-}
-
-withDefaults(defineProps<Props>(), {
-  dictType: '',
-  valueType: 'str'
-})
-const attrs = useAttrs()
-defineOptions({ name: 'DictSelect' })
-</script>
+<!-- 数据字典 Select 选择器 -->
+<template>
+  <el-select class="w-1/1" v-bind="attrs" filterable>
+    <template v-if="valueType === 'int'">
+      <el-option
+        v-for="(dict, index) in getIntDictOptions(dictType)"
+        :key="index"
+        :label="dict.label"
+        :value="dict.value"
+      />
+    </template>
+    <template v-if="valueType === 'str'">
+      <el-option
+        v-for="(dict, index) in getStrDictOptions(dictType)"
+        :key="index"
+        :label="dict.label"
+        :value="dict.value"
+      />
+    </template>
+    <template v-if="valueType === 'bool'">
+      <el-option
+        v-for="(dict, index) in getBoolDictOptions(dictType)"
+        :key="index"
+        :label="dict.label"
+        :value="dict.value"
+      />
+    </template>
+  </el-select>
+</template>
+
+<script lang="ts" setup>
+import { getBoolDictOptions, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+
+// 接受父组件参数
+interface Props {
+  dictType: string // 字典类型
+  valueType: string // 字典值类型
+}
+
+withDefaults(defineProps<Props>(), {
+  dictType: '',
+  valueType: 'str'
+})
+const attrs = useAttrs()
+defineOptions({ name: 'DictSelect' })
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue b/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue
index 2e887f71..821211d8 100644
--- a/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue
@@ -2,14 +2,14 @@
   <div class="panel-tab__content">
     <el-form :model="flowConditionForm" label-width="90px" size="small">
       <el-form-item label="流转类型">
-        <el-select v-model="flowConditionForm.type" @change="updateFlowType">
+        <el-select v-model="flowConditionForm.type" @change="updateFlowType" filterable>
           <el-option label="普通流转路径" value="normal" />
           <el-option label="默认流转路径" value="default" />
           <el-option label="条件流转路径" value="condition" />
         </el-select>
       </el-form-item>
       <el-form-item label="条件格式" v-if="flowConditionForm.type === 'condition'" key="condition">
-        <el-select v-model="flowConditionForm.conditionType">
+        <el-select v-model="flowConditionForm.conditionType" filterable>
           <el-option label="表达式" value="expression" />
           <el-option label="脚本" value="script" />
         </el-select>
@@ -33,7 +33,7 @@
           <el-input v-model="flowConditionForm.language" clearable @change="updateFlowCondition" />
         </el-form-item>
         <el-form-item label="脚本类型" key="scriptType">
-          <el-select v-model="flowConditionForm.scriptType">
+          <el-select v-model="flowConditionForm.scriptType" filterable>
             <el-option label="内联脚本" value="inlineScript" />
             <el-option label="外部脚本" value="externalScript" />
           </el-select>
diff --git a/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue b/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue
index 755e4379..c735045d 100644
--- a/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue
@@ -1,481 +1,481 @@
-<template>
-  <div class="panel-tab__content">
-    <el-form label-width="80px">
-      <el-form-item label="流程表单">
-        <!--        <el-input v-model="formKey" clearable @change="updateElementFormKey" />-->
-        <el-select v-model="formKey" clearable @change="updateElementFormKey">
-          <el-option v-for="form in formList" :key="form.id" :label="form.name" :value="form.id" />
-        </el-select>
-      </el-form-item>
-      <!--      <el-form-item label="业务标识">-->
-      <!--        <el-select v-model="businessKey" @change="updateElementBusinessKey">-->
-      <!--          <el-option v-for="i in fieldList" :key="i.id" :value="i.id" :label="i.label" />-->
-      <!--          <el-option label="无" value="" />-->
-      <!--        </el-select>-->
-      <!--      </el-form-item>-->
-    </el-form>
-
-    <!--字段列表-->
-    <!--    <div class="element-property list-property">-->
-    <!--      <el-divider><Icon icon="ep:coin" /> 表单字段</el-divider>-->
-    <!--      <el-table :data="fieldList" max-height="240" fit border>-->
-    <!--        <el-table-column label="序号" type="index" width="50px" />-->
-    <!--        <el-table-column label="字段名称" prop="label" min-width="80px" show-overflow-tooltip />-->
-    <!--        <el-table-column-->
-    <!--          label="字段类型"-->
-    <!--          prop="type"-->
-    <!--          min-width="80px"-->
-    <!--          :formatter="(row) => fieldType[row.type] || row.type"-->
-    <!--          show-overflow-tooltip-->
-    <!--        />-->
-    <!--        <el-table-column-->
-    <!--          label="默认值"-->
-    <!--          prop="defaultValue"-->
-    <!--          min-width="80px"-->
-    <!--          show-overflow-tooltip-->
-    <!--        />-->
-    <!--        <el-table-column label="操作" width="90px">-->
-    <!--          <template #default="scope">-->
-    <!--            <el-button type="primary" link @click="openFieldForm(scope, scope.$index)"-->
-    <!--              >编辑</el-button-->
-    <!--            >-->
-    <!--            <el-divider direction="vertical" />-->
-    <!--            <el-button-->
-    <!--              type="primary"-->
-    <!--              link-->
-    <!--              style="color: #ff4d4f"-->
-    <!--              @click="removeField(scope, scope.$index)"-->
-    <!--              >移除</el-button-->
-    <!--            >-->
-    <!--          </template>-->
-    <!--        </el-table-column>-->
-    <!--      </el-table>-->
-    <!--    </div>-->
-    <!--    <div class="element-drawer__button">-->
-    <!--      <XButton type="primary" proIcon="ep:plus" title="添加字段" @click="openFieldForm(null, -1)" />-->
-    <!--    </div>-->
-
-    <!--字段配置侧边栏-->
-    <!--    <el-drawer-->
-    <!--      v-model="fieldModelVisible"-->
-    <!--      title="字段配置"-->
-    <!--      :size="`${width}px`"-->
-    <!--      append-to-body-->
-    <!--      destroy-on-close-->
-    <!--    >-->
-    <!--      <el-form :model="formFieldForm" label-width="90px">-->
-    <!--        <el-form-item label="字段ID">-->
-    <!--          <el-input v-model="formFieldForm.id" clearable />-->
-    <!--        </el-form-item>-->
-    <!--        <el-form-item label="类型">-->
-    <!--          <el-select-->
-    <!--            v-model="formFieldForm.typeType"-->
-    <!--            placeholder="请选择字段类型"-->
-    <!--            clearable-->
-    <!--            @change="changeFieldTypeType"-->
-    <!--          >-->
-    <!--            <el-option v-for="(value, key) of fieldType" :label="value" :value="key" :key="key" />-->
-    <!--          </el-select>-->
-    <!--        </el-form-item>-->
-    <!--        <el-form-item label="类型名称" v-if="formFieldForm.typeType === 'custom'">-->
-    <!--          <el-input v-model="formFieldForm.type" clearable />-->
-    <!--        </el-form-item>-->
-    <!--        <el-form-item label="名称">-->
-    <!--          <el-input v-model="formFieldForm.label" clearable />-->
-    <!--        </el-form-item>-->
-    <!--        <el-form-item label="时间格式" v-if="formFieldForm.typeType === 'date'">-->
-    <!--          <el-input v-model="formFieldForm.datePattern" clearable />-->
-    <!--        </el-form-item>-->
-    <!--        <el-form-item label="默认值">-->
-    <!--          <el-input v-model="formFieldForm.defaultValue" clearable />-->
-    <!--        </el-form-item>-->
-    <!--      </el-form>-->
-
-    <!--      &lt;!&ndash; 枚举值设置 &ndash;&gt;-->
-    <!--      <template v-if="formFieldForm.type === 'enum'">-->
-    <!--        <el-divider key="enum-divider" />-->
-    <!--        <p class="listener-filed__title" key="enum-title">-->
-    <!--          <span><Icon icon="ep:menu" />枚举值列表：</span>-->
-    <!--          <el-button type="primary" @click="openFieldOptionForm(null, -1, 'enum')"-->
-    <!--            >添加枚举值</el-button-->
-    <!--          >-->
-    <!--        </p>-->
-    <!--        <el-table :data="fieldEnumList" key="enum-table" max-height="240" fit border>-->
-    <!--          <el-table-column label="序号" width="50px" type="index" />-->
-    <!--          <el-table-column label="枚举值编号" prop="id" min-width="100px" show-overflow-tooltip />-->
-    <!--          <el-table-column label="枚举值名称" prop="name" min-width="100px" show-overflow-tooltip />-->
-    <!--          <el-table-column label="操作" width="90px">-->
-    <!--            <template #default="scope">-->
-    <!--              <el-button-->
-    <!--                type="primary"-->
-    <!--                link-->
-    <!--                @click="openFieldOptionForm(scope, scope.$index, 'enum')"-->
-    <!--                >编辑</el-button-->
-    <!--              >-->
-    <!--              <el-divider direction="vertical" />-->
-    <!--              <el-button-->
-    <!--                type="primary"-->
-    <!--                link-->
-    <!--                style="color: #ff4d4f"-->
-    <!--                @click="removeFieldOptionItem(scope, scope.$index, 'enum')"-->
-    <!--                >移除</el-button-->
-    <!--              >-->
-    <!--            </template>-->
-    <!--          </el-table-column>-->
-    <!--        </el-table>-->
-    <!--      </template>-->
-
-    <!--      &lt;!&ndash; 校验规则 &ndash;&gt;-->
-    <!--      <el-divider key="validation-divider" />-->
-    <!--      <p class="listener-filed__title" key="validation-title">-->
-    <!--        <span><Icon icon="ep:menu" />约束条件列表：</span>-->
-    <!--        <el-button type="primary" @click="openFieldOptionForm(null, -1, 'constraint')"-->
-    <!--          >添加约束</el-button-->
-    <!--        >-->
-    <!--      </p>-->
-    <!--      <el-table :data="fieldConstraintsList" key="validation-table" max-height="240" fit border>-->
-    <!--        <el-table-column label="序号" width="50px" type="index" />-->
-    <!--        <el-table-column label="约束名称" prop="name" min-width="100px" show-overflow-tooltip />-->
-    <!--        <el-table-column label="约束配置" prop="config" min-width="100px" show-overflow-tooltip />-->
-    <!--        <el-table-column label="操作" width="90px">-->
-    <!--          <template #default="scope">-->
-    <!--            <el-button-->
-    <!--              type="primary"-->
-    <!--              link-->
-    <!--              @click="openFieldOptionForm(scope, scope.$index, 'constraint')"-->
-    <!--              >编辑</el-button-->
-    <!--            >-->
-    <!--            <el-divider direction="vertical" />-->
-    <!--            <el-button-->
-    <!--              type="primary"-->
-    <!--              link-->
-    <!--              style="color: #ff4d4f"-->
-    <!--              @click="removeFieldOptionItem(scope, scope.$index, 'constraint')"-->
-    <!--              >移除</el-button-->
-    <!--            >-->
-    <!--          </template>-->
-    <!--        </el-table-column>-->
-    <!--      </el-table>-->
-
-    <!--      &lt;!&ndash; 表单属性 &ndash;&gt;-->
-    <!--      <el-divider key="property-divider" />-->
-    <!--      <p class="listener-filed__title" key="property-title">-->
-    <!--        <span><Icon icon="ep:menu" />字段属性列表：</span>-->
-    <!--        <el-button type="primary" @click="openFieldOptionForm(null, -1, 'property')"-->
-    <!--          >添加属性</el-button-->
-    <!--        >-->
-    <!--      </p>-->
-    <!--      <el-table :data="fieldPropertiesList" key="property-table" max-height="240" fit border>-->
-    <!--        <el-table-column label="序号" width="50px" type="index" />-->
-    <!--        <el-table-column label="属性编号" prop="id" min-width="100px" show-overflow-tooltip />-->
-    <!--        <el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip />-->
-    <!--        <el-table-column label="操作" width="90px">-->
-    <!--          <template #default="scope">-->
-    <!--            <el-button-->
-    <!--              type="primary"-->
-    <!--              link-->
-    <!--              @click="openFieldOptionForm(scope, scope.$index, 'property')"-->
-    <!--              >编辑</el-button-->
-    <!--            >-->
-    <!--            <el-divider direction="vertical" />-->
-    <!--            <el-button-->
-    <!--              type="primary"-->
-    <!--              link-->
-    <!--              style="color: #ff4d4f"-->
-    <!--              @click="removeFieldOptionItem(scope, scope.$index, 'property')"-->
-    <!--              >移除</el-button-->
-    <!--            >-->
-    <!--          </template>-->
-    <!--        </el-table-column>-->
-    <!--      </el-table>-->
-
-    <!--      &lt;!&ndash; 底部按钮 &ndash;&gt;-->
-    <!--      <div class="element-drawer__button">-->
-    <!--        <el-button>取 消</el-button>-->
-    <!--        <el-button type="primary" @click="saveField">保 存</el-button>-->
-    <!--      </div>-->
-    <!--    </el-drawer>-->
-
-    <!--    <el-dialog-->
-    <!--      v-model="fieldOptionModelVisible"-->
-    <!--      :title="optionModelTitle"-->
-    <!--      width="600px"-->
-    <!--      append-to-body-->
-    <!--      destroy-on-close-->
-    <!--    >-->
-    <!--      <el-form :model="fieldOptionForm" label-width="96px">-->
-    <!--        <el-form-item label="编号/ID" v-if="fieldOptionType !== 'constraint'" key="option-id">-->
-    <!--          <el-input v-model="fieldOptionForm.id" clearable />-->
-    <!--        </el-form-item>-->
-    <!--        <el-form-item label="名称" v-if="fieldOptionType !== 'property'" key="option-name">-->
-    <!--          <el-input v-model="fieldOptionForm.name" clearable />-->
-    <!--        </el-form-item>-->
-    <!--        <el-form-item label="配置" v-if="fieldOptionType === 'constraint'" key="option-config">-->
-    <!--          <el-input v-model="fieldOptionForm.config" clearable />-->
-    <!--        </el-form-item>-->
-    <!--        <el-form-item label="值" v-if="fieldOptionType === 'property'" key="option-value">-->
-    <!--          <el-input v-model="fieldOptionForm.value" clearable />-->
-    <!--        </el-form-item>-->
-    <!--      </el-form>-->
-    <!--      <template #footer>-->
-    <!--        <el-button @click="fieldOptionModelVisible = false">取 消</el-button>-->
-    <!--        <el-button type="primary" @click="saveFieldOption">确 定</el-button>-->
-    <!--      </template>-->
-    <!--    </el-dialog>-->
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { getFormSimpleList } from '@/api/bpm-boot/form'
-
-
-defineOptions({ name: 'ElementForm' })
-
-const props = defineProps({
-  id: String,
-  type: String
-})
-const prefix = inject('prefix')
-const width = inject('width')
-
-const formKey = ref('')
-const businessKey = ref('')
-const optionModelTitle = ref('')
-const fieldList = ref<any[]>([])
-const formFieldForm = ref<any>({})
-const fieldType = ref({
-  long: '长整型',
-  string: '字符串',
-  boolean: '布尔类',
-  date: '日期类',
-  enum: '枚举类',
-  custom: '自定义类型'
-})
-const formFieldIndex = ref(-1) // 编辑中的字段， -1 为新增
-const formFieldOptionIndex = ref(-1) // 编辑中的字段配置项， -1 为新增
-const fieldModelVisible = ref(false)
-const fieldOptionModelVisible = ref(false)
-const fieldOptionForm = ref<any>({}) // 当前激活的字段配置项数据
-const fieldOptionType = ref('') // 当前激活的字段配置项弹窗 类型
-const fieldEnumList = ref<any[]>([]) // 枚举值列表
-const fieldConstraintsList = ref<any[]>([]) // 约束条件列表
-const fieldPropertiesList = ref<any[]>([]) // 绑定属性列表
-const bpmnELement = ref()
-const elExtensionElements = ref()
-const formData = ref()
-const otherExtensions = ref()
-
-const bpmnInstances = () => (window as any)?.bpmnInstances
-const resetFormList = () => {
-  bpmnELement.value = bpmnInstances().bpmnElement
-  formKey.value = bpmnELement.value.businessObject.formKey
-  // if (formKey.value?.length > 0) {
-  //   formKey.value = parseInt(formKey.value)
-  // }
-  // 获取元素扩展属性 或者 创建扩展属性
-  elExtensionElements.value =
-    bpmnELement.value.businessObject.get('extensionElements') ||
-    bpmnInstances().moddle.create('bpmn:ExtensionElements', { values: [] })
-  // 获取元素表单配置 或者 创建新的表单配置
-  formData.value =
-    elExtensionElements.value.values.filter((ex) => ex.$type === `${prefix}:FormData`)?.[0] ||
-    bpmnInstances().moddle.create(`${prefix}:FormData`, { fields: [] })
-
-  // 业务标识 businessKey， 绑定在 formData 中
-  businessKey.value = formData.value.businessKey
-
-  // 保留剩余扩展元素，便于后面更新该元素对应属性
-  otherExtensions.value = elExtensionElements.value.values.filter(
-    (ex) => ex.$type !== `${prefix}:FormData`
-  )
-
-  // 复制原始值，填充表格
-  fieldList.value = JSON.parse(JSON.stringify(formData.value.fields || []))
-
-  // 更新元素扩展属性，避免后续报错
-  updateElementExtensions()
-}
-const updateElementFormKey = () => {
-  bpmnInstances().modeling.updateProperties(toRaw(bpmnELement.value), {
-    formKey: formKey.value
-  })
-}
-const updateElementBusinessKey = () => {
-  bpmnInstances().modeling.updateModdleProperties(toRaw(bpmnELement.value), formData.value, {
-    businessKey: businessKey.value
-  })
-}
-// 根据类型调整字段type
-const changeFieldTypeType = (type) => {
-  // this.$set(this.formFieldForm, "type", type === "custom" ? "" : type);
-  formFieldForm.value['type'] = type === 'custom' ? '' : type
-}
-
-// 打开字段详情侧边栏
-const openFieldForm = (field, index) => {
-  formFieldIndex.value = index
-  if (index !== -1) {
-    const FieldObject = formData.value.fields[index]
-    formFieldForm.value = JSON.parse(JSON.stringify(field))
-    // 设置自定义类型
-    // this.$set(this.formFieldForm, "typeType", !this.fieldType[field.type] ? "custom" : field.type);
-    formFieldForm.value['typeType'] = !fieldType.value[field.type] ? 'custom' : field.type
-    // 初始化枚举值列表
-    field.type === 'enum' &&
-      (fieldEnumList.value = JSON.parse(JSON.stringify(FieldObject?.values || [])))
-    // 初始化约束条件列表
-    fieldConstraintsList.value = JSON.parse(
-      JSON.stringify(FieldObject?.validation?.constraints || [])
-    )
-    // 初始化自定义属性列表
-    fieldPropertiesList.value = JSON.parse(JSON.stringify(FieldObject?.properties?.values || []))
-  } else {
-    formFieldForm.value = {}
-    // 初始化枚举值列表
-    fieldEnumList.value = []
-    // 初始化约束条件列表
-    fieldConstraintsList.value = []
-    // 初始化自定义属性列表
-    fieldPropertiesList.value = []
-  }
-  fieldModelVisible.value = true
-}
-// 打开字段 某个 配置项 弹窗
-const openFieldOptionForm = (option, index, type) => {
-  fieldOptionModelVisible.value = true
-  fieldOptionType.value = type
-  formFieldOptionIndex.value = index
-  if (type === 'property') {
-    fieldOptionForm.value = option ? JSON.parse(JSON.stringify(option)) : {}
-    return (optionModelTitle.value = '属性配置')
-  }
-  if (type === 'enum') {
-    fieldOptionForm.value = option ? JSON.parse(JSON.stringify(option)) : {}
-    return (optionModelTitle.value = '枚举值配置')
-  }
-  fieldOptionForm.value = option ? JSON.parse(JSON.stringify(option)) : {}
-  return (optionModelTitle.value = '约束条件配置')
-}
-
-// 保存字段 某个 配置项
-const saveFieldOption = () => {
-  if (formFieldOptionIndex.value === -1) {
-    if (fieldOptionType.value === 'property') {
-      fieldPropertiesList.value.push(fieldOptionForm.value)
-    }
-    if (fieldOptionType.value === 'constraint') {
-      fieldConstraintsList.value.push(fieldOptionForm.value)
-    }
-    if (fieldOptionType.value === 'enum') {
-      fieldEnumList.value.push(fieldOptionForm.value)
-    }
-  } else {
-    fieldOptionType.value === 'property' &&
-      fieldPropertiesList.value.splice(formFieldOptionIndex.value, 1, fieldOptionForm.value)
-    fieldOptionType.value === 'constraint' &&
-      fieldConstraintsList.value.splice(formFieldOptionIndex.value, 1, fieldOptionForm.value)
-    fieldOptionType.value === 'enum' &&
-      fieldEnumList.value.splice(formFieldOptionIndex.value, 1, fieldOptionForm.value)
-  }
-  fieldOptionModelVisible.value = false
-  fieldOptionForm.value = {}
-}
-// 保存字段配置
-const saveField = () => {
-  const { id, type, label, defaultValue, datePattern } = formFieldForm.value
-  const Field = bpmnInstances().moddle.create(`${prefix}:FormField`, { id, type, label })
-  defaultValue && (Field.defaultValue = defaultValue)
-  datePattern && (Field.datePattern = datePattern)
-  // 构建属性
-  if (fieldPropertiesList.value && fieldPropertiesList.value.length) {
-    const fieldPropertyList = fieldPropertiesList.value.map((fp) => {
-      return bpmnInstances().moddle.create(`${prefix}:Property`, {
-        id: fp.id,
-        value: fp.value
-      })
-    })
-    Field.properties = bpmnInstances().moddle.create(`${prefix}:Properties`, {
-      values: fieldPropertyList
-    })
-  }
-  // 构建校验规则
-  if (fieldConstraintsList.value && fieldConstraintsList.value.length) {
-    const fieldConstraintList = fieldConstraintsList.value.map((fc) => {
-      return bpmnInstances().moddle.create(`${prefix}:Constraint`, {
-        name: fc.name,
-        config: fc.config
-      })
-    })
-    Field.validation = bpmnInstances().moddle.create(`${prefix}:Validation`, {
-      constraints: fieldConstraintList
-    })
-  }
-  // 构建枚举值
-  if (fieldEnumList.value && fieldEnumList.value.length) {
-    Field.values = fieldEnumList.value.map((fe) => {
-      return bpmnInstances().moddle.create(`${prefix}:Value`, { name: fe.name, id: fe.id })
-    })
-  }
-  // 更新数组 与 表单配置实例
-  if (formFieldIndex.value === -1) {
-    fieldList.value.push(formFieldForm.value)
-    formData.value.fields.push(Field)
-  } else {
-    fieldList.value.splice(formFieldIndex.value, 1, formFieldForm.value)
-    formData.value.fields.splice(formFieldIndex.value, 1, Field)
-  }
-  updateElementExtensions()
-  fieldModelVisible.value = false
-}
-
-// 移除某个 字段的 配置项
-const removeFieldOptionItem = (option, index, type) => {
-  // console.log(option, 'option')
-  if (type === 'property') {
-    fieldPropertiesList.value.splice(index, 1)
-    return
-  }
-  if (type === 'enum') {
-    fieldEnumList.value.splice(index, 1)
-    return
-  }
-  fieldConstraintsList.value.splice(index, 1)
-}
-// 移除 字段
-const removeField = (field, index) => {
-  console.log(field, 'field')
-  fieldList.value.splice(index, 1)
-  formData.value.fields.splice(index, 1)
-  updateElementExtensions()
-}
-
-const updateElementExtensions = () => {
-  // 更新回扩展元素
-  const newElExtensionElements = bpmnInstances().moddle.create(`bpmn:ExtensionElements`, {
-    values: otherExtensions.value.concat(formData.value)
-  })
-  // 更新到元素上
-  bpmnInstances().modeling.updateProperties(toRaw(bpmnELement.value), {
-    extensionElements: newElExtensionElements
-  })
-}
-
-const formList = ref([]) // 流程表单的下拉框的数据
-onMounted(async () => {
-  await getFormSimpleList().then(res => {
-    formList.value = res.data
-  })
-})
-
-watch(
-  () => props.id,
-  (val) => {
-    val &&
-      val.length &&
-      nextTick(() => {
-        resetFormList()
-      })
-  },
-  { immediate: true }
-)
-</script>
+<template>
+  <div class="panel-tab__content">
+    <el-form label-width="80px">
+      <el-form-item label="流程表单">
+        <!--        <el-input v-model="formKey" clearable @change="updateElementFormKey" />-->
+        <el-select v-model="formKey" clearable @change="updateElementFormKey" filterable>
+          <el-option v-for="form in formList" :key="form.id" :label="form.name" :value="form.id" />
+        </el-select>
+      </el-form-item>
+      <!--      <el-form-item label="业务标识">-->
+      <!--        <el-select v-model="businessKey" @change="updateElementBusinessKey">-->
+      <!--          <el-option v-for="i in fieldList" :key="i.id" :value="i.id" :label="i.label" />-->
+      <!--          <el-option label="无" value="" />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+    </el-form>
+
+    <!--字段列表-->
+    <!--    <div class="element-property list-property">-->
+    <!--      <el-divider><Icon icon="ep:coin" /> 表单字段</el-divider>-->
+    <!--      <el-table :data="fieldList" max-height="240" fit border>-->
+    <!--        <el-table-column label="序号" type="index" width="50px" />-->
+    <!--        <el-table-column label="字段名称" prop="label" min-width="80px" show-overflow-tooltip />-->
+    <!--        <el-table-column-->
+    <!--          label="字段类型"-->
+    <!--          prop="type"-->
+    <!--          min-width="80px"-->
+    <!--          :formatter="(row) => fieldType[row.type] || row.type"-->
+    <!--          show-overflow-tooltip-->
+    <!--        />-->
+    <!--        <el-table-column-->
+    <!--          label="默认值"-->
+    <!--          prop="defaultValue"-->
+    <!--          min-width="80px"-->
+    <!--          show-overflow-tooltip-->
+    <!--        />-->
+    <!--        <el-table-column label="操作" width="90px">-->
+    <!--          <template #default="scope">-->
+    <!--            <el-button type="primary" link @click="openFieldForm(scope, scope.$index)"-->
+    <!--              >编辑</el-button-->
+    <!--            >-->
+    <!--            <el-divider direction="vertical" />-->
+    <!--            <el-button-->
+    <!--              type="primary"-->
+    <!--              link-->
+    <!--              style="color: #ff4d4f"-->
+    <!--              @click="removeField(scope, scope.$index)"-->
+    <!--              >移除</el-button-->
+    <!--            >-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--      </el-table>-->
+    <!--    </div>-->
+    <!--    <div class="element-drawer__button">-->
+    <!--      <XButton type="primary" proIcon="ep:plus" title="添加字段" @click="openFieldForm(null, -1)" />-->
+    <!--    </div>-->
+
+    <!--字段配置侧边栏-->
+    <!--    <el-drawer-->
+    <!--      v-model="fieldModelVisible"-->
+    <!--      title="字段配置"-->
+    <!--      :size="`${width}px`"-->
+    <!--      append-to-body-->
+    <!--      destroy-on-close-->
+    <!--    >-->
+    <!--      <el-form :model="formFieldForm" label-width="90px">-->
+    <!--        <el-form-item label="字段ID">-->
+    <!--          <el-input v-model="formFieldForm.id" clearable />-->
+    <!--        </el-form-item>-->
+    <!--        <el-form-item label="类型">-->
+    <!--          <el-select-->
+    <!--            v-model="formFieldForm.typeType"-->
+    <!--            placeholder="请选择字段类型"-->
+    <!--            clearable-->
+    <!--            @change="changeFieldTypeType"-->
+    <!--          >-->
+    <!--            <el-option v-for="(value, key) of fieldType" :label="value" :value="key" :key="key" />-->
+    <!--          </el-select>-->
+    <!--        </el-form-item>-->
+    <!--        <el-form-item label="类型名称" v-if="formFieldForm.typeType === 'custom'">-->
+    <!--          <el-input v-model="formFieldForm.type" clearable />-->
+    <!--        </el-form-item>-->
+    <!--        <el-form-item label="名称">-->
+    <!--          <el-input v-model="formFieldForm.label" clearable />-->
+    <!--        </el-form-item>-->
+    <!--        <el-form-item label="时间格式" v-if="formFieldForm.typeType === 'date'">-->
+    <!--          <el-input v-model="formFieldForm.datePattern" clearable />-->
+    <!--        </el-form-item>-->
+    <!--        <el-form-item label="默认值">-->
+    <!--          <el-input v-model="formFieldForm.defaultValue" clearable />-->
+    <!--        </el-form-item>-->
+    <!--      </el-form>-->
+
+    <!--      &lt;!&ndash; 枚举值设置 &ndash;&gt;-->
+    <!--      <template v-if="formFieldForm.type === 'enum'">-->
+    <!--        <el-divider key="enum-divider" />-->
+    <!--        <p class="listener-filed__title" key="enum-title">-->
+    <!--          <span><Icon icon="ep:menu" />枚举值列表：</span>-->
+    <!--          <el-button type="primary" @click="openFieldOptionForm(null, -1, 'enum')"-->
+    <!--            >添加枚举值</el-button-->
+    <!--          >-->
+    <!--        </p>-->
+    <!--        <el-table :data="fieldEnumList" key="enum-table" max-height="240" fit border>-->
+    <!--          <el-table-column label="序号" width="50px" type="index" />-->
+    <!--          <el-table-column label="枚举值编号" prop="id" min-width="100px" show-overflow-tooltip />-->
+    <!--          <el-table-column label="枚举值名称" prop="name" min-width="100px" show-overflow-tooltip />-->
+    <!--          <el-table-column label="操作" width="90px">-->
+    <!--            <template #default="scope">-->
+    <!--              <el-button-->
+    <!--                type="primary"-->
+    <!--                link-->
+    <!--                @click="openFieldOptionForm(scope, scope.$index, 'enum')"-->
+    <!--                >编辑</el-button-->
+    <!--              >-->
+    <!--              <el-divider direction="vertical" />-->
+    <!--              <el-button-->
+    <!--                type="primary"-->
+    <!--                link-->
+    <!--                style="color: #ff4d4f"-->
+    <!--                @click="removeFieldOptionItem(scope, scope.$index, 'enum')"-->
+    <!--                >移除</el-button-->
+    <!--              >-->
+    <!--            </template>-->
+    <!--          </el-table-column>-->
+    <!--        </el-table>-->
+    <!--      </template>-->
+
+    <!--      &lt;!&ndash; 校验规则 &ndash;&gt;-->
+    <!--      <el-divider key="validation-divider" />-->
+    <!--      <p class="listener-filed__title" key="validation-title">-->
+    <!--        <span><Icon icon="ep:menu" />约束条件列表：</span>-->
+    <!--        <el-button type="primary" @click="openFieldOptionForm(null, -1, 'constraint')"-->
+    <!--          >添加约束</el-button-->
+    <!--        >-->
+    <!--      </p>-->
+    <!--      <el-table :data="fieldConstraintsList" key="validation-table" max-height="240" fit border>-->
+    <!--        <el-table-column label="序号" width="50px" type="index" />-->
+    <!--        <el-table-column label="约束名称" prop="name" min-width="100px" show-overflow-tooltip />-->
+    <!--        <el-table-column label="约束配置" prop="config" min-width="100px" show-overflow-tooltip />-->
+    <!--        <el-table-column label="操作" width="90px">-->
+    <!--          <template #default="scope">-->
+    <!--            <el-button-->
+    <!--              type="primary"-->
+    <!--              link-->
+    <!--              @click="openFieldOptionForm(scope, scope.$index, 'constraint')"-->
+    <!--              >编辑</el-button-->
+    <!--            >-->
+    <!--            <el-divider direction="vertical" />-->
+    <!--            <el-button-->
+    <!--              type="primary"-->
+    <!--              link-->
+    <!--              style="color: #ff4d4f"-->
+    <!--              @click="removeFieldOptionItem(scope, scope.$index, 'constraint')"-->
+    <!--              >移除</el-button-->
+    <!--            >-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--      </el-table>-->
+
+    <!--      &lt;!&ndash; 表单属性 &ndash;&gt;-->
+    <!--      <el-divider key="property-divider" />-->
+    <!--      <p class="listener-filed__title" key="property-title">-->
+    <!--        <span><Icon icon="ep:menu" />字段属性列表：</span>-->
+    <!--        <el-button type="primary" @click="openFieldOptionForm(null, -1, 'property')"-->
+    <!--          >添加属性</el-button-->
+    <!--        >-->
+    <!--      </p>-->
+    <!--      <el-table :data="fieldPropertiesList" key="property-table" max-height="240" fit border>-->
+    <!--        <el-table-column label="序号" width="50px" type="index" />-->
+    <!--        <el-table-column label="属性编号" prop="id" min-width="100px" show-overflow-tooltip />-->
+    <!--        <el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip />-->
+    <!--        <el-table-column label="操作" width="90px">-->
+    <!--          <template #default="scope">-->
+    <!--            <el-button-->
+    <!--              type="primary"-->
+    <!--              link-->
+    <!--              @click="openFieldOptionForm(scope, scope.$index, 'property')"-->
+    <!--              >编辑</el-button-->
+    <!--            >-->
+    <!--            <el-divider direction="vertical" />-->
+    <!--            <el-button-->
+    <!--              type="primary"-->
+    <!--              link-->
+    <!--              style="color: #ff4d4f"-->
+    <!--              @click="removeFieldOptionItem(scope, scope.$index, 'property')"-->
+    <!--              >移除</el-button-->
+    <!--            >-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--      </el-table>-->
+
+    <!--      &lt;!&ndash; 底部按钮 &ndash;&gt;-->
+    <!--      <div class="element-drawer__button">-->
+    <!--        <el-button>取 消</el-button>-->
+    <!--        <el-button type="primary" @click="saveField">保 存</el-button>-->
+    <!--      </div>-->
+    <!--    </el-drawer>-->
+
+    <!--    <el-dialog-->
+    <!--      v-model="fieldOptionModelVisible"-->
+    <!--      :title="optionModelTitle"-->
+    <!--      width="600px"-->
+    <!--      append-to-body-->
+    <!--      destroy-on-close-->
+    <!--    >-->
+    <!--      <el-form :model="fieldOptionForm" label-width="96px">-->
+    <!--        <el-form-item label="编号/ID" v-if="fieldOptionType !== 'constraint'" key="option-id">-->
+    <!--          <el-input v-model="fieldOptionForm.id" clearable />-->
+    <!--        </el-form-item>-->
+    <!--        <el-form-item label="名称" v-if="fieldOptionType !== 'property'" key="option-name">-->
+    <!--          <el-input v-model="fieldOptionForm.name" clearable />-->
+    <!--        </el-form-item>-->
+    <!--        <el-form-item label="配置" v-if="fieldOptionType === 'constraint'" key="option-config">-->
+    <!--          <el-input v-model="fieldOptionForm.config" clearable />-->
+    <!--        </el-form-item>-->
+    <!--        <el-form-item label="值" v-if="fieldOptionType === 'property'" key="option-value">-->
+    <!--          <el-input v-model="fieldOptionForm.value" clearable />-->
+    <!--        </el-form-item>-->
+    <!--      </el-form>-->
+    <!--      <template #footer>-->
+    <!--        <el-button @click="fieldOptionModelVisible = false">取 消</el-button>-->
+    <!--        <el-button type="primary" @click="saveFieldOption">确 定</el-button>-->
+    <!--      </template>-->
+    <!--    </el-dialog>-->
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { getFormSimpleList } from '@/api/bpm-boot/form'
+
+
+defineOptions({ name: 'ElementForm' })
+
+const props = defineProps({
+  id: String,
+  type: String
+})
+const prefix = inject('prefix')
+const width = inject('width')
+
+const formKey = ref('')
+const businessKey = ref('')
+const optionModelTitle = ref('')
+const fieldList = ref<any[]>([])
+const formFieldForm = ref<any>({})
+const fieldType = ref({
+  long: '长整型',
+  string: '字符串',
+  boolean: '布尔类',
+  date: '日期类',
+  enum: '枚举类',
+  custom: '自定义类型'
+})
+const formFieldIndex = ref(-1) // 编辑中的字段， -1 为新增
+const formFieldOptionIndex = ref(-1) // 编辑中的字段配置项， -1 为新增
+const fieldModelVisible = ref(false)
+const fieldOptionModelVisible = ref(false)
+const fieldOptionForm = ref<any>({}) // 当前激活的字段配置项数据
+const fieldOptionType = ref('') // 当前激活的字段配置项弹窗 类型
+const fieldEnumList = ref<any[]>([]) // 枚举值列表
+const fieldConstraintsList = ref<any[]>([]) // 约束条件列表
+const fieldPropertiesList = ref<any[]>([]) // 绑定属性列表
+const bpmnELement = ref()
+const elExtensionElements = ref()
+const formData = ref()
+const otherExtensions = ref()
+
+const bpmnInstances = () => (window as any)?.bpmnInstances
+const resetFormList = () => {
+  bpmnELement.value = bpmnInstances().bpmnElement
+  formKey.value = bpmnELement.value.businessObject.formKey
+  // if (formKey.value?.length > 0) {
+  //   formKey.value = parseInt(formKey.value)
+  // }
+  // 获取元素扩展属性 或者 创建扩展属性
+  elExtensionElements.value =
+    bpmnELement.value.businessObject.get('extensionElements') ||
+    bpmnInstances().moddle.create('bpmn:ExtensionElements', { values: [] })
+  // 获取元素表单配置 或者 创建新的表单配置
+  formData.value =
+    elExtensionElements.value.values.filter((ex) => ex.$type === `${prefix}:FormData`)?.[0] ||
+    bpmnInstances().moddle.create(`${prefix}:FormData`, { fields: [] })
+
+  // 业务标识 businessKey， 绑定在 formData 中
+  businessKey.value = formData.value.businessKey
+
+  // 保留剩余扩展元素，便于后面更新该元素对应属性
+  otherExtensions.value = elExtensionElements.value.values.filter(
+    (ex) => ex.$type !== `${prefix}:FormData`
+  )
+
+  // 复制原始值，填充表格
+  fieldList.value = JSON.parse(JSON.stringify(formData.value.fields || []))
+
+  // 更新元素扩展属性，避免后续报错
+  updateElementExtensions()
+}
+const updateElementFormKey = () => {
+  bpmnInstances().modeling.updateProperties(toRaw(bpmnELement.value), {
+    formKey: formKey.value
+  })
+}
+const updateElementBusinessKey = () => {
+  bpmnInstances().modeling.updateModdleProperties(toRaw(bpmnELement.value), formData.value, {
+    businessKey: businessKey.value
+  })
+}
+// 根据类型调整字段type
+const changeFieldTypeType = (type) => {
+  // this.$set(this.formFieldForm, "type", type === "custom" ? "" : type);
+  formFieldForm.value['type'] = type === 'custom' ? '' : type
+}
+
+// 打开字段详情侧边栏
+const openFieldForm = (field, index) => {
+  formFieldIndex.value = index
+  if (index !== -1) {
+    const FieldObject = formData.value.fields[index]
+    formFieldForm.value = JSON.parse(JSON.stringify(field))
+    // 设置自定义类型
+    // this.$set(this.formFieldForm, "typeType", !this.fieldType[field.type] ? "custom" : field.type);
+    formFieldForm.value['typeType'] = !fieldType.value[field.type] ? 'custom' : field.type
+    // 初始化枚举值列表
+    field.type === 'enum' &&
+      (fieldEnumList.value = JSON.parse(JSON.stringify(FieldObject?.values || [])))
+    // 初始化约束条件列表
+    fieldConstraintsList.value = JSON.parse(
+      JSON.stringify(FieldObject?.validation?.constraints || [])
+    )
+    // 初始化自定义属性列表
+    fieldPropertiesList.value = JSON.parse(JSON.stringify(FieldObject?.properties?.values || []))
+  } else {
+    formFieldForm.value = {}
+    // 初始化枚举值列表
+    fieldEnumList.value = []
+    // 初始化约束条件列表
+    fieldConstraintsList.value = []
+    // 初始化自定义属性列表
+    fieldPropertiesList.value = []
+  }
+  fieldModelVisible.value = true
+}
+// 打开字段 某个 配置项 弹窗
+const openFieldOptionForm = (option, index, type) => {
+  fieldOptionModelVisible.value = true
+  fieldOptionType.value = type
+  formFieldOptionIndex.value = index
+  if (type === 'property') {
+    fieldOptionForm.value = option ? JSON.parse(JSON.stringify(option)) : {}
+    return (optionModelTitle.value = '属性配置')
+  }
+  if (type === 'enum') {
+    fieldOptionForm.value = option ? JSON.parse(JSON.stringify(option)) : {}
+    return (optionModelTitle.value = '枚举值配置')
+  }
+  fieldOptionForm.value = option ? JSON.parse(JSON.stringify(option)) : {}
+  return (optionModelTitle.value = '约束条件配置')
+}
+
+// 保存字段 某个 配置项
+const saveFieldOption = () => {
+  if (formFieldOptionIndex.value === -1) {
+    if (fieldOptionType.value === 'property') {
+      fieldPropertiesList.value.push(fieldOptionForm.value)
+    }
+    if (fieldOptionType.value === 'constraint') {
+      fieldConstraintsList.value.push(fieldOptionForm.value)
+    }
+    if (fieldOptionType.value === 'enum') {
+      fieldEnumList.value.push(fieldOptionForm.value)
+    }
+  } else {
+    fieldOptionType.value === 'property' &&
+      fieldPropertiesList.value.splice(formFieldOptionIndex.value, 1, fieldOptionForm.value)
+    fieldOptionType.value === 'constraint' &&
+      fieldConstraintsList.value.splice(formFieldOptionIndex.value, 1, fieldOptionForm.value)
+    fieldOptionType.value === 'enum' &&
+      fieldEnumList.value.splice(formFieldOptionIndex.value, 1, fieldOptionForm.value)
+  }
+  fieldOptionModelVisible.value = false
+  fieldOptionForm.value = {}
+}
+// 保存字段配置
+const saveField = () => {
+  const { id, type, label, defaultValue, datePattern } = formFieldForm.value
+  const Field = bpmnInstances().moddle.create(`${prefix}:FormField`, { id, type, label })
+  defaultValue && (Field.defaultValue = defaultValue)
+  datePattern && (Field.datePattern = datePattern)
+  // 构建属性
+  if (fieldPropertiesList.value && fieldPropertiesList.value.length) {
+    const fieldPropertyList = fieldPropertiesList.value.map((fp) => {
+      return bpmnInstances().moddle.create(`${prefix}:Property`, {
+        id: fp.id,
+        value: fp.value
+      })
+    })
+    Field.properties = bpmnInstances().moddle.create(`${prefix}:Properties`, {
+      values: fieldPropertyList
+    })
+  }
+  // 构建校验规则
+  if (fieldConstraintsList.value && fieldConstraintsList.value.length) {
+    const fieldConstraintList = fieldConstraintsList.value.map((fc) => {
+      return bpmnInstances().moddle.create(`${prefix}:Constraint`, {
+        name: fc.name,
+        config: fc.config
+      })
+    })
+    Field.validation = bpmnInstances().moddle.create(`${prefix}:Validation`, {
+      constraints: fieldConstraintList
+    })
+  }
+  // 构建枚举值
+  if (fieldEnumList.value && fieldEnumList.value.length) {
+    Field.values = fieldEnumList.value.map((fe) => {
+      return bpmnInstances().moddle.create(`${prefix}:Value`, { name: fe.name, id: fe.id })
+    })
+  }
+  // 更新数组 与 表单配置实例
+  if (formFieldIndex.value === -1) {
+    fieldList.value.push(formFieldForm.value)
+    formData.value.fields.push(Field)
+  } else {
+    fieldList.value.splice(formFieldIndex.value, 1, formFieldForm.value)
+    formData.value.fields.splice(formFieldIndex.value, 1, Field)
+  }
+  updateElementExtensions()
+  fieldModelVisible.value = false
+}
+
+// 移除某个 字段的 配置项
+const removeFieldOptionItem = (option, index, type) => {
+  // console.log(option, 'option')
+  if (type === 'property') {
+    fieldPropertiesList.value.splice(index, 1)
+    return
+  }
+  if (type === 'enum') {
+    fieldEnumList.value.splice(index, 1)
+    return
+  }
+  fieldConstraintsList.value.splice(index, 1)
+}
+// 移除 字段
+const removeField = (field, index) => {
+  console.log(field, 'field')
+  fieldList.value.splice(index, 1)
+  formData.value.fields.splice(index, 1)
+  updateElementExtensions()
+}
+
+const updateElementExtensions = () => {
+  // 更新回扩展元素
+  const newElExtensionElements = bpmnInstances().moddle.create(`bpmn:ExtensionElements`, {
+    values: otherExtensions.value.concat(formData.value)
+  })
+  // 更新到元素上
+  bpmnInstances().modeling.updateProperties(toRaw(bpmnELement.value), {
+    extensionElements: newElExtensionElements
+  })
+}
+
+const formList = ref([]) // 流程表单的下拉框的数据
+onMounted(async () => {
+  await getFormSimpleList().then(res => {
+    formList.value = res.data
+  })
+})
+
+watch(
+  () => props.id,
+  (val) => {
+    val &&
+      val.length &&
+      nextTick(() => {
+        resetFormList()
+      })
+  },
+  { immediate: true }
+)
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue b/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue
index 0a0c6416..60c98abb 100644
--- a/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue
@@ -64,7 +64,7 @@
             prop='event'
             :rules="{ required: true, trigger: ['blur', 'change'] }"
         >
-          <el-select v-model='listenerForm.event'>
+          <el-select v-model='listenerForm.event' filterable>
             <el-option label='start' value='start' />
             <el-option label='end' value='end' />
           </el-select>
@@ -74,7 +74,7 @@
             prop='listenerType'
             :rules="{ required: true, trigger: ['blur', 'change'] }"
         >
-          <el-select v-model='listenerForm.listenerType'>
+          <el-select v-model='listenerForm.listenerType' filterable>
             <el-option
                 v-for='i in Object.keys(listenerTypeObject)'
                 :key='i'
@@ -125,7 +125,7 @@
               key='listener-script-type'
               :rules="{ required: true, trigger: ['blur', 'change'], message: '请选择脚本类型' }"
           >
-            <el-select v-model='listenerForm.scriptType'>
+            <el-select v-model='listenerForm.scriptType' filterable>
               <el-option label='内联脚本' value='inlineScript' />
               <el-option label='外部脚本' value='externalScript' />
             </el-select>
@@ -228,7 +228,7 @@
             prop='fieldType'
             :rules="{ required: true, trigger: ['blur', 'change'] }"
         >
-          <el-select v-model='listenerFieldForm.fieldType'>
+          <el-select v-model='listenerFieldForm.fieldType' filterable>
             <el-option
                 v-for='i in Object.keys(fieldTypeObject)'
                 :key='i'
diff --git a/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue b/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue
index 9a838bad..76347c2a 100644
--- a/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue
@@ -62,7 +62,7 @@
           prop="event"
           :rules="{ required: true, trigger: ['blur', 'change'] }"
         >
-          <el-select v-model="listenerForm.event">
+          <el-select v-model="listenerForm.event" filterable>
             <el-option
               v-for="i in Object.keys(listenerEventTypeObject)"
               :key="i"
@@ -83,7 +83,7 @@
           prop="listenerType"
           :rules="{ required: true, trigger: ['blur', 'change'] }"
         >
-          <el-select v-model="listenerForm.listenerType">
+          <el-select v-model="listenerForm.listenerType" filterable>
             <el-option
               v-for="i in Object.keys(listenerTypeObject)"
               :key="i"
@@ -134,7 +134,7 @@
             key="listener-script-type"
             :rules="{ required: true, trigger: ['blur', 'change'], message: '请选择脚本类型' }"
           >
-            <el-select v-model="listenerForm.scriptType">
+            <el-select v-model="listenerForm.scriptType" filterable>
               <el-option label="内联脚本" value="inlineScript" />
               <el-option label="外部脚本" value="externalScript" />
             </el-select>
@@ -161,7 +161,7 @@
 
         <template v-if="listenerForm.event === 'timeout'">
           <el-form-item label="定时器类型" prop="eventDefinitionType" key="eventDefinitionType">
-            <el-select v-model="listenerForm.eventDefinitionType">
+            <el-select v-model="listenerForm.eventDefinitionType" filterable>
               <el-option label="统计时间" value="date" />
               <el-option label="持续时长" value="duration" />
               <el-option label="循环" value="cycle" />
@@ -259,7 +259,7 @@
           prop="fieldType"
           :rules="{ required: true, trigger: ['blur', 'change'] }"
         >
-          <el-select v-model="listenerFieldForm.fieldType">
+          <el-select v-model="listenerFieldForm.fieldType" filterable>
             <el-option
               v-for="i in Object.keys(fieldTypeObject)"
               :key="i"
diff --git a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
index c0ec1cad..0dac1c9c 100644
--- a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
@@ -1,280 +1,280 @@
-<template>
-  <div class="panel-tab__content">
-    <el-form label-width="90px">
-      <el-form-item label="快捷配置">
-        <el-button size="small" @click="changeConfig('依次审批')">依次审批</el-button>
-        <el-button size="small" @click="changeConfig('会签')">会签</el-button>
-        <el-button size="small" @click="changeConfig('或签')">或签</el-button>
-      </el-form-item>
-      <el-form-item label="会签类型">
-        <el-select v-model="loopCharacteristics" @change="changeLoopCharacteristicsType">
-          <el-option label="并行多重事件" value="ParallelMultiInstance" />
-          <el-option label="时序多重事件" value="SequentialMultiInstance" />
-          <el-option label="无" value="Null" />
-        </el-select>
-      </el-form-item>
-      <template
-        v-if="
-          loopCharacteristics === 'ParallelMultiInstance' ||
-          loopCharacteristics === 'SequentialMultiInstance'
-        "
-      >
-        <el-form-item label="循环数量" key="loopCardinality">
-          <el-input
-            v-model="loopInstanceForm.loopCardinality"
-            clearable
-            @change="updateLoopCardinality"
-          />
-        </el-form-item>
-        <el-form-item label="集合" key="collection" v-show="false">
-          <el-input v-model="loopInstanceForm.collection" clearable @change="updateLoopBase" />
-        </el-form-item>
-        <!-- add by 芋艿：由于「元素变量」暂时用不到，所以这里 display 为 none -->
-        <el-form-item label="元素变量" key="elementVariable" style="display: none">
-          <el-input v-model="loopInstanceForm.elementVariable" clearable @change="updateLoopBase" />
-        </el-form-item>
-        <el-form-item label="完成条件" key="completionCondition">
-          <el-input
-            v-model="loopInstanceForm.completionCondition"
-            clearable
-            @change="updateLoopCondition"
-          />
-        </el-form-item>
-        <!-- add by 芋艿：由于「异步状态」暂时用不到，所以这里 display 为 none -->
-        <el-form-item label="异步状态" key="async" style="display: none">
-          <el-checkbox
-            v-model="loopInstanceForm.asyncBefore"
-            label="异步前"
-            @change="updateLoopAsync('asyncBefore')"
-          />
-          <el-checkbox
-            v-model="loopInstanceForm.asyncAfter"
-            label="异步后"
-            @change="updateLoopAsync('asyncAfter')"
-          />
-          <el-checkbox
-            v-model="loopInstanceForm.exclusive"
-            v-if="loopInstanceForm.asyncAfter || loopInstanceForm.asyncBefore"
-            label="排除"
-            @change="updateLoopAsync('exclusive')"
-          />
-        </el-form-item>
-        <el-form-item
-          label="重试周期"
-          prop="timeCycle"
-          v-if="loopInstanceForm.asyncAfter || loopInstanceForm.asyncBefore"
-          key="timeCycle"
-        >
-          <el-input v-model="loopInstanceForm.timeCycle" clearable @change="updateLoopTimeCycle" />
-        </el-form-item>
-      </template>
-    </el-form>
-  </div>
-</template>
-
-<script lang="ts" setup>
-defineOptions({ name: 'ElementMultiInstance' })
-
-const props = defineProps({
-  businessObject: Object,
-  type: String
-})
-const prefix = inject('prefix')
-const loopCharacteristics = ref('')
-//默认配置，用来覆盖原始不存在的选项，避免报错
-const defaultLoopInstanceForm = ref({
-  completionCondition: '',
-  loopCardinality: '',
-  extensionElements: [],
-  asyncAfter: false,
-  asyncBefore: false,
-  exclusive: false
-})
-const loopInstanceForm = ref<any>({})
-const bpmnElement = ref(null)
-const multiLoopInstance = ref(null)
-const bpmnInstances = () => (window as any)?.bpmnInstances
-
-const getElementLoop = (businessObject) => {
-  if (!businessObject.loopCharacteristics) {
-    loopCharacteristics.value = 'Null'
-    loopInstanceForm.value = {}
-    return
-  }
-  if (businessObject.loopCharacteristics.$type === 'bpmn:StandardLoopCharacteristics') {
-    loopCharacteristics.value = 'StandardLoop'
-    loopInstanceForm.value = {}
-    return
-  }
-  if (businessObject.loopCharacteristics.isSequential) {
-    loopCharacteristics.value = 'SequentialMultiInstance'
-  } else {
-    loopCharacteristics.value = 'ParallelMultiInstance'
-  }
-  // 合并配置
-  loopInstanceForm.value = {
-    ...defaultLoopInstanceForm.value,
-    ...businessObject.loopCharacteristics,
-    completionCondition: businessObject.loopCharacteristics?.completionCondition?.body ?? '',
-    loopCardinality: businessObject.loopCharacteristics?.loopCardinality?.body ?? ''
-  }
-  // 保留当前元素 businessObject 上的 loopCharacteristics 实例
-  multiLoopInstance.value = bpmnInstances().bpmnElement.businessObject.loopCharacteristics
-  // 更新表单
-  if (
-    businessObject.loopCharacteristics.extensionElements &&
-    businessObject.loopCharacteristics.extensionElements.values &&
-    businessObject.loopCharacteristics.extensionElements.values.length
-  ) {
-    loopInstanceForm.value['timeCycle'] =
-      businessObject.loopCharacteristics.extensionElements.values[0].body
-  }
-}
-
-const changeLoopCharacteristicsType = (type) => {
-  // this.loopInstanceForm = { ...this.defaultLoopInstanceForm }; // 切换类型取消原表单配置
-  // 取消多实例配置
-  if (type === 'Null') {
-    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
-      loopCharacteristics: null
-    })
-    return
-  }
-  // 配置循环
-  if (type === 'StandardLoop') {
-    const loopCharacteristicsObject = bpmnInstances().moddle.create(
-      'bpmn:StandardLoopCharacteristics'
-    )
-    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
-      loopCharacteristics: loopCharacteristicsObject
-    })
-    multiLoopInstance.value = null
-    return
-  }
-  // 时序
-  if (type === 'SequentialMultiInstance') {
-    multiLoopInstance.value = bpmnInstances().moddle.create(
-      'bpmn:MultiInstanceLoopCharacteristics',
-      { isSequential: true }
-    )
-  } else {
-    multiLoopInstance.value = bpmnInstances().moddle.create(
-      'bpmn:MultiInstanceLoopCharacteristics',
-      { collection: '${coll_userList}' }
-    )
-  }
-  bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
-    loopCharacteristics: toRaw(multiLoopInstance.value)
-  })
-}
-
-// 循环基数
-const updateLoopCardinality = (cardinality) => {
-  let loopCardinality = null
-  if (cardinality && cardinality.length) {
-    loopCardinality = bpmnInstances().moddle.create('bpmn:FormalExpression', {
-      body: cardinality
-    })
-  }
-  bpmnInstances().modeling.updateModdleProperties(
-    toRaw(bpmnElement.value),
-    multiLoopInstance.value,
-    {
-      loopCardinality
-    }
-  )
-}
-
-// 完成条件
-const updateLoopCondition = (condition) => {
-  let completionCondition = null
-  if (condition && condition.length) {
-    completionCondition = bpmnInstances().moddle.create('bpmn:FormalExpression', {
-      body: condition
-    })
-  }
-  bpmnInstances().modeling.updateModdleProperties(
-    toRaw(bpmnElement.value),
-    multiLoopInstance.value,
-    {
-      completionCondition
-    }
-  )
-}
-
-// 重试周期
-const updateLoopTimeCycle = (timeCycle) => {
-  const extensionElements = bpmnInstances().moddle.create('bpmn:ExtensionElements', {
-    values: [
-      bpmnInstances().moddle.create(`${prefix}:FailedJobRetryTimeCycle`, {
-        body: timeCycle
-      })
-    ]
-  })
-  bpmnInstances().modeling.updateModdleProperties(
-    toRaw(bpmnElement.value),
-    multiLoopInstance.value,
-    {
-      extensionElements
-    }
-  )
-}
-
-// 直接更新的基础信息
-const updateLoopBase = () => {
-  bpmnInstances().modeling.updateModdleProperties(
-    toRaw(bpmnElement.value),
-    multiLoopInstance.value,
-    {
-      collection: loopInstanceForm.value.collection || null,
-      elementVariable: loopInstanceForm.value.elementVariable || null
-    }
-  )
-}
-
-// 各异步状态
-const updateLoopAsync = (key) => {
-  const { asyncBefore, asyncAfter } = loopInstanceForm.value
-  let asyncAttr = Object.create(null)
-  if (!asyncBefore && !asyncAfter) {
-    // this.$set(this.loopInstanceForm, "exclusive", false);
-    loopInstanceForm.value['exclusive'] = false
-    asyncAttr = { asyncBefore: false, asyncAfter: false, exclusive: false, extensionElements: null }
-  } else {
-    asyncAttr[key] = loopInstanceForm.value[key]
-  }
-  bpmnInstances().modeling.updateModdleProperties(
-    toRaw(bpmnElement.value),
-    multiLoopInstance.value,
-    asyncAttr
-  )
-}
-
-const changeConfig = (config) => {
-  if (config === '依次审批') {
-    changeLoopCharacteristicsType('SequentialMultiInstance')
-    updateLoopCardinality('1')
-    updateLoopCondition('${ nrOfCompletedInstances >= nrOfInstances }')
-  } else if (config === '会签') {
-    changeLoopCharacteristicsType('ParallelMultiInstance')
-    updateLoopCondition('${ nrOfCompletedInstances >= nrOfInstances }')
-  } else if (config === '或签') {
-    changeLoopCharacteristicsType('ParallelMultiInstance')
-    updateLoopCondition('${ nrOfCompletedInstances > 0 }')
-  }
-}
-
-onBeforeUnmount(() => {
-  multiLoopInstance.value = null
-  bpmnElement.value = null
-})
-
-watch(
-  () => props.businessObject,
-  (val) => {
-    bpmnElement.value = bpmnInstances().bpmnElement
-    getElementLoop(val)
-  },
-  { immediate: true }
-)
-</script>
+<template>
+  <div class="panel-tab__content">
+    <el-form label-width="90px">
+      <el-form-item label="快捷配置">
+        <el-button size="small" @click="changeConfig('依次审批')">依次审批</el-button>
+        <el-button size="small" @click="changeConfig('会签')">会签</el-button>
+        <el-button size="small" @click="changeConfig('或签')">或签</el-button>
+      </el-form-item>
+      <el-form-item label="会签类型">
+        <el-select v-model="loopCharacteristics" @change="changeLoopCharacteristicsType" filterable>
+          <el-option label="并行多重事件" value="ParallelMultiInstance" />
+          <el-option label="时序多重事件" value="SequentialMultiInstance" />
+          <el-option label="无" value="Null" />
+        </el-select>
+      </el-form-item>
+      <template
+        v-if="
+          loopCharacteristics === 'ParallelMultiInstance' ||
+          loopCharacteristics === 'SequentialMultiInstance'
+        "
+      >
+        <el-form-item label="循环数量" key="loopCardinality">
+          <el-input
+            v-model="loopInstanceForm.loopCardinality"
+            clearable
+            @change="updateLoopCardinality"
+          />
+        </el-form-item>
+        <el-form-item label="集合" key="collection" v-show="false">
+          <el-input v-model="loopInstanceForm.collection" clearable @change="updateLoopBase" />
+        </el-form-item>
+        <!-- add by 芋艿：由于「元素变量」暂时用不到，所以这里 display 为 none -->
+        <el-form-item label="元素变量" key="elementVariable" style="display: none">
+          <el-input v-model="loopInstanceForm.elementVariable" clearable @change="updateLoopBase" />
+        </el-form-item>
+        <el-form-item label="完成条件" key="completionCondition">
+          <el-input
+            v-model="loopInstanceForm.completionCondition"
+            clearable
+            @change="updateLoopCondition"
+          />
+        </el-form-item>
+        <!-- add by 芋艿：由于「异步状态」暂时用不到，所以这里 display 为 none -->
+        <el-form-item label="异步状态" key="async" style="display: none">
+          <el-checkbox
+            v-model="loopInstanceForm.asyncBefore"
+            label="异步前"
+            @change="updateLoopAsync('asyncBefore')"
+          />
+          <el-checkbox
+            v-model="loopInstanceForm.asyncAfter"
+            label="异步后"
+            @change="updateLoopAsync('asyncAfter')"
+          />
+          <el-checkbox
+            v-model="loopInstanceForm.exclusive"
+            v-if="loopInstanceForm.asyncAfter || loopInstanceForm.asyncBefore"
+            label="排除"
+            @change="updateLoopAsync('exclusive')"
+          />
+        </el-form-item>
+        <el-form-item
+          label="重试周期"
+          prop="timeCycle"
+          v-if="loopInstanceForm.asyncAfter || loopInstanceForm.asyncBefore"
+          key="timeCycle"
+        >
+          <el-input v-model="loopInstanceForm.timeCycle" clearable @change="updateLoopTimeCycle" />
+        </el-form-item>
+      </template>
+    </el-form>
+  </div>
+</template>
+
+<script lang="ts" setup>
+defineOptions({ name: 'ElementMultiInstance' })
+
+const props = defineProps({
+  businessObject: Object,
+  type: String
+})
+const prefix = inject('prefix')
+const loopCharacteristics = ref('')
+//默认配置，用来覆盖原始不存在的选项，避免报错
+const defaultLoopInstanceForm = ref({
+  completionCondition: '',
+  loopCardinality: '',
+  extensionElements: [],
+  asyncAfter: false,
+  asyncBefore: false,
+  exclusive: false
+})
+const loopInstanceForm = ref<any>({})
+const bpmnElement = ref(null)
+const multiLoopInstance = ref(null)
+const bpmnInstances = () => (window as any)?.bpmnInstances
+
+const getElementLoop = (businessObject) => {
+  if (!businessObject.loopCharacteristics) {
+    loopCharacteristics.value = 'Null'
+    loopInstanceForm.value = {}
+    return
+  }
+  if (businessObject.loopCharacteristics.$type === 'bpmn:StandardLoopCharacteristics') {
+    loopCharacteristics.value = 'StandardLoop'
+    loopInstanceForm.value = {}
+    return
+  }
+  if (businessObject.loopCharacteristics.isSequential) {
+    loopCharacteristics.value = 'SequentialMultiInstance'
+  } else {
+    loopCharacteristics.value = 'ParallelMultiInstance'
+  }
+  // 合并配置
+  loopInstanceForm.value = {
+    ...defaultLoopInstanceForm.value,
+    ...businessObject.loopCharacteristics,
+    completionCondition: businessObject.loopCharacteristics?.completionCondition?.body ?? '',
+    loopCardinality: businessObject.loopCharacteristics?.loopCardinality?.body ?? ''
+  }
+  // 保留当前元素 businessObject 上的 loopCharacteristics 实例
+  multiLoopInstance.value = bpmnInstances().bpmnElement.businessObject.loopCharacteristics
+  // 更新表单
+  if (
+    businessObject.loopCharacteristics.extensionElements &&
+    businessObject.loopCharacteristics.extensionElements.values &&
+    businessObject.loopCharacteristics.extensionElements.values.length
+  ) {
+    loopInstanceForm.value['timeCycle'] =
+      businessObject.loopCharacteristics.extensionElements.values[0].body
+  }
+}
+
+const changeLoopCharacteristicsType = (type) => {
+  // this.loopInstanceForm = { ...this.defaultLoopInstanceForm }; // 切换类型取消原表单配置
+  // 取消多实例配置
+  if (type === 'Null') {
+    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+      loopCharacteristics: null
+    })
+    return
+  }
+  // 配置循环
+  if (type === 'StandardLoop') {
+    const loopCharacteristicsObject = bpmnInstances().moddle.create(
+      'bpmn:StandardLoopCharacteristics'
+    )
+    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+      loopCharacteristics: loopCharacteristicsObject
+    })
+    multiLoopInstance.value = null
+    return
+  }
+  // 时序
+  if (type === 'SequentialMultiInstance') {
+    multiLoopInstance.value = bpmnInstances().moddle.create(
+      'bpmn:MultiInstanceLoopCharacteristics',
+      { isSequential: true }
+    )
+  } else {
+    multiLoopInstance.value = bpmnInstances().moddle.create(
+      'bpmn:MultiInstanceLoopCharacteristics',
+      { collection: '${coll_userList}' }
+    )
+  }
+  bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+    loopCharacteristics: toRaw(multiLoopInstance.value)
+  })
+}
+
+// 循环基数
+const updateLoopCardinality = (cardinality) => {
+  let loopCardinality = null
+  if (cardinality && cardinality.length) {
+    loopCardinality = bpmnInstances().moddle.create('bpmn:FormalExpression', {
+      body: cardinality
+    })
+  }
+  bpmnInstances().modeling.updateModdleProperties(
+    toRaw(bpmnElement.value),
+    multiLoopInstance.value,
+    {
+      loopCardinality
+    }
+  )
+}
+
+// 完成条件
+const updateLoopCondition = (condition) => {
+  let completionCondition = null
+  if (condition && condition.length) {
+    completionCondition = bpmnInstances().moddle.create('bpmn:FormalExpression', {
+      body: condition
+    })
+  }
+  bpmnInstances().modeling.updateModdleProperties(
+    toRaw(bpmnElement.value),
+    multiLoopInstance.value,
+    {
+      completionCondition
+    }
+  )
+}
+
+// 重试周期
+const updateLoopTimeCycle = (timeCycle) => {
+  const extensionElements = bpmnInstances().moddle.create('bpmn:ExtensionElements', {
+    values: [
+      bpmnInstances().moddle.create(`${prefix}:FailedJobRetryTimeCycle`, {
+        body: timeCycle
+      })
+    ]
+  })
+  bpmnInstances().modeling.updateModdleProperties(
+    toRaw(bpmnElement.value),
+    multiLoopInstance.value,
+    {
+      extensionElements
+    }
+  )
+}
+
+// 直接更新的基础信息
+const updateLoopBase = () => {
+  bpmnInstances().modeling.updateModdleProperties(
+    toRaw(bpmnElement.value),
+    multiLoopInstance.value,
+    {
+      collection: loopInstanceForm.value.collection || null,
+      elementVariable: loopInstanceForm.value.elementVariable || null
+    }
+  )
+}
+
+// 各异步状态
+const updateLoopAsync = (key) => {
+  const { asyncBefore, asyncAfter } = loopInstanceForm.value
+  let asyncAttr = Object.create(null)
+  if (!asyncBefore && !asyncAfter) {
+    // this.$set(this.loopInstanceForm, "exclusive", false);
+    loopInstanceForm.value['exclusive'] = false
+    asyncAttr = { asyncBefore: false, asyncAfter: false, exclusive: false, extensionElements: null }
+  } else {
+    asyncAttr[key] = loopInstanceForm.value[key]
+  }
+  bpmnInstances().modeling.updateModdleProperties(
+    toRaw(bpmnElement.value),
+    multiLoopInstance.value,
+    asyncAttr
+  )
+}
+
+const changeConfig = (config) => {
+  if (config === '依次审批') {
+    changeLoopCharacteristicsType('SequentialMultiInstance')
+    updateLoopCardinality('1')
+    updateLoopCondition('${ nrOfCompletedInstances >= nrOfInstances }')
+  } else if (config === '会签') {
+    changeLoopCharacteristicsType('ParallelMultiInstance')
+    updateLoopCondition('${ nrOfCompletedInstances >= nrOfInstances }')
+  } else if (config === '或签') {
+    changeLoopCharacteristicsType('ParallelMultiInstance')
+    updateLoopCondition('${ nrOfCompletedInstances > 0 }')
+  }
+}
+
+onBeforeUnmount(() => {
+  multiLoopInstance.value = null
+  bpmnElement.value = null
+})
+
+watch(
+  () => props.businessObject,
+  (val) => {
+    bpmnElement.value = bpmnInstances().bpmnElement
+    getElementLoop(val)
+  },
+  { immediate: true }
+)
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue
index 83ed24eb..9a2eb6af 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue
@@ -1,125 +1,125 @@
-<template>
-  <div style="margin-top: 16px">
-    <el-form-item label="消息实例">
-      <div
-        style="
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          flex-wrap: nowrap;
-        "
-      >
-        <el-select v-model="bindMessageId" @change="updateTaskMessage">
-          <el-option
-            v-for="key in Object.keys(messageMap)"
-            :value="key"
-            :label="messageMap[key]"
-            :key="key"
-          />
-        </el-select>
-        <XButton
-          type="primary"
-          preIcon="ep:plus"
-          style="margin-left: 8px"
-          @click="openMessageModel"
-        />
-      </div>
-    </el-form-item>
-    <el-dialog
-      v-model="messageModelVisible"
-      :close-on-click-modal="false"
-      title="创建新消息"
-      width="400px"
-      append-to-body
-      destroy-on-close
-    >
-      <el-form :model="newMessageForm" size="small" label-width="90px">
-        <el-form-item label="消息ID">
-          <el-input v-model="newMessageForm.id" clearable />
-        </el-form-item>
-        <el-form-item label="消息名称">
-          <el-input v-model="newMessageForm.name" clearable />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <el-button size="small" type="primary" @click="createNewMessage">确 认</el-button>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script lang="ts" setup>
-defineOptions({ name: 'ReceiveTask' })
-const props = defineProps({
-  id: String,
-  type: String
-})
-
-const message = useMessage()
-
-const bindMessageId = ref('')
-const newMessageForm = ref<any>({})
-const messageMap = ref<any>({})
-const messageModelVisible = ref(false)
-const bpmnElement = ref<any>()
-const bpmnMessageRefsMap = ref<any>()
-const bpmnRootElements = ref<any>()
-
-const bpmnInstances = () => (window as any).bpmnInstances
-const getBindMessage = () => {
-  bpmnElement.value = bpmnInstances().bpmnElement
-  bindMessageId.value = bpmnElement.value.businessObject?.messageRef?.id || '-1'
-}
-const openMessageModel = () => {
-  messageModelVisible.value = true
-  newMessageForm.value = {}
-}
-const createNewMessage = () => {
-  if (messageMap.value[newMessageForm.value.id]) {
-    message.error('该消息已存在，请修改id后重新保存')
-    return
-  }
-  const newMessage = bpmnInstances().moddle.create('bpmn:Message', newMessageForm.value)
-  bpmnRootElements.value.push(newMessage)
-  messageMap.value[newMessageForm.value.id] = newMessageForm.value.name
-  bpmnMessageRefsMap.value[newMessageForm.value.id] = newMessage
-  messageModelVisible.value = false
-}
-const updateTaskMessage = (messageId) => {
-  if (messageId === '-1') {
-    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
-      messageRef: null
-    })
-  } else {
-    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
-      messageRef: bpmnMessageRefsMap.value[messageId]
-    })
-  }
-}
-
-onMounted(() => {
-  bpmnMessageRefsMap.value = Object.create(null)
-  bpmnRootElements.value = bpmnInstances().modeler.getDefinitions().rootElements
-  bpmnRootElements.value
-    .filter((el) => el.$type === 'bpmn:Message')
-    .forEach((m) => {
-      bpmnMessageRefsMap.value[m.id] = m
-      messageMap.value[m.id] = m.name
-    })
-  messageMap.value['-1'] = '无'
-})
-
-onBeforeUnmount(() => {
-  bpmnElement.value = null
-})
-watch(
-  () => props.id,
-  () => {
-    // bpmnElement.value = bpmnInstances().bpmnElement
-    nextTick(() => {
-      getBindMessage()
-    })
-  },
-  { immediate: true }
-)
-</script>
+<template>
+  <div style="margin-top: 16px">
+    <el-form-item label="消息实例">
+      <div
+        style="
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          flex-wrap: nowrap;
+        "
+      >
+        <el-select v-model="bindMessageId" @change="updateTaskMessage" filterable>
+          <el-option
+            v-for="key in Object.keys(messageMap)"
+            :value="key"
+            :label="messageMap[key]"
+            :key="key"
+          />
+        </el-select>
+        <XButton
+          type="primary"
+          preIcon="ep:plus"
+          style="margin-left: 8px"
+          @click="openMessageModel"
+        />
+      </div>
+    </el-form-item>
+    <el-dialog
+      v-model="messageModelVisible"
+      :close-on-click-modal="false"
+      title="创建新消息"
+      width="400px"
+      append-to-body
+      destroy-on-close
+    >
+      <el-form :model="newMessageForm" size="small" label-width="90px">
+        <el-form-item label="消息ID">
+          <el-input v-model="newMessageForm.id" clearable />
+        </el-form-item>
+        <el-form-item label="消息名称">
+          <el-input v-model="newMessageForm.name" clearable />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button size="small" type="primary" @click="createNewMessage">确 认</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script lang="ts" setup>
+defineOptions({ name: 'ReceiveTask' })
+const props = defineProps({
+  id: String,
+  type: String
+})
+
+const message = useMessage()
+
+const bindMessageId = ref('')
+const newMessageForm = ref<any>({})
+const messageMap = ref<any>({})
+const messageModelVisible = ref(false)
+const bpmnElement = ref<any>()
+const bpmnMessageRefsMap = ref<any>()
+const bpmnRootElements = ref<any>()
+
+const bpmnInstances = () => (window as any).bpmnInstances
+const getBindMessage = () => {
+  bpmnElement.value = bpmnInstances().bpmnElement
+  bindMessageId.value = bpmnElement.value.businessObject?.messageRef?.id || '-1'
+}
+const openMessageModel = () => {
+  messageModelVisible.value = true
+  newMessageForm.value = {}
+}
+const createNewMessage = () => {
+  if (messageMap.value[newMessageForm.value.id]) {
+    message.error('该消息已存在，请修改id后重新保存')
+    return
+  }
+  const newMessage = bpmnInstances().moddle.create('bpmn:Message', newMessageForm.value)
+  bpmnRootElements.value.push(newMessage)
+  messageMap.value[newMessageForm.value.id] = newMessageForm.value.name
+  bpmnMessageRefsMap.value[newMessageForm.value.id] = newMessage
+  messageModelVisible.value = false
+}
+const updateTaskMessage = (messageId) => {
+  if (messageId === '-1') {
+    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+      messageRef: null
+    })
+  } else {
+    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+      messageRef: bpmnMessageRefsMap.value[messageId]
+    })
+  }
+}
+
+onMounted(() => {
+  bpmnMessageRefsMap.value = Object.create(null)
+  bpmnRootElements.value = bpmnInstances().modeler.getDefinitions().rootElements
+  bpmnRootElements.value
+    .filter((el) => el.$type === 'bpmn:Message')
+    .forEach((m) => {
+      bpmnMessageRefsMap.value[m.id] = m
+      messageMap.value[m.id] = m.name
+    })
+  messageMap.value['-1'] = '无'
+})
+
+onBeforeUnmount(() => {
+  bpmnElement.value = null
+})
+watch(
+  () => props.id,
+  () => {
+    // bpmnElement.value = bpmnInstances().bpmnElement
+    nextTick(() => {
+      getBindMessage()
+    })
+  },
+  { immediate: true }
+)
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ScriptTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ScriptTask.vue
index 683fef3b..eb14b237 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/ScriptTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/ScriptTask.vue
@@ -1,99 +1,99 @@
-<template>
-  <div style="margin-top: 16px">
-    <el-form-item label="脚本格式">
-      <el-input
-        v-model="scriptTaskForm.scriptFormat"
-        clearable
-        @input="updateElementTask()"
-        @change="updateElementTask()"
-      />
-    </el-form-item>
-    <el-form-item label="脚本类型">
-      <el-select v-model="scriptTaskForm.scriptType">
-        <el-option label="内联脚本" value="inline" />
-        <el-option label="外部资源" value="external" />
-      </el-select>
-    </el-form-item>
-    <el-form-item label="脚本" v-show="scriptTaskForm.scriptType === 'inline'">
-      <el-input
-        v-model="scriptTaskForm.script"
-        type="textarea"
-        resize="vertical"
-        :autosize="{ minRows: 2, maxRows: 4 }"
-        clearable
-        @input="updateElementTask()"
-        @change="updateElementTask()"
-      />
-    </el-form-item>
-    <el-form-item label="资源地址" v-show="scriptTaskForm.scriptType === 'external'">
-      <el-input
-        v-model="scriptTaskForm.resource"
-        clearable
-        @input="updateElementTask()"
-        @change="updateElementTask()"
-      />
-    </el-form-item>
-    <el-form-item label="结果变量">
-      <el-input
-        v-model="scriptTaskForm.resultVariable"
-        clearable
-        @input="updateElementTask()"
-        @change="updateElementTask()"
-      />
-    </el-form-item>
-  </div>
-</template>
-
-<script lang="ts" setup>
-defineOptions({ name: 'ScriptTask' })
-const props = defineProps({
-  id: String,
-  type: String
-})
-const defaultTaskForm = ref({
-  scriptFormat: '',
-  script: '',
-  resource: '',
-  resultVariable: ''
-})
-const scriptTaskForm = ref<any>({})
-const bpmnElement = ref()
-
-const bpmnInstances = () => (window as any)?.bpmnInstances
-
-const resetTaskForm = () => {
-  for (let key in defaultTaskForm.value) {
-    let value = bpmnElement.value?.businessObject[key] || defaultTaskForm.value[key]
-    scriptTaskForm.value[key] = value
-  }
-  scriptTaskForm.value.scriptType = scriptTaskForm.value.script ? 'inline' : 'external'
-}
-const updateElementTask = () => {
-  let taskAttr = Object.create(null)
-  taskAttr.scriptFormat = scriptTaskForm.value.scriptFormat || null
-  taskAttr.resultVariable = scriptTaskForm.value.resultVariable || null
-  if (scriptTaskForm.value.scriptType === 'inline') {
-    taskAttr.script = scriptTaskForm.value.script || null
-    taskAttr.resource = null
-  } else {
-    taskAttr.resource = scriptTaskForm.value.resource || null
-    taskAttr.script = null
-  }
-  bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), taskAttr)
-}
-
-onBeforeUnmount(() => {
-  bpmnElement.value = null
-})
-
-watch(
-  () => props.id,
-  () => {
-    bpmnElement.value = bpmnInstances().bpmnElement
-    nextTick(() => {
-      resetTaskForm()
-    })
-  },
-  { immediate: true }
-)
-</script>
+<template>
+  <div style="margin-top: 16px">
+    <el-form-item label="脚本格式">
+      <el-input
+        v-model="scriptTaskForm.scriptFormat"
+        clearable
+        @input="updateElementTask()"
+        @change="updateElementTask()"
+      />
+    </el-form-item>
+    <el-form-item label="脚本类型">
+      <el-select v-model="scriptTaskForm.scriptType" filterable>
+        <el-option label="内联脚本" value="inline" />
+        <el-option label="外部资源" value="external" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="脚本" v-show="scriptTaskForm.scriptType === 'inline'">
+      <el-input
+        v-model="scriptTaskForm.script"
+        type="textarea"
+        resize="vertical"
+        :autosize="{ minRows: 2, maxRows: 4 }"
+        clearable
+        @input="updateElementTask()"
+        @change="updateElementTask()"
+      />
+    </el-form-item>
+    <el-form-item label="资源地址" v-show="scriptTaskForm.scriptType === 'external'">
+      <el-input
+        v-model="scriptTaskForm.resource"
+        clearable
+        @input="updateElementTask()"
+        @change="updateElementTask()"
+      />
+    </el-form-item>
+    <el-form-item label="结果变量">
+      <el-input
+        v-model="scriptTaskForm.resultVariable"
+        clearable
+        @input="updateElementTask()"
+        @change="updateElementTask()"
+      />
+    </el-form-item>
+  </div>
+</template>
+
+<script lang="ts" setup>
+defineOptions({ name: 'ScriptTask' })
+const props = defineProps({
+  id: String,
+  type: String
+})
+const defaultTaskForm = ref({
+  scriptFormat: '',
+  script: '',
+  resource: '',
+  resultVariable: ''
+})
+const scriptTaskForm = ref<any>({})
+const bpmnElement = ref()
+
+const bpmnInstances = () => (window as any)?.bpmnInstances
+
+const resetTaskForm = () => {
+  for (let key in defaultTaskForm.value) {
+    let value = bpmnElement.value?.businessObject[key] || defaultTaskForm.value[key]
+    scriptTaskForm.value[key] = value
+  }
+  scriptTaskForm.value.scriptType = scriptTaskForm.value.script ? 'inline' : 'external'
+}
+const updateElementTask = () => {
+  let taskAttr = Object.create(null)
+  taskAttr.scriptFormat = scriptTaskForm.value.scriptFormat || null
+  taskAttr.resultVariable = scriptTaskForm.value.resultVariable || null
+  if (scriptTaskForm.value.scriptType === 'inline') {
+    taskAttr.script = scriptTaskForm.value.script || null
+    taskAttr.resource = null
+  } else {
+    taskAttr.resource = scriptTaskForm.value.resource || null
+    taskAttr.script = null
+  }
+  bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), taskAttr)
+}
+
+onBeforeUnmount(() => {
+  bpmnElement.value = null
+})
+
+watch(
+  () => props.id,
+  () => {
+    bpmnElement.value = bpmnInstances().bpmnElement
+    nextTick(() => {
+      resetTaskForm()
+    })
+  },
+  { immediate: true }
+)
+</script>
diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
index c00885fd..3b0d84b4 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
@@ -1,185 +1,188 @@
-<template>
-  <el-form label-width='100px'>
-    <el-form-item label='规则类型' prop='candidateStrategy'>
-      <el-select
-          v-model='userTaskForm.candidateStrategy'
-          clearable
-          style='width: 100%'
-          @change='changeCandidateStrategy'
-      >
-        <el-option
-            v-for='dict in RuleTypeList'
-            :key='dict.code'
-            :label='dict.name'
-            :value='dict.code'
-        />
-      </el-select>
-    </el-form-item>
-    <el-form-item
-        v-if='userTaskForm.candidateStrategy == 10'
-        label='指定角色'
-        prop='candidateParam'
-    >
-      <el-select
-          v-model='userTaskForm.candidateParam'
-          clearable
-          multiple
-          style='width: 100%'
-          @change='updateElementTask'
-      >
-        <el-option v-for='item in roleOptions' :key='item.id' :label='item.name' :value='item.id' />
-      </el-select>
-    </el-form-item>
-    <el-form-item
-        v-if='userTaskForm.candidateStrategy == 20'
-        label='指定部门'
-        prop='candidateParam'
-        span='24'
-    >
-      <el-tree-select
-          ref='treeRef'
-          v-model='userTaskForm.candidateParam'
-          :data='deptTreeOptions'
-          :props='defaultProps'
-          empty-text='加载中，请稍后'
-          multiple
-          node-key='id'
-          show-checkbox
-          @change='updateElementTask'
-      />
-    </el-form-item>
-
-    <el-form-item
-        v-if='userTaskForm.candidateStrategy == 30'
-        label='指定用户'
-        prop='candidateParam'
-        span='24'
-    >
-      <el-select
-          v-model='userTaskForm.candidateParam'
-          clearable
-          multiple
-          style='width: 100%'
-          @change='updateElementTask'
-      >
-        <el-option
-            v-for='item in userOptions'
-            :key='item.id'
-            :label='item.name'
-            :value='item.id'
-        />
-      </el-select>
-    </el-form-item>
-
-  </el-form>
-</template>
-
-<script lang='ts' setup>
-import { defaultProps, handleTree } from '@/utils/tree'
-import { useDictData } from '@/stores/dictData'
-const dictData = useDictData()
-const RuleTypeList = ref()
-import { getRoleSimpleList } from '@/api/user-boot/role'
-import { getUserSimpleList } from '@/api/user-boot/user'
-
-defineOptions({ name: 'UserTask' })
-const props = defineProps({
-  id: String,
-  type: String
-})
-const userTaskForm = ref({
-  candidateStrategy: '', // 分配规则
-  candidateParam: [] // 分配选项
-})
-const bpmnElement = ref()
-const bpmnInstances = () => (window as any)?.bpmnInstances
-
-export interface optionVO {
-  id: string
-  name: string
-}
-
-const roleOptions = ref<optionVO[]>([]) // 角色列表
-const userOptions = ref<optionVO[]>([]) // 用户列表
-const deptTreeOptions = ref() // 部门树
-
-const resetTaskForm = () => {
-  const businessObject = bpmnElement.value.businessObject
-  if (!businessObject) {
-    return
-  }
-  if (businessObject.candidateStrategy != undefined) {
-    userTaskForm.value.candidateStrategy = businessObject.candidateStrategy
-  } else {
-    userTaskForm.value.candidateStrategy = undefined
-  }
-  if (businessObject.candidateParam && businessObject.candidateParam.length > 0) {
-    if (userTaskForm.value.candidateStrategy === 60) {
-      // 特殊：流程表达式，只有一个 input 输入框
-      userTaskForm.value.candidateParam = [businessObject.candidateParam]
-    } else {
-      userTaskForm.value.candidateParam = businessObject.candidateParam.split(',')
-    }
-  } else {
-    userTaskForm.value.candidateParam = []
-  }
-}
-
-/** 更新 candidateStrategy 字段时，需要清空 candidateParam，并触发 bpmn 图更新 */
-const changeCandidateStrategy = () => {
-  userTaskForm.value.candidateParam = []
-  updateElementTask()
-}
-
-/** 选中某个 options 时候，更新 bpmn 图  */
-const updateElementTask = () => {
-  bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
-    candidateStrategy: userTaskForm.value.candidateStrategy,
-    candidateParam: userTaskForm.value.candidateParam.join(',')
-  })
-}
-
-// 打开监听器弹窗
-const processExpressionDialogRef = ref()
-const openProcessExpressionDialog = async () => {
-  processExpressionDialogRef.value.open()
-}
-const selectProcessExpression = (expression) => {
-  userTaskForm.value.candidateParam = [expression.expression]
-}
-
-watch(
-    () => props.id,
-    () => {
-      bpmnElement.value = bpmnInstances().bpmnElement
-      nextTick(() => {
-        resetTaskForm()
-      })
-    },
-    { immediate: true }
-)
-
-
-onMounted(async () => {
-  // 获得角色列表
-  await getRoleSimpleList().then(res => {
-    roleOptions.value = res.data
-  })
-
-  // 获得用户列表
-  await getUserSimpleList().then(res => {
-    userOptions.value = res.data
-  })
-  //传入type的名称
-  RuleTypeList.value = dictData.getBasicData('rule_type')
-
-  //
-  // // 获得部门列表
-  // const deptOptions = await DeptApi.getSimpleDeptList()
-  // deptTreeOptions.value = handleTree(deptOptions, 'id')
-})
-
-onBeforeUnmount(() => {
-  bpmnElement.value = null
-})
-</script>
+<template>
+  <el-form label-width='100px'>
+    <el-form-item label='规则类型' prop='candidateStrategy'>
+      <el-select
+          v-model='userTaskForm.candidateStrategy'
+          clearable
+          style='width: 100%'
+          @change='changeCandidateStrategy'
+          filterable
+      >
+        <el-option
+            v-for='dict in RuleTypeList'
+            :key='dict.code'
+            :label='dict.name'
+            :value='dict.code'
+        />
+      </el-select>
+    </el-form-item>
+    <el-form-item
+        v-if='userTaskForm.candidateStrategy == 10'
+        label='指定角色'
+        prop='candidateParam'
+    >
+      <el-select
+          v-model='userTaskForm.candidateParam'
+          clearable
+          multiple
+          style='width: 100%'
+          @change='updateElementTask'
+          filterable
+      >
+        <el-option v-for='item in roleOptions' :key='item.id' :label='item.name' :value='item.id' />
+      </el-select>
+    </el-form-item>
+    <el-form-item
+        v-if='userTaskForm.candidateStrategy == 20'
+        label='指定部门'
+        prop='candidateParam'
+        span='24'
+    >
+      <el-tree-select
+          ref='treeRef'
+          v-model='userTaskForm.candidateParam'
+          :data='deptTreeOptions'
+          :props='defaultProps'
+          empty-text='加载中，请稍后'
+          multiple
+          node-key='id'
+          show-checkbox
+          @change='updateElementTask'
+      />
+    </el-form-item>
+
+    <el-form-item
+        v-if='userTaskForm.candidateStrategy == 30'
+        label='指定用户'
+        prop='candidateParam'
+        span='24'
+    >
+      <el-select
+          v-model='userTaskForm.candidateParam'
+          clearable
+          multiple
+          style='width: 100%'
+          @change='updateElementTask'
+          filterable
+      >
+        <el-option
+            v-for='item in userOptions'
+            :key='item.id'
+            :label='item.name'
+            :value='item.id'
+        />
+      </el-select>
+    </el-form-item>
+
+  </el-form>
+</template>
+
+<script lang='ts' setup>
+import { defaultProps, handleTree } from '@/utils/tree'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const RuleTypeList = ref()
+import { getRoleSimpleList } from '@/api/user-boot/role'
+import { getUserSimpleList } from '@/api/user-boot/user'
+
+defineOptions({ name: 'UserTask' })
+const props = defineProps({
+  id: String,
+  type: String
+})
+const userTaskForm = ref({
+  candidateStrategy: '', // 分配规则
+  candidateParam: [] // 分配选项
+})
+const bpmnElement = ref()
+const bpmnInstances = () => (window as any)?.bpmnInstances
+
+export interface optionVO {
+  id: string
+  name: string
+}
+
+const roleOptions = ref<optionVO[]>([]) // 角色列表
+const userOptions = ref<optionVO[]>([]) // 用户列表
+const deptTreeOptions = ref() // 部门树
+
+const resetTaskForm = () => {
+  const businessObject = bpmnElement.value.businessObject
+  if (!businessObject) {
+    return
+  }
+  if (businessObject.candidateStrategy != undefined) {
+    userTaskForm.value.candidateStrategy = businessObject.candidateStrategy
+  } else {
+    userTaskForm.value.candidateStrategy = undefined
+  }
+  if (businessObject.candidateParam && businessObject.candidateParam.length > 0) {
+    if (userTaskForm.value.candidateStrategy === 60) {
+      // 特殊：流程表达式，只有一个 input 输入框
+      userTaskForm.value.candidateParam = [businessObject.candidateParam]
+    } else {
+      userTaskForm.value.candidateParam = businessObject.candidateParam.split(',')
+    }
+  } else {
+    userTaskForm.value.candidateParam = []
+  }
+}
+
+/** 更新 candidateStrategy 字段时，需要清空 candidateParam，并触发 bpmn 图更新 */
+const changeCandidateStrategy = () => {
+  userTaskForm.value.candidateParam = []
+  updateElementTask()
+}
+
+/** 选中某个 options 时候，更新 bpmn 图  */
+const updateElementTask = () => {
+  bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+    candidateStrategy: userTaskForm.value.candidateStrategy,
+    candidateParam: userTaskForm.value.candidateParam.join(',')
+  })
+}
+
+// 打开监听器弹窗
+const processExpressionDialogRef = ref()
+const openProcessExpressionDialog = async () => {
+  processExpressionDialogRef.value.open()
+}
+const selectProcessExpression = (expression) => {
+  userTaskForm.value.candidateParam = [expression.expression]
+}
+
+watch(
+    () => props.id,
+    () => {
+      bpmnElement.value = bpmnInstances().bpmnElement
+      nextTick(() => {
+        resetTaskForm()
+      })
+    },
+    { immediate: true }
+)
+
+
+onMounted(async () => {
+  // 获得角色列表
+  await getRoleSimpleList().then(res => {
+    roleOptions.value = res.data
+  })
+
+  // 获得用户列表
+  await getUserSimpleList().then(res => {
+    userOptions.value = res.data
+  })
+  //传入type的名称
+  RuleTypeList.value = dictData.getBasicData('rule_type')
+
+  //
+  // // 获得部门列表
+  // const deptOptions = await DeptApi.getSimpleDeptList()
+  // deptTreeOptions.value = handleTree(deptOptions, 'id')
+})
+
+onBeforeUnmount(() => {
+  bpmnElement.value = null
+})
+</script>
diff --git a/src/components/form/datePicker/index.vue b/src/components/form/datePicker/index.vue
index c2dfaf86..3de64fc1 100644
--- a/src/components/form/datePicker/index.vue
+++ b/src/components/form/datePicker/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div :style="{ width: isMinuteData ? '750px' : '610px' }">
-        <el-select v-model="interval" style="min-width: 90px; width: 90px; margin-right: 10px" @change="timeChange">
+        <el-select v-model="interval" style="min-width: 90px; width: 90px; margin-right: 10px" @change="timeChange" filterable>
             <el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
 
diff --git a/src/components/tree/pqs/Terminal.vue b/src/components/tree/pqs/Terminal.vue
index 46036e29..d9e03fc4 100644
--- a/src/components/tree/pqs/Terminal.vue
+++ b/src/components/tree/pqs/Terminal.vue
@@ -1,8 +1,7 @@
 <template>
-
     <Tree ref="treRef" :data="tree" style="height: 100%" :width="'100%'" :expanded="expanded" />
 </template>
-    <!-- <div class="mb10">
+<!-- <div class="mb10">
         <el-button type="primary" icon="el-icon-Download" size="small" @click="exportExcelTemplate"   :loading="loading">模版下载</el-button>
         <el-button type="primary" icon="el-icon-Upload" size="small">导入</el-button>
         <el-button type="primary" icon="el-icon-Download" size="small" @click="ledgerEverywhere"  :loading="loading1">导出</el-button>
@@ -11,7 +10,7 @@
 import { ref, nextTick } from 'vue'
 import Tree from './index.vue'
 
-import { getTerminalTree,downTerminalTemplate,exportTerminalBase } from '@/api/device-boot/Business'
+import { getTerminalTree, downTerminalTemplate, exportTerminalBase } from '@/api/device-boot/Business'
 import { useConfig } from '@/stores/config'
 const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 defineOptions({
@@ -88,40 +87,48 @@ const info = (id: any) => {
         //         })
         //     })
         // } else {
-            res.data.forEach((item: any) => {
-                item.icon = 'el-icon-Menu'
-                item.plevel = item.level
-                item.level = (item.level + 1) * 100
-                item.children.forEach((item2: any) => {
-                    item2.icon = 'el-icon-HomeFilled'
-                    item2.plevel = item2.level
-                    item2.level = (item2.level + 1) * 100
-                    expanded.value.push(item2.id)
-                    item2.children.forEach((item3: any) => {
-                        item3.icon = 'el-icon-CollectionTag'
-                        item3.plevel = item3.level
-                        item3.level = (item3.level + 1) * 100
-                        item3.children.forEach((item4: any) => {
-                            item4.icon = 'el-icon-Flag'
-                            item4.plevel = item4.level
-                            item4.level = (item4.level + 1) * 100
-                            item4.children.forEach((item5: any) => {
-                                item5.icon = 'el-icon-OfficeBuilding'
-                                item5.plevel = item5.level
-                                item5.level = (item5.level == 7 ? 4 : item5.level + 1) * 100
-                                item5.children.forEach((item6: any) => {
-                                    item6.icon = 'el-icon-Film'
-                                    item6.plevel = item6.level
-                                    item6.level = (item6.level + 1) * 100
-                                    item6.children.forEach((item7: any) => {
-                                        item7.icon = 'el-icon-Share'
-                                        item7.plevel = item7.level
-                                        item7.level = (item7.level + 1) * 100
-                                        item7.children.forEach((item8: any) => {
-                                            item8.icon = 'el-icon-Location'
-                                            item8.plevel = item8.level
-                                            item8.level = (item8.level + 1) * 100
-                                        })
+        res.data.forEach((item: any) => {
+            item.icon = 'el-icon-Menu'
+            item.color = 'var(--el-color-primary)'
+            item.plevel = item.level
+            item.level = (item.level + 1) * 100
+            item.children.forEach((item2: any) => {
+                item2.icon = 'el-icon-HomeFilled'
+                item2.color = 'var(--el-color-primary)'
+                item2.plevel = item2.level
+                item2.level = (item2.level + 1) * 100
+                expanded.value.push(item2.id)
+                item2.children.forEach((item3: any) => {
+                    item3.icon = 'el-icon-CollectionTag'
+                    item3.color = 'var(--el-color-primary)'
+                    item3.plevel = item3.level
+                    item3.level = (item3.level + 1) * 100
+                    item3.children.forEach((item4: any) => {
+                        item4.icon = 'el-icon-Flag'
+                        item4.color = 'var(--el-color-primary)'
+                        item4.plevel = item4.level
+                        item4.level = (item4.level + 1) * 100
+                        item4.children.forEach((item5: any) => {
+                            item5.icon = 'el-icon-OfficeBuilding'
+                            item5.color = 'var(--el-color-primary)'
+                            item5.plevel = item5.level
+                            item5.level = (item5.level == 7 ? 4 : item5.level + 1) * 100
+                            item5.children.forEach((item6: any) => {
+                                item6.icon =
+                                    item6.children?.[0]?.children?.length > 0 ? 'el-icon-Film' : 'el-icon-Share'
+                                item6.color = 'var(--el-color-primary)'
+                                item6.plevel = item6.level
+                                item6.level = (item6.level + 1) * 100
+                                item6.children.forEach((item7: any) => {
+                                    item7.icon = item7.children.length > 0 ? 'el-icon-Share' : 'el-icon-Location'
+                                    item7.color = 'var(--el-color-primary)'
+                                    item7.plevel = item7.level
+                                    item7.level = (item7.level + 1) * 100
+                                    item7.children.forEach((item8: any) => {
+                                        item8.icon = 'el-icon-Location'
+                                        item8.color = 'var(--el-color-primary)'
+                                        item8.plevel = item8.level
+                                        item8.level = (item8.level + 1) * 100
                                     })
                                 })
                             })
@@ -129,6 +136,7 @@ const info = (id: any) => {
                     })
                 })
             })
+        })
         // }
 
         tree.value = res.data
@@ -149,7 +157,7 @@ const info = (id: any) => {
     })
 }
 // 下载模版
-const exportExcelTemplate = async() => {
+const exportExcelTemplate = async () => {
     loading.value = true
     downTerminalTemplate().then((res: any) => {
         let blob = new Blob([res], {
@@ -168,7 +176,7 @@ const exportExcelTemplate = async() => {
     }, 0)
 }
 // 导出台账
-const ledgerEverywhere = async() => {
+const ledgerEverywhere = async () => {
     loading1.value = true
     exportTerminalBase().then((res: any) => {
         let blob = new Blob([res], {
diff --git a/src/components/tree/pqs/pointTree.vue b/src/components/tree/pqs/pointTree.vue
index a2ae0a6c..7af8b6bc 100644
--- a/src/components/tree/pqs/pointTree.vue
+++ b/src/components/tree/pqs/pointTree.vue
@@ -6,6 +6,7 @@
             style="min-width: unset; padding: 10px 10px 0"
             @change="loadData"
             v-if="props.showSelect"
+            filterable
         >
             <el-option
                 v-for="item in classificationData"
diff --git a/src/layouts/admin/components/config.vue b/src/layouts/admin/components/config.vue
index 8ea32620..985b076a 100644
--- a/src/layouts/admin/components/config.vue
+++ b/src/layouts/admin/components/config.vue
@@ -1,452 +1,453 @@
-<template>
-    <div class="layout-config-drawer">
-        <el-drawer :model-value="configStore.layout.showDrawer" title="布局配置" size="310px" @close="onCloseDrawer">
-            <el-scrollbar class="layout-mode-style-scrollbar">
-                <el-form ref="formRef" :model="configStore.layout">
-                    <div class="layout-mode-styles-box">
-
-                        <el-divider border-style="dashed">布局方式</el-divider>
-                        <div class="layout-mode-box-style">
-                            <el-row class="layout-mode-box-style-row" :gutter="10">
-                                <el-col :span="12">
-                                    <div
-                                        @click="setLayoutMode('Default')"
-                                        class="layout-mode-style default"
-                                        :class="configStore.layout.layoutMode == 'Default' ? 'active' : ''"
-                                    >
-                                        <div class="layout-mode-style-box">
-                                            <div class="layout-mode-style-aside"></div>
-                                            <div class="layout-mode-style-container-box">
-                                                <div class="layout-mode-style-header"></div>
-                                                <div class="layout-mode-style-container"></div>
-                                            </div>
-                                        </div>
-                                        <div class="layout-mode-style-name">默认</div>
-                                    </div>
-                                </el-col>
-                                <el-col :span="12">
-                                    <div
-                                        @click="setLayoutMode('Classic')"
-                                        class="layout-mode-style classic"
-                                        :class="configStore.layout.layoutMode == 'Classic' ? 'active' : ''"
-                                    >
-                                        <div class="layout-mode-style-box">
-                                            <div class="layout-mode-style-aside"></div>
-                                            <div class="layout-mode-style-container-box">
-                                                <div class="layout-mode-style-header"></div>
-                                                <div class="layout-mode-style-container"></div>
-                                            </div>
-                                        </div>
-                                        <div class="layout-mode-style-name">经典</div>
-                                    </div>
-                                </el-col>
-                            </el-row>
-                            <el-row :gutter="10">
-                                <el-col :span="12">
-                                    <div
-                                        @click="setLayoutMode('Streamline')"
-                                        class="layout-mode-style streamline"
-                                        :class="configStore.layout.layoutMode == 'Streamline' ? 'active' : ''"
-                                    >
-                                        <div class="layout-mode-style-box">
-                                            <div class="layout-mode-style-container-box">
-                                                <div class="layout-mode-style-header"></div>
-                                                <div class="layout-mode-style-container"></div>
-                                            </div>
-                                        </div>
-                                        <div class="layout-mode-style-name">单栏</div>
-                                    </div>
-                                </el-col>
-                                
-                            </el-row>
-                        </div>
-
-
-
-
-
-                        <el-divider border-style="dashed">全局</el-divider>
-                        <div class="layout-config-global">
-                            <el-form-item label="后台页面切换动画">
-                                <el-select
-                                    @change="onCommitState($event, 'mainAnimation')"
-                                    :model-value="configStore.layout.mainAnimation"
-                                    :placeholder="'layouts.Please select an animation name'"
-                                >
-                                    <el-option label="slide-right" value="slide-right"></el-option>
-                                    <el-option label="slide-left" value="slide-left"></el-option>
-                                    <el-option label="el-fade-in-linear" value="el-fade-in-linear"></el-option>
-                                    <el-option label="el-fade-in" value="el-fade-in"></el-option>
-                                    <el-option label="el-zoom-in-center" value="el-zoom-in-center"></el-option>
-                                    <el-option label="el-zoom-in-top" value="el-zoom-in-top"></el-option>
-                                    <el-option label="el-zoom-in-bottom" value="el-zoom-in-bottom"></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="组件主题色">
-                                <el-color-picker
-                                    @change="onCommitColorState($event, 'elementUiPrimary')"
-                                    :model-value="configStore.getColorVal('elementUiPrimary')"
-                                />
-                            </el-form-item>
-                            <el-form-item label="表格标题栏背景颜色">
-                                <el-color-picker
-                                    @change="onCommitColorState($event, 'tableHeaderBackground')"
-                                    :model-value="configStore.getColorVal('tableHeaderBackground')"
-                                />
-                            </el-form-item>
-                            <el-form-item label="表格标题栏文字颜色">
-                                <el-color-picker
-                                    @change="onCommitColorState($event, 'tableHeaderColor')"
-                                    :model-value="configStore.getColorVal('tableHeaderColor')"
-                                />
-                            </el-form-item>
-                            <el-form-item label="表格激活栏颜色">
-                                <el-color-picker
-                                    @change="onCommitColorState($event, 'tableCurrent')"
-                                    :model-value="configStore.getColorVal('tableCurrent')"
-                                />
-                            </el-form-item>
-                        </div>
-                        <el-divider border-style="dashed">侧边栏</el-divider>
-                        <div class="layout-config-aside">
-                            <el-form-item label="侧边菜单栏背景色">
-                                <el-color-picker
-                                    @change="onCommitColorState($event, 'menuBackground')"
-                                    :model-value="configStore.getColorVal('menuBackground')"
-                                />
-                            </el-form-item>
-                            <el-form-item label="侧边菜单文字颜色">
-                                <el-color-picker
-                                    @change="onCommitColorState($event, 'menuColor')"
-                                    :model-value="configStore.getColorVal('menuColor')"
-                                />
-                            </el-form-item>
-                            <el-form-item label="侧边菜单激活项背景色">
-                                <el-color-picker
-                                    @change="onCommitColorState($event, 'menuActiveBackground')"
-                                    :model-value="configStore.getColorVal('menuActiveBackground')"
-                                />
-                            </el-form-item>
-                            <el-form-item label="侧边菜单激活项文字色">
-                                <el-color-picker
-                                    @change="onCommitColorState($event, 'menuActiveColor')"
-                                    :model-value="configStore.getColorVal('menuActiveColor')"
-                                />
-                            </el-form-item>
-                            <el-form-item label="显示侧边菜单顶栏(LOGO栏)">
-                                <el-switch
-                                    @change="onCommitState($event, 'menuShowTopBar')"
-                                    :model-value="configStore.layout.menuShowTopBar"
-                                ></el-switch>
-                            </el-form-item>
-                            <el-form-item label="侧边菜单顶栏背景色">
-                                <el-color-picker
-                                    @change="onCommitColorState($event, 'menuTopBarBackground')"
-                                    :model-value="configStore.getColorVal('menuTopBarBackground')"
-                                />
-                            </el-form-item>
-                            <el-form-item label="侧边菜单宽度(展开时)">
-                                <el-input
-                                    @input="onCommitState($event, 'menuWidth')"
-                                    type="number"
-                                    :step="10"
-                                    :model-value="configStore.layout.menuWidth"
-                                >
-                                    <template #append>px</template>
-                                </el-input>
-                            </el-form-item>
-                            <!--                            <el-form-item label="侧边菜单默认图标">-->
-                            <!--                                <IconSelector-->
-                            <!--                                    @change="onCommitMenuDefaultIcon($event, 'menuDefaultIcon')"-->
-                            <!--                                    :model-value="configStore.layout.menuDefaultIcon"-->
-                            <!--                                />-->
-                            <!--                            </el-form-item>-->
-                            <!--                            <el-form-item label="侧边菜单水平折叠">-->
-                            <!--                                <el-switch-->
-                            <!--                                    @change="onCommitState($event, 'menuCollapse')"-->
-                            <!--                                    :model-value="configStore.layout.menuCollapse"-->
-                            <!--                                ></el-switch>-->
-                            <!--                            </el-form-item>-->
-                            <!--                            <el-form-item label="侧边菜单手风琴">-->
-                            <!--                                <el-switch-->
-                            <!--                                    @change="onCommitState($event, 'menuUniqueOpened')"-->
-                            <!--                                    :model-value="configStore.layout.menuUniqueOpened"-->
-                            <!--                                ></el-switch>-->
-                            <!--                            </el-form-item>-->
-                        </div>
-
-                        <el-divider border-style="dashed">顶栏</el-divider>
-                        <div class="layout-config-aside">
-                            <el-form-item label="顶栏背景色">
-                                <el-color-picker
-                                    @change="onCommitColorState($event, 'headerBarBackground')"
-                                    :model-value="configStore.getColorVal('headerBarBackground')"
-                                />
-                            </el-form-item>
-                            <el-form-item label="顶栏文字色">
-                                <el-color-picker
-                                    @change="onCommitColorState($event, 'headerBarTabColor')"
-                                    :model-value="configStore.getColorVal('headerBarTabColor')"
-                                />
-                            </el-form-item>
-                            <!--                            <el-form-item label="顶栏悬停时背景色">-->
-                            <!--                                <el-color-picker-->
-                            <!--                                    @change="onCommitColorState($event, 'headerBarHoverBackground')"-->
-                            <!--                                    :model-value="configStore.getColorVal('headerBarHoverBackground')"-->
-                            <!--                                />-->
-                            <!--                            </el-form-item>-->
-                            <!--                            <el-form-item label="顶栏菜单激活项背景色">-->
-                            <!--                                <el-color-picker-->
-                            <!--                                    @change="onCommitColorState($event, 'headerBarTabActiveBackground')"-->
-                            <!--                                    :model-value="configStore.getColorVal('headerBarTabActiveBackground')"-->
-                            <!--                                />-->
-                            <!--                            </el-form-item>-->
-                            <!--                            <el-form-item label="顶栏菜单激活项文字色">-->
-                            <!--                                <el-color-picker-->
-                            <!--                                    @change="onCommitColorState($event, 'headerBarTabActiveColor')"-->
-                            <!--                                    :model-value="configStore.getColorVal('headerBarTabActiveColor')"-->
-                            <!--                                />-->
-                            <!--                            </el-form-item>-->
-                        </div>
-                        <el-popconfirm @confirm="restoreDefault" title="确定要恢复全部配置到默认值吗？">
-                            <template #reference>
-                                <div class="ba-center">
-                                    <el-button class="w80" type="info">恢复默认</el-button>
-                                </div>
-                            </template>
-                        </el-popconfirm>
-                    </div>
-                </el-form>
-            </el-scrollbar>
-        </el-drawer>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { useConfig } from '@/stores/config'
-import { useNavTabs } from '@/stores/navTabs'
-import { useRouter } from 'vue-router'
-import IconSelector from '@/components/baInput/components/iconSelector.vue'
-import { STORE_CONFIG } from '@/stores/constant/cacheKey'
-import { Local, Session } from '@/utils/storage'
-import type { Layout } from '@/stores/interface'
-
-const configStore = useConfig()
-const navTabs = useNavTabs()
-const router = useRouter()
-
-const onCommitState = (value: any, name: any) => {
-    configStore.setLayout(name, value)
-}
-
-const onCommitColorState = (value: string | null, name: keyof Layout) => {
-    if (value === null) return
-    const colors = configStore.layout[name] as string[]
-    if (configStore.layout.isDark) {
-        colors[1] = value
-    } else {
-        colors[0] = value
-    }
-    configStore.setLayout(name, colors)
-}
-
-const setLayoutMode = (mode: string) => {
-    configStore.setLayoutMode(mode)
-}
-
-// 修改默认菜单图标
-const onCommitMenuDefaultIcon = (value: any, name: any) => {
-    configStore.setLayout(name, value)
-
-    const menus = navTabs.state.tabsViewRoutes
-    navTabs.setTabsViewRoutes([])
-    setTimeout(() => {
-        navTabs.setTabsViewRoutes(menus)
-    }, 200)
-}
-
-const onCloseDrawer = () => {
-    configStore.setLayout('showDrawer', false)
-}
-
-const restoreDefault = () => {
-    Local.remove(STORE_CONFIG)
-    router.go(0)
-}
-</script>
-
-<style scoped lang="scss">
-
-
-.layout-config-drawer :deep(.el-input__inner) {
-    padding: 0 0 0 6px;
-}
-
-.layout-config-drawer :deep(.el-input-group__append) {
-    padding: 0 10px;
-}
-
-.layout-config-drawer :deep(.el-drawer__header) {
-    margin-bottom: 0 !important;
-}
-
-.layout-config-drawer :deep(.el-drawer__body) {
-    padding: 0;
-}
-
-.layout-mode-styles-box {
-    padding: 20px;
-}
-
-.layout-mode-box-style-row {
-    margin-bottom: 15px;
-}
-
-.layout-mode-style {
-    position: relative;
-    height: 100px;
-    border: 1px solid var(--el-border-color-light);
-    border-radius: var(--el-border-radius-small);
-
-    &:hover,
-    &.active {
-        border: 1px solid var(--el-color-primary);
-    }
-
-    .layout-mode-style-name {
-        position: absolute;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        color: var(--el-color-primary-light-5);
-        border-radius: 50%;
-        height: 50px;
-        width: 50px;
-        border: 1px solid var(--el-color-primary-light-3);
-    }
-
-    .layout-mode-style-box {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 100%;
-        height: 100%;
-    }
-
-    &.default {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-
-        .layout-mode-style-aside {
-            width: 18%;
-            height: 90%;
-            background-color: var(--el-border-color-lighter);
-        }
-
-        .layout-mode-style-container-box {
-            width: 68%;
-            height: 90%;
-            margin-left: 4%;
-
-            .layout-mode-style-header {
-                width: 100%;
-                height: 10%;
-                background-color: var(--el-border-color-lighter);
-            }
-
-            .layout-mode-style-container {
-                width: 100%;
-                height: 85%;
-                background-color: var(--el-border-color-extra-light);
-                margin-top: 5%;
-            }
-        }
-    }
-
-    &.classic {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-
-        .layout-mode-style-aside {
-            width: 18%;
-            height: 100%;
-            background-color: var(--el-border-color-lighter);
-        }
-
-        .layout-mode-style-container-box {
-            width: 82%;
-            height: 100%;
-
-            .layout-mode-style-header {
-                width: 100%;
-                height: 10%;
-                background-color: var(--el-border-color);
-            }
-
-            .layout-mode-style-container {
-                width: 100%;
-                height: 90%;
-                background-color: var(--el-border-color-extra-light);
-            }
-        }
-    }
-
-    &.streamline {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-
-        .layout-mode-style-container-box {
-            width: 100%;
-            height: 100%;
-
-            .layout-mode-style-header {
-                width: 100%;
-                height: 10%;
-                background-color: var(--el-border-color);
-            }
-
-            .layout-mode-style-container {
-                width: 100%;
-                height: 90%;
-                background-color: var(--el-border-color-extra-light);
-            }
-        }
-    }
-
-    &.double {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-
-        .layout-mode-style-aside {
-            width: 18%;
-            height: 100%;
-            background-color: var(--el-border-color);
-        }
-
-        .layout-mode-style-container-box {
-            width: 82%;
-            height: 100%;
-
-            .layout-mode-style-header {
-                width: 100%;
-                height: 10%;
-                background-color: var(--el-border-color);
-            }
-
-            .layout-mode-style-container {
-                width: 100%;
-                height: 90%;
-                background-color: var(--el-border-color-extra-light);
-            }
-        }
-    }
-}
-
-.w80 {
-    width: 90%;
-}
-</style>
+<template>
+    <div class="layout-config-drawer">
+        <el-drawer :model-value="configStore.layout.showDrawer" title="布局配置" size="310px" @close="onCloseDrawer">
+            <el-scrollbar class="layout-mode-style-scrollbar">
+                <el-form ref="formRef" :model="configStore.layout">
+                    <div class="layout-mode-styles-box">
+
+                        <el-divider border-style="dashed">布局方式</el-divider>
+                        <div class="layout-mode-box-style">
+                            <el-row class="layout-mode-box-style-row" :gutter="10">
+                                <el-col :span="12">
+                                    <div
+                                        @click="setLayoutMode('Default')"
+                                        class="layout-mode-style default"
+                                        :class="configStore.layout.layoutMode == 'Default' ? 'active' : ''"
+                                    >
+                                        <div class="layout-mode-style-box">
+                                            <div class="layout-mode-style-aside"></div>
+                                            <div class="layout-mode-style-container-box">
+                                                <div class="layout-mode-style-header"></div>
+                                                <div class="layout-mode-style-container"></div>
+                                            </div>
+                                        </div>
+                                        <div class="layout-mode-style-name">默认</div>
+                                    </div>
+                                </el-col>
+                                <el-col :span="12">
+                                    <div
+                                        @click="setLayoutMode('Classic')"
+                                        class="layout-mode-style classic"
+                                        :class="configStore.layout.layoutMode == 'Classic' ? 'active' : ''"
+                                    >
+                                        <div class="layout-mode-style-box">
+                                            <div class="layout-mode-style-aside"></div>
+                                            <div class="layout-mode-style-container-box">
+                                                <div class="layout-mode-style-header"></div>
+                                                <div class="layout-mode-style-container"></div>
+                                            </div>
+                                        </div>
+                                        <div class="layout-mode-style-name">经典</div>
+                                    </div>
+                                </el-col>
+                            </el-row>
+                            <el-row :gutter="10">
+                                <el-col :span="12">
+                                    <div
+                                        @click="setLayoutMode('Streamline')"
+                                        class="layout-mode-style streamline"
+                                        :class="configStore.layout.layoutMode == 'Streamline' ? 'active' : ''"
+                                    >
+                                        <div class="layout-mode-style-box">
+                                            <div class="layout-mode-style-container-box">
+                                                <div class="layout-mode-style-header"></div>
+                                                <div class="layout-mode-style-container"></div>
+                                            </div>
+                                        </div>
+                                        <div class="layout-mode-style-name">单栏</div>
+                                    </div>
+                                </el-col>
+                                
+                            </el-row>
+                        </div>
+
+
+
+
+
+                        <el-divider border-style="dashed">全局</el-divider>
+                        <div class="layout-config-global">
+                            <el-form-item label="后台页面切换动画">
+                                <el-select
+                                    @change="onCommitState($event, 'mainAnimation')"
+                                    :model-value="configStore.layout.mainAnimation"
+                                    :placeholder="'layouts.Please select an animation name'"
+                                    filterable
+                                >
+                                    <el-option label="slide-right" value="slide-right"></el-option>
+                                    <el-option label="slide-left" value="slide-left"></el-option>
+                                    <el-option label="el-fade-in-linear" value="el-fade-in-linear"></el-option>
+                                    <el-option label="el-fade-in" value="el-fade-in"></el-option>
+                                    <el-option label="el-zoom-in-center" value="el-zoom-in-center"></el-option>
+                                    <el-option label="el-zoom-in-top" value="el-zoom-in-top"></el-option>
+                                    <el-option label="el-zoom-in-bottom" value="el-zoom-in-bottom"></el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="组件主题色">
+                                <el-color-picker
+                                    @change="onCommitColorState($event, 'elementUiPrimary')"
+                                    :model-value="configStore.getColorVal('elementUiPrimary')"
+                                />
+                            </el-form-item>
+                            <el-form-item label="表格标题栏背景颜色">
+                                <el-color-picker
+                                    @change="onCommitColorState($event, 'tableHeaderBackground')"
+                                    :model-value="configStore.getColorVal('tableHeaderBackground')"
+                                />
+                            </el-form-item>
+                            <el-form-item label="表格标题栏文字颜色">
+                                <el-color-picker
+                                    @change="onCommitColorState($event, 'tableHeaderColor')"
+                                    :model-value="configStore.getColorVal('tableHeaderColor')"
+                                />
+                            </el-form-item>
+                            <el-form-item label="表格激活栏颜色">
+                                <el-color-picker
+                                    @change="onCommitColorState($event, 'tableCurrent')"
+                                    :model-value="configStore.getColorVal('tableCurrent')"
+                                />
+                            </el-form-item>
+                        </div>
+                        <el-divider border-style="dashed">侧边栏</el-divider>
+                        <div class="layout-config-aside">
+                            <el-form-item label="侧边菜单栏背景色">
+                                <el-color-picker
+                                    @change="onCommitColorState($event, 'menuBackground')"
+                                    :model-value="configStore.getColorVal('menuBackground')"
+                                />
+                            </el-form-item>
+                            <el-form-item label="侧边菜单文字颜色">
+                                <el-color-picker
+                                    @change="onCommitColorState($event, 'menuColor')"
+                                    :model-value="configStore.getColorVal('menuColor')"
+                                />
+                            </el-form-item>
+                            <el-form-item label="侧边菜单激活项背景色">
+                                <el-color-picker
+                                    @change="onCommitColorState($event, 'menuActiveBackground')"
+                                    :model-value="configStore.getColorVal('menuActiveBackground')"
+                                />
+                            </el-form-item>
+                            <el-form-item label="侧边菜单激活项文字色">
+                                <el-color-picker
+                                    @change="onCommitColorState($event, 'menuActiveColor')"
+                                    :model-value="configStore.getColorVal('menuActiveColor')"
+                                />
+                            </el-form-item>
+                            <el-form-item label="显示侧边菜单顶栏(LOGO栏)">
+                                <el-switch
+                                    @change="onCommitState($event, 'menuShowTopBar')"
+                                    :model-value="configStore.layout.menuShowTopBar"
+                                ></el-switch>
+                            </el-form-item>
+                            <el-form-item label="侧边菜单顶栏背景色">
+                                <el-color-picker
+                                    @change="onCommitColorState($event, 'menuTopBarBackground')"
+                                    :model-value="configStore.getColorVal('menuTopBarBackground')"
+                                />
+                            </el-form-item>
+                            <el-form-item label="侧边菜单宽度(展开时)">
+                                <el-input
+                                    @input="onCommitState($event, 'menuWidth')"
+                                    type="number"
+                                    :step="10"
+                                    :model-value="configStore.layout.menuWidth"
+                                >
+                                    <template #append>px</template>
+                                </el-input>
+                            </el-form-item>
+                            <!--                            <el-form-item label="侧边菜单默认图标">-->
+                            <!--                                <IconSelector-->
+                            <!--                                    @change="onCommitMenuDefaultIcon($event, 'menuDefaultIcon')"-->
+                            <!--                                    :model-value="configStore.layout.menuDefaultIcon"-->
+                            <!--                                />-->
+                            <!--                            </el-form-item>-->
+                            <!--                            <el-form-item label="侧边菜单水平折叠">-->
+                            <!--                                <el-switch-->
+                            <!--                                    @change="onCommitState($event, 'menuCollapse')"-->
+                            <!--                                    :model-value="configStore.layout.menuCollapse"-->
+                            <!--                                ></el-switch>-->
+                            <!--                            </el-form-item>-->
+                            <!--                            <el-form-item label="侧边菜单手风琴">-->
+                            <!--                                <el-switch-->
+                            <!--                                    @change="onCommitState($event, 'menuUniqueOpened')"-->
+                            <!--                                    :model-value="configStore.layout.menuUniqueOpened"-->
+                            <!--                                ></el-switch>-->
+                            <!--                            </el-form-item>-->
+                        </div>
+
+                        <el-divider border-style="dashed">顶栏</el-divider>
+                        <div class="layout-config-aside">
+                            <el-form-item label="顶栏背景色">
+                                <el-color-picker
+                                    @change="onCommitColorState($event, 'headerBarBackground')"
+                                    :model-value="configStore.getColorVal('headerBarBackground')"
+                                />
+                            </el-form-item>
+                            <el-form-item label="顶栏文字色">
+                                <el-color-picker
+                                    @change="onCommitColorState($event, 'headerBarTabColor')"
+                                    :model-value="configStore.getColorVal('headerBarTabColor')"
+                                />
+                            </el-form-item>
+                            <!--                            <el-form-item label="顶栏悬停时背景色">-->
+                            <!--                                <el-color-picker-->
+                            <!--                                    @change="onCommitColorState($event, 'headerBarHoverBackground')"-->
+                            <!--                                    :model-value="configStore.getColorVal('headerBarHoverBackground')"-->
+                            <!--                                />-->
+                            <!--                            </el-form-item>-->
+                            <!--                            <el-form-item label="顶栏菜单激活项背景色">-->
+                            <!--                                <el-color-picker-->
+                            <!--                                    @change="onCommitColorState($event, 'headerBarTabActiveBackground')"-->
+                            <!--                                    :model-value="configStore.getColorVal('headerBarTabActiveBackground')"-->
+                            <!--                                />-->
+                            <!--                            </el-form-item>-->
+                            <!--                            <el-form-item label="顶栏菜单激活项文字色">-->
+                            <!--                                <el-color-picker-->
+                            <!--                                    @change="onCommitColorState($event, 'headerBarTabActiveColor')"-->
+                            <!--                                    :model-value="configStore.getColorVal('headerBarTabActiveColor')"-->
+                            <!--                                />-->
+                            <!--                            </el-form-item>-->
+                        </div>
+                        <el-popconfirm @confirm="restoreDefault" title="确定要恢复全部配置到默认值吗？">
+                            <template #reference>
+                                <div class="ba-center">
+                                    <el-button class="w80" type="info">恢复默认</el-button>
+                                </div>
+                            </template>
+                        </el-popconfirm>
+                    </div>
+                </el-form>
+            </el-scrollbar>
+        </el-drawer>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { useConfig } from '@/stores/config'
+import { useNavTabs } from '@/stores/navTabs'
+import { useRouter } from 'vue-router'
+import IconSelector from '@/components/baInput/components/iconSelector.vue'
+import { STORE_CONFIG } from '@/stores/constant/cacheKey'
+import { Local, Session } from '@/utils/storage'
+import type { Layout } from '@/stores/interface'
+
+const configStore = useConfig()
+const navTabs = useNavTabs()
+const router = useRouter()
+
+const onCommitState = (value: any, name: any) => {
+    configStore.setLayout(name, value)
+}
+
+const onCommitColorState = (value: string | null, name: keyof Layout) => {
+    if (value === null) return
+    const colors = configStore.layout[name] as string[]
+    if (configStore.layout.isDark) {
+        colors[1] = value
+    } else {
+        colors[0] = value
+    }
+    configStore.setLayout(name, colors)
+}
+
+const setLayoutMode = (mode: string) => {
+    configStore.setLayoutMode(mode)
+}
+
+// 修改默认菜单图标
+const onCommitMenuDefaultIcon = (value: any, name: any) => {
+    configStore.setLayout(name, value)
+
+    const menus = navTabs.state.tabsViewRoutes
+    navTabs.setTabsViewRoutes([])
+    setTimeout(() => {
+        navTabs.setTabsViewRoutes(menus)
+    }, 200)
+}
+
+const onCloseDrawer = () => {
+    configStore.setLayout('showDrawer', false)
+}
+
+const restoreDefault = () => {
+    Local.remove(STORE_CONFIG)
+    router.go(0)
+}
+</script>
+
+<style scoped lang="scss">
+
+
+.layout-config-drawer :deep(.el-input__inner) {
+    padding: 0 0 0 6px;
+}
+
+.layout-config-drawer :deep(.el-input-group__append) {
+    padding: 0 10px;
+}
+
+.layout-config-drawer :deep(.el-drawer__header) {
+    margin-bottom: 0 !important;
+}
+
+.layout-config-drawer :deep(.el-drawer__body) {
+    padding: 0;
+}
+
+.layout-mode-styles-box {
+    padding: 20px;
+}
+
+.layout-mode-box-style-row {
+    margin-bottom: 15px;
+}
+
+.layout-mode-style {
+    position: relative;
+    height: 100px;
+    border: 1px solid var(--el-border-color-light);
+    border-radius: var(--el-border-radius-small);
+
+    &:hover,
+    &.active {
+        border: 1px solid var(--el-color-primary);
+    }
+
+    .layout-mode-style-name {
+        position: absolute;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: var(--el-color-primary-light-5);
+        border-radius: 50%;
+        height: 50px;
+        width: 50px;
+        border: 1px solid var(--el-color-primary-light-3);
+    }
+
+    .layout-mode-style-box {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        height: 100%;
+    }
+
+    &.default {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        .layout-mode-style-aside {
+            width: 18%;
+            height: 90%;
+            background-color: var(--el-border-color-lighter);
+        }
+
+        .layout-mode-style-container-box {
+            width: 68%;
+            height: 90%;
+            margin-left: 4%;
+
+            .layout-mode-style-header {
+                width: 100%;
+                height: 10%;
+                background-color: var(--el-border-color-lighter);
+            }
+
+            .layout-mode-style-container {
+                width: 100%;
+                height: 85%;
+                background-color: var(--el-border-color-extra-light);
+                margin-top: 5%;
+            }
+        }
+    }
+
+    &.classic {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        .layout-mode-style-aside {
+            width: 18%;
+            height: 100%;
+            background-color: var(--el-border-color-lighter);
+        }
+
+        .layout-mode-style-container-box {
+            width: 82%;
+            height: 100%;
+
+            .layout-mode-style-header {
+                width: 100%;
+                height: 10%;
+                background-color: var(--el-border-color);
+            }
+
+            .layout-mode-style-container {
+                width: 100%;
+                height: 90%;
+                background-color: var(--el-border-color-extra-light);
+            }
+        }
+    }
+
+    &.streamline {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        .layout-mode-style-container-box {
+            width: 100%;
+            height: 100%;
+
+            .layout-mode-style-header {
+                width: 100%;
+                height: 10%;
+                background-color: var(--el-border-color);
+            }
+
+            .layout-mode-style-container {
+                width: 100%;
+                height: 90%;
+                background-color: var(--el-border-color-extra-light);
+            }
+        }
+    }
+
+    &.double {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        .layout-mode-style-aside {
+            width: 18%;
+            height: 100%;
+            background-color: var(--el-border-color);
+        }
+
+        .layout-mode-style-container-box {
+            width: 82%;
+            height: 100%;
+
+            .layout-mode-style-header {
+                width: 100%;
+                height: 10%;
+                background-color: var(--el-border-color);
+            }
+
+            .layout-mode-style-container {
+                width: 100%;
+                height: 90%;
+                background-color: var(--el-border-color-extra-light);
+            }
+        }
+    }
+}
+
+.w80 {
+    width: 90%;
+}
+</style>
diff --git a/src/layouts/admin/router-view/main.vue b/src/layouts/admin/router-view/main.vue
index 4d87452c..c6004d0f 100644
--- a/src/layouts/admin/router-view/main.vue
+++ b/src/layouts/admin/router-view/main.vue
@@ -1,9 +1,13 @@
 <template>
     <el-main class="layout-main" :style="mainHeight()">
-        <router-view v-slot="{ Component }">
-            <transition :name="config.layout.mainAnimation">
+        <router-view v-slot="{ Component, route: viewRoute }">
+            <transition :name="config.layout.mainAnimation" mode="out-in">
                 <keep-alive :include="state.keepAliveComponentNameList">
-                    <component :is="Component" :key="state.componentKey || undefined" />
+                    <component
+                        :is="Component"
+                        v-if="Component"
+                        :key="state.componentKey || viewRoute.fullPath"
+                    />
                 </keep-alive>
             </transition>
         </router-view>
@@ -51,9 +55,10 @@ onBeforeMount(() => {
         state.keepAliveComponentNameList = state.keepAliveComponentNameList.filter(
             (name: string) => menu.meta.keepalive !== name
         )
-        state.componentKey = ''
+        // 临时换 key 强制卸载，再在 nextTick 恢复为路由 fullPath，避免 keep-alive 缓存错乱
+        state.componentKey = `${menu.fullPath || menu.path}__refresh__${Date.now()}`
         nextTick(() => {
-            state.componentKey = menu.path
+            state.componentKey = ''
             addKeepAliveComponentName(menu.meta.keepalive as string)
         })
     })
diff --git a/src/views/LN/newEnergy/newEnergyLedger/components/addForm.vue b/src/views/LN/newEnergy/newEnergyLedger/components/addForm.vue
index ba057b71..9b5c3c1e 100644
--- a/src/views/LN/newEnergy/newEnergyLedger/components/addForm.vue
+++ b/src/views/LN/newEnergy/newEnergyLedger/components/addForm.vue
@@ -1,147 +1,147 @@
-<template>
-    <!-- 新增 -->
-    <el-dialog draggable :title="title" v-model="userAdd" width="500px" :before-close="cancel">
-        <el-form :inline="true" ref="formRef" :model="addData" label-width="auto" class="form-one" :rules="rules">
-            <el-form-item label="新能源场站名称:" prop="name">
-                <el-input v-model="addData.name" clearable placeholder="请输入新能源场站名称"></el-input>
-            </el-form-item>
-
-            <el-form-item label="干扰源类型:" prop="stationType">
-                <el-select v-model="addData.stationType" clearable collapse-tags placeholder="请选择干扰源类型">
-                    <el-option v-for="item in newEnergy" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item label="电压等级:" prop="scale">
-                <el-select v-model="addData.scale" clearable collapse-tags placeholder="请选择电压等级">
-                    <el-option v-for="item in scaleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="额定有功功率(kW):" prop="ratedPower">
-                <el-input-number v-model="addData.ratedPower" :min="0" style="width: 100%" />
-            </el-form-item>
-            <el-form-item label="经度：" prop="longitude">
-                <el-input v-model="addData.longitude" type="text" placeholder="请输入经度" />
-            </el-form-item>
-            <el-form-item label="纬度：" prop="latitude">
-                <el-input v-model="addData.latitude" type="text" placeholder="请输入纬度" />
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <el-button @click="cancel">取消</el-button>
-            <el-button type="primary" @click="config">确定</el-button>
-        </template>
-    </el-dialog>
-</template>
-<script setup lang="ts">
-import { ref, reactive } from 'vue'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage } from 'element-plus'
-import { editNewStation } from '@/api/device-boot/newEnergy'
-const dictData = useDictData()
-const userAdd = ref(false)
-const title = ref('')
-const newEnergy = dictData.getBasicData('new_station_type')
-const scaleList = dictData.getBasicData('Dev_Voltage_Stand')
-const emit = defineEmits(['onSubmit'])
-const rules = reactive({
-    stationType: [{ required: true, message: '请选择干扰源类型', trigger: 'change' }],
-    scale: [{ required: true, message: '请选择电压等级', trigger: 'change' }],
-    name: [{ required: true, message: '请输入干扰源用户名称', trigger: 'blur' }],
-    ratedPower: [{ required: true, message: '请输入额定功率', trigger: 'blur' }],
-    longitude: [
-        {
-            required: true,
-            message: '请输入经度',
-            trigger: 'blur'
-        },
-        {
-            validator: (rule, value, callback) => {
-                if (!longitudeReg.test(value)) {
-                    callback(new Error('请输入有效的经度'))
-                } else {
-                    callback()
-                }
-            },
-            trigger: 'change'
-        }
-    ],
-    latitude: [
-        {
-            required: true,
-            message: '请输入纬度',
-            trigger: 'blur'
-        },
-        {
-            validator: (rule, value, callback) => {
-                if (!latitudeReg.test(value)) {
-                    callback(new Error('请输入有效的纬度'))
-                } else {
-                    callback()
-                }
-            },
-            trigger: 'change'
-        }
-    ]
-})
-// 经度正则表达式
-const longitudeReg = /^[-+]?((180(\.0{1,10})?)|(1[0-7][0-9](\.\d{1,10})?)|([1-9]?\d(\.\d{1,10})?)|(0(\.\d{1,10})?))$/
-// 纬度正则表达式
-const latitudeReg = /^[-+]?((90(\.0{1,10})?)|([1-8]?\d(\.\d{1,10})?)|(0(\.\d{1,10})?))$/
-
-const addData = ref({
-    scale: '',
-    stationType: '',
-    name: '',
-    ratedPower: 0,
-    longitude: '',
-    latitude: ''
-})
-const formRef = ref()
-// 新增
-const config = () => {
-    formRef.value.validate((valid: any) => {
-        if (valid) {
-            editNewStation(addData.value).then((res: any) => {
-                ElMessage.success(title.value + '成功!')
-                emit('onSubmit')
-                cancel()
-            })
-        }
-    })
-}
-// 重置
-const cancel = () => {
-    // formRef.value.resetFields()
-    userAdd.value = false
-}
-const open = (row: any) => {
-    addData.value = {
-        scale: '',
-        stationType: '',
-        name: '',
-        ratedPower: 0,
-        longitude: '',
-        latitude: ''
-    }
-    title.value = row.title
-    if (row.title === '修改') {
-        addData.value = {
-            id: row.row.id,
-            scale: row.row.scale,
-            stationType: row.row.stationType,
-            name: row.row.name,
-            ratedPower: row.row.ratedPower - 0,
-            longitude: row.row.longitude,
-            latitude: row.row.latitude
-        }
-    }
-    userAdd.value = true
-    setTimeout(() => {
-        formRef.value.clearValidate()
-    }, 20)
-}
-
-defineExpose({ open })
-</script>
-<style lang="scss" scoped></style>
+<template>
+    <!-- 新增 -->
+    <el-dialog draggable :title="title" v-model="userAdd" width="500px" :before-close="cancel">
+        <el-form :inline="true" ref="formRef" :model="addData" label-width="auto" class="form-one" :rules="rules">
+            <el-form-item label="新能源场站名称:" prop="name">
+                <el-input v-model="addData.name" clearable placeholder="请输入新能源场站名称"></el-input>
+            </el-form-item>
+
+            <el-form-item label="干扰源类型:" prop="stationType">
+                <el-select v-model="addData.stationType" clearable collapse-tags placeholder="请选择干扰源类型" filterable>
+                    <el-option v-for="item in newEnergy" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="电压等级:" prop="scale">
+                <el-select v-model="addData.scale" clearable collapse-tags placeholder="请选择电压等级" filterable>
+                    <el-option v-for="item in scaleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="额定有功功率(kW):" prop="ratedPower">
+                <el-input-number v-model="addData.ratedPower" :min="0" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="经度：" prop="longitude">
+                <el-input v-model="addData.longitude" type="text" placeholder="请输入经度" />
+            </el-form-item>
+            <el-form-item label="纬度：" prop="latitude">
+                <el-input v-model="addData.latitude" type="text" placeholder="请输入纬度" />
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <el-button @click="cancel">取消</el-button>
+            <el-button type="primary" @click="config">确定</el-button>
+        </template>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import { ElMessage } from 'element-plus'
+import { editNewStation } from '@/api/device-boot/newEnergy'
+const dictData = useDictData()
+const userAdd = ref(false)
+const title = ref('')
+const newEnergy = dictData.getBasicData('new_station_type')
+const scaleList = dictData.getBasicData('Dev_Voltage_Stand')
+const emit = defineEmits(['onSubmit'])
+const rules = reactive({
+    stationType: [{ required: true, message: '请选择干扰源类型', trigger: 'change' }],
+    scale: [{ required: true, message: '请选择电压等级', trigger: 'change' }],
+    name: [{ required: true, message: '请输入干扰源用户名称', trigger: 'blur' }],
+    ratedPower: [{ required: true, message: '请输入额定功率', trigger: 'blur' }],
+    longitude: [
+        {
+            required: true,
+            message: '请输入经度',
+            trigger: 'blur'
+        },
+        {
+            validator: (rule, value, callback) => {
+                if (!longitudeReg.test(value)) {
+                    callback(new Error('请输入有效的经度'))
+                } else {
+                    callback()
+                }
+            },
+            trigger: 'change'
+        }
+    ],
+    latitude: [
+        {
+            required: true,
+            message: '请输入纬度',
+            trigger: 'blur'
+        },
+        {
+            validator: (rule, value, callback) => {
+                if (!latitudeReg.test(value)) {
+                    callback(new Error('请输入有效的纬度'))
+                } else {
+                    callback()
+                }
+            },
+            trigger: 'change'
+        }
+    ]
+})
+// 经度正则表达式
+const longitudeReg = /^[-+]?((180(\.0{1,10})?)|(1[0-7][0-9](\.\d{1,10})?)|([1-9]?\d(\.\d{1,10})?)|(0(\.\d{1,10})?))$/
+// 纬度正则表达式
+const latitudeReg = /^[-+]?((90(\.0{1,10})?)|([1-8]?\d(\.\d{1,10})?)|(0(\.\d{1,10})?))$/
+
+const addData = ref({
+    scale: '',
+    stationType: '',
+    name: '',
+    ratedPower: 0,
+    longitude: '',
+    latitude: ''
+})
+const formRef = ref()
+// 新增
+const config = () => {
+    formRef.value.validate((valid: any) => {
+        if (valid) {
+            editNewStation(addData.value).then((res: any) => {
+                ElMessage.success(title.value + '成功!')
+                emit('onSubmit')
+                cancel()
+            })
+        }
+    })
+}
+// 重置
+const cancel = () => {
+    // formRef.value.resetFields()
+    userAdd.value = false
+}
+const open = (row: any) => {
+    addData.value = {
+        scale: '',
+        stationType: '',
+        name: '',
+        ratedPower: 0,
+        longitude: '',
+        latitude: ''
+    }
+    title.value = row.title
+    if (row.title === '修改') {
+        addData.value = {
+            id: row.row.id,
+            scale: row.row.scale,
+            stationType: row.row.stationType,
+            name: row.row.name,
+            ratedPower: row.row.ratedPower - 0,
+            longitude: row.row.longitude,
+            latitude: row.row.latitude
+        }
+    }
+    userAdd.value = true
+    setTimeout(() => {
+        formRef.value.clearValidate()
+    }, 20)
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/views/pqs/auditManage/auditList/index.vue b/src/views/pqs/auditManage/auditList/index.vue
index def213f5..5b4b2702 100644
--- a/src/views/pqs/auditManage/auditList/index.vue
+++ b/src/views/pqs/auditManage/auditList/index.vue
@@ -20,7 +20,7 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="事件类型:">
-                            <el-select v-model="tableStore.table.params.type" placeholder="事件类型" clearable>
+                            <el-select v-model="tableStore.table.params.type" placeholder="事件类型" clearable filterable>
                                 <el-option
                                     v-for="item in eventType"
                                     :key="item.id"
@@ -30,7 +30,7 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="操作类型:">
-                            <el-select v-model="tableStore.table.params.operateType" placeholder="操作类型" clearable>
+                            <el-select v-model="tableStore.table.params.operateType" placeholder="操作类型" clearable filterable>
                                 <el-option
                                     v-for="item in operationType"
                                     :key="item.value"
@@ -40,7 +40,7 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="操作结果:">
-                            <el-select v-model="tableStore.table.params.result" placeholder="操作结果" clearable>
+                            <el-select v-model="tableStore.table.params.result" placeholder="操作结果" clearable filterable>
                                 <el-option
                                     v-for="item in resultList"
                                     :key="item.id"
diff --git a/src/views/pqs/auditManage/auditList/statistics.vue b/src/views/pqs/auditManage/auditList/statistics.vue
index 97abdbb5..ace64efb 100644
--- a/src/views/pqs/auditManage/auditList/statistics.vue
+++ b/src/views/pqs/auditManage/auditList/statistics.vue
@@ -13,7 +13,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="事件类型:">
-                    <el-select v-model="tableStore.table.params.type" placeholder="事件类型" clearable>
+                    <el-select v-model="tableStore.table.params.type" placeholder="事件类型" clearable filterable>
                         <el-option
                             v-for="item in eventType"
                             :key="item.id"
@@ -23,7 +23,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="操作类型:">
-                    <el-select v-model="tableStore.table.params.operateType" placeholder="操作类型" clearable>
+                    <el-select v-model="tableStore.table.params.operateType" placeholder="操作类型" clearable filterable>
                         <el-option
                             v-for="item in operationType"
                             :key="item.value"
diff --git a/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue b/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue
index e8ae0446..1680486f 100644
--- a/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue
+++ b/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue
@@ -17,7 +17,7 @@
                         style="max-width: 500px; margin: auto"
                     >
                         <el-form-item label="用户模式" prop="userMode">
-                            <el-select v-model="form.userMode" placeholder="请选择用户模式">
+                            <el-select v-model="form.userMode" placeholder="请选择用户模式" filterable>
                                 <el-option
                                     v-for="item in ModeList"
                                     :key="item.id"
@@ -31,6 +31,7 @@
                                 v-model="form.ptType"
                                 @change="form.connectionMode = ''"
                                 placeholder="请选择接线类型"
+                                filterable
                             >
                                 <el-option
                                     v-for="item in connection"
@@ -46,12 +47,12 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="功率因数" prop="k">
-                            <el-select v-model="form.k" clearable placeholder="请选择功率因数">
+                            <el-select v-model="form.k" clearable placeholder="请选择功率因数" filterable>
                                 <el-option v-for="item in factor" :key="item.id" :label="item.name" :value="item.id" />
                             </el-select>
                         </el-form-item>
                         <el-form-item label="电压等级" prop="scale">
-                            <el-select v-model="form.scale" clearable placeholder="请选择电压等级">
+                            <el-select v-model="form.scale" clearable placeholder="请选择电压等级" filterable> 
                                 <el-option
                                     v-for="item in levelList"
                                     :key="item.id"
@@ -91,6 +92,7 @@
                             style="width: 240px"
                             :disabled="props.rowList.id != undefined"
                             @change="selChange"
+                            filterable
                         >
                             <el-option
                                 v-for="item in userData"
diff --git a/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
index a4c6026c..dbb03159 100644
--- a/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
+++ b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
@@ -83,6 +83,7 @@
                                         v-model="harmonicValue"
                                         placeholder="请选择谐波"
                                         @change="amplitudeQuery"
+                                        filterable
                                     >
                                         <el-option
                                             v-for="item in harmonic"
diff --git a/src/views/pqs/bearingCapacity/evaluationList/index.vue b/src/views/pqs/bearingCapacity/evaluationList/index.vue
index 8500afa8..2d4c560f 100644
--- a/src/views/pqs/bearingCapacity/evaluationList/index.vue
+++ b/src/views/pqs/bearingCapacity/evaluationList/index.vue
@@ -8,6 +8,7 @@
                             v-model="tableStore.table.params.evaluateType"
                             clearable
                             placeholder="请选择评估类型"
+                            filterable
                         >
                             <el-option v-for="item in uesrList" :key="item.id" :label="item.name" :value="item.id" />
                         </el-select>
diff --git a/src/views/pqs/bearingCapacity/userManagement/equipment.vue b/src/views/pqs/bearingCapacity/userManagement/equipment.vue
index da2501b3..45b0dea8 100644
--- a/src/views/pqs/bearingCapacity/userManagement/equipment.vue
+++ b/src/views/pqs/bearingCapacity/userManagement/equipment.vue
@@ -31,7 +31,7 @@
                 />
             </el-form-item>
             <el-form-item label="电压等级" prop="devScale">
-                <el-select v-model="form.devScale" clearable placeholder="请选择电压等级">
+                <el-select v-model="form.devScale" clearable placeholder="请选择电压等级" filterable>
                     <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
             </el-form-item>
diff --git a/src/views/pqs/bearingCapacity/userManagement/index.vue b/src/views/pqs/bearingCapacity/userManagement/index.vue
index 77200662..e5655554 100644
--- a/src/views/pqs/bearingCapacity/userManagement/index.vue
+++ b/src/views/pqs/bearingCapacity/userManagement/index.vue
@@ -8,6 +8,7 @@
                             v-model.trim="tableStore.table.params.userType"
                             clearable
                             placeholder="请选择用户类型"
+                            filterable
                         >
                             <el-option v-for="item in uesrList" :key="item.id" :label="item.name" :value="item.id" />
                         </el-select>
@@ -21,7 +22,7 @@
             <el-dialog draggable v-model="dialogVisible" :title="title" width="600" :before-close="handleClose">
                 <el-form ref="ruleFormRef" :model="form" label-width="170px" :disabled="disabled" :rules="rules">
                     <el-form-item label="用户类型：" prop="userType">
-                        <el-select v-model="form.userType" clearable placeholder="请选择用户类型" @change="useChange">
+                        <el-select v-model="form.userType" clearable placeholder="请选择用户类型" @change="useChange" filterable>
                             <el-option v-for="item in uesrList" :key="item.id" :label="item.name" :value="item.id" />
                         </el-select>
                     </el-form-item>
@@ -36,7 +37,7 @@
                     </el-form-item>
 
                     <el-form-item label="电压等级：" prop="voltage">
-                        <el-select v-model="form.voltage" clearable collapse-tags placeholder="请选择电压等级">
+                        <el-select v-model="form.voltage" clearable collapse-tags placeholder="请选择电压等级" filterable>
                             <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.id" />
                         </el-select>
                     </el-form-item>
diff --git a/src/views/pqs/business/log/TerminalLog/index.vue b/src/views/pqs/business/log/TerminalLog/index.vue
index 4f773e94..ac984980 100644
--- a/src/views/pqs/business/log/TerminalLog/index.vue
+++ b/src/views/pqs/business/log/TerminalLog/index.vue
@@ -3,7 +3,7 @@
         <TableHeader datePicker showExport>
             <template v-slot:select>
                 <el-form-item label="日志类型">
-                    <el-select v-model="tableStore.table.params.type" clearable placeholder="请选择日志类型">
+                    <el-select v-model="tableStore.table.params.type" clearable placeholder="请选择日志类型" filterable>
                         <el-option v-for="item in fontdveoption" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
diff --git a/src/views/pqs/business/terminal/FrontManagement/index.vue b/src/views/pqs/business/terminal/FrontManagement/index.vue
index a02ea880..14975e93 100644
--- a/src/views/pqs/business/terminal/FrontManagement/index.vue
+++ b/src/views/pqs/business/terminal/FrontManagement/index.vue
@@ -9,6 +9,7 @@
                                 v-model="tableStore.table.params.nodeGrade"
                                 clearable
                                 placeholder="请选择前置等级"
+                                filterable
                             >
                                 <el-option
                                     v-for="item in fontdveoption"
@@ -19,7 +20,7 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="状态">
-                            <el-select v-model="tableStore.table.params.searchState" clearable placeholder="请选择状态">
+                            <el-select v-model="tableStore.table.params.searchState" clearable placeholder="请选择状态" filterable>
                                 <el-option
                                     v-for="item in statusoption"
                                     :key="item.id"
@@ -137,7 +138,7 @@
                     <el-input v-model="formData.ip" placeholder="请输入Ip"></el-input>
                 </el-form-item>
                 <el-form-item label="等级:" prop="nodeGrade" class="top">
-                    <el-select v-model="formData.nodeGrade" placeholder="请选择等级" style="width: 100%">
+                    <el-select v-model="formData.nodeGrade" placeholder="请选择等级" style="width: 100%" filterable>
                         <el-option
                             v-for="item in fontdveoption"
                             :key="item.id"
@@ -192,7 +193,7 @@
         <Bind ref="bindRef" />
         <!-- 绑定进程号 -->
         <el-dialog draggable title="绑定进程号" v-model="popUps" :close-on-click-modal="false" width="400px">
-            <el-select v-model="processNo" placeholder="请选择进程号" style="width: 100%">
+            <el-select v-model="processNo" placeholder="请选择进程号" style="width: 100%" filterable>
                 <el-option
                     v-for="item in dataSource"
                     :key="item.name"
diff --git a/src/views/pqs/business/terminal/ProgramManagement/index.vue b/src/views/pqs/business/terminal/ProgramManagement/index.vue
index 74e319c7..4502afc8 100644
--- a/src/views/pqs/business/terminal/ProgramManagement/index.vue
+++ b/src/views/pqs/business/terminal/ProgramManagement/index.vue
@@ -3,7 +3,7 @@
         <TableHeader>
             <template #select>
                 <el-form-item label="终端型号">
-                    <el-select v-model="tableStore.table.params.devType" clearable placeholder="请选择终端型号">
+                    <el-select v-model="tableStore.table.params.devType" clearable placeholder="请选择终端型号" filterable>
                         <el-option
                             v-for="item in teriminaloption"
                             :key="item.id"
@@ -13,7 +13,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="终端状态">
-                    <el-select v-model="tableStore.table.params.runFlag" clearable placeholder="请选择终端状态">
+                    <el-select v-model="tableStore.table.params.runFlag" clearable placeholder="请选择终端状态" filterable>
                         <el-option
                             v-for="item in teriminalstatusoption"
                             :key="item.id"
@@ -23,7 +23,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="通讯状态">
-                    <el-select v-model="tableStore.table.params.comFlag" clearable placeholder="请选择通讯状态">
+                    <el-select v-model="tableStore.table.params.comFlag" clearable placeholder="请选择通讯状态" filterable>
                         <el-option
                             v-for="item in stateoption"
                             :key="item.id"
@@ -33,7 +33,7 @@
                     </el-select>
                 </el-form-item>
                 <!-- <el-form-item label="程序版本">
-                    <el-select v-model="tableStore.table.params.program" clearable placeholder="请选择程序版本">
+                    <el-select v-model="tableStore.table.params.program" clearable placeholder="请选择程序版本" filterable>
                         <el-option
                             v-for="item in programoption"
                             :key="item.id"
diff --git a/src/views/pqs/business/terminal/TerminalManagement/components/disposition.vue b/src/views/pqs/business/terminal/TerminalManagement/components/disposition.vue
index 3de7a332..86577162 100644
--- a/src/views/pqs/business/terminal/TerminalManagement/components/disposition.vue
+++ b/src/views/pqs/business/terminal/TerminalManagement/components/disposition.vue
@@ -4,7 +4,7 @@
     <el-dialog draggable :title="title" v-model="dialogVisible" width="50%" :before-close="cancel">
         <el-form :inline="true" :model="formInline" style="display: flex; justify-content: space-between">
             <el-form-item label="终端状态">
-                <el-select v-model="formInline.state" placeholder="Select" size="large" style="width: 240px">
+                <el-select v-model="formInline.state" placeholder="Select" size="large" style="width: 240px" filterable>
                     <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </el-form-item>
diff --git a/src/views/pqs/business/terminal/TerminalManagement/index.vue b/src/views/pqs/business/terminal/TerminalManagement/index.vue
index e0db839c..091c52cc 100644
--- a/src/views/pqs/business/terminal/TerminalManagement/index.vue
+++ b/src/views/pqs/business/terminal/TerminalManagement/index.vue
@@ -18,7 +18,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="终端状态">
-                    <el-select v-model="tableStore.table.params.runFlag" clearable placeholder="请选择终端状态">
+                    <el-select v-model="tableStore.table.params.runFlag" clearable placeholder="请选择终端状态" filterable>
                         <el-option
                             v-for="item in teriminalstatusoption"
                             :key="item.id"
@@ -28,7 +28,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="通讯状态">
-                    <el-select v-model="tableStore.table.params.comFlag" clearable placeholder="请选择通讯状态">
+                    <el-select v-model="tableStore.table.params.comFlag" clearable placeholder="请选择通讯状态" filterable>
                         <el-option
                             v-for="item in stateoption"
                             :key="item.id"
diff --git a/src/views/pqs/business/terminal/deviceter/index.vue b/src/views/pqs/business/terminal/deviceter/index.vue
index 42515969..377bee11 100644
--- a/src/views/pqs/business/terminal/deviceter/index.vue
+++ b/src/views/pqs/business/terminal/deviceter/index.vue
@@ -2005,28 +2005,28 @@ const arrdess: any = ref((rule: any, value: any, callback: any) => {
     }
 })
 
-/**经度 */
-const lngff: any = ref((rule: any, value: any, callback: any) => {
-    let reg1 = /^(([1-9]\d?)|(1[0-7]\d))(\.\d{1,6})|180|0(\.\d{1,6})?/
-    if (reg1.test(value)) {
-        return true
-    } else if (value == '') {
+/** 经度：-180 ~ 180，最多 6 位小数 */
+const lngff = (_rule: any, value: any, callback: any) => {
+    if (value === '' || value === null || value === undefined) {
         return callback(new Error('请输入经度'))
-    } else {
-        callback(new Error('请输入正确经度'))
     }
-})
-/**纬度 */
-const latff: any = ref((rule: any, value: any, callback: any) => {
-    let reg2 = /^(\-|\+)?([0-8]?\d{1}\.\d{0,6}|90\.0{0,6}|[0-8]?\d{1}|90)$/
-    if (reg2.test(value)) {
-        return true
-    } else if (value == '') {
+    const reg = /^[+-]?(?:180(?:\.0{1,6})?|(?:1[0-7]\d|[1-9]?\d)(?:\.\d{1,6})?)$/
+    if (!reg.test(String(value))) {
+        return callback(new Error('请输入正确经度（-180~180，最多6位小数）'))
+    }
+    callback()
+}
+/** 纬度：-90 ~ 90，最多 6 位小数 */
+const latff = (_rule: any, value: any, callback: any) => {
+    if (value === '' || value === null || value === undefined) {
         return callback(new Error('请输入纬度'))
-    } else {
-        callback(new Error('请输入正确纬度'))
     }
-})
+    const reg = /^[+-]?(?:90(?:\.0{1,6})?|[1-8]?\d(?:\.\d{1,6})?)$/
+    if (!reg.test(String(value))) {
+        return callback(new Error('请输入正确纬度（-90~90，最多6位小数）'))
+    }
+    callback()
+}
 const plevel = ref(0)
 const nodeDataList = ref()
 const nodeEventList = ref()
diff --git a/src/views/pqs/business/terminal/sensitiveLoadMange/detail.vue b/src/views/pqs/business/terminal/sensitiveLoadMange/detail.vue
index d2e8f7ea..432c9de0 100644
--- a/src/views/pqs/business/terminal/sensitiveLoadMange/detail.vue
+++ b/src/views/pqs/business/terminal/sensitiveLoadMange/detail.vue
@@ -8,7 +8,7 @@
                 <el-input v-model.trim="form.name" placeholder="请输入敏感用户名称"></el-input>
             </el-form-item>
             <el-form-item label="敏感负荷类型" prop="loadType">
-                <el-select v-model.trim="form.loadType" filterable clearable placeholder="请选择数据分类">
+                <el-select v-model.trim="form.loadType" filterable clearable placeholder="请选择数据分类" >
                     <el-option
                         v-for="item in DataTypeSelect"
                         :key="item.id"
diff --git a/src/views/pqs/business/terminal/terminaCkeck/index.vue b/src/views/pqs/business/terminal/terminaCkeck/index.vue
index 1d0533d5..0752e997 100644
--- a/src/views/pqs/business/terminal/terminaCkeck/index.vue
+++ b/src/views/pqs/business/terminal/terminaCkeck/index.vue
@@ -3,7 +3,7 @@
         <TableHeader ref="TableHeaderRef" showCustomColumn>
             <template #select>
                 <el-form-item label="地市">
-                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择地市">
+                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择地市" filterable>
                         <el-option
                             v-for="item in areaOptionList"
                             :key="item.id"
diff --git a/src/views/pqs/business/terminal/transformerStrategy/components/addLedger.vue b/src/views/pqs/business/terminal/transformerStrategy/components/addLedger.vue
index 33a58915..f2a2c25f 100644
--- a/src/views/pqs/business/terminal/transformerStrategy/components/addLedger.vue
+++ b/src/views/pqs/business/terminal/transformerStrategy/components/addLedger.vue
@@ -77,7 +77,7 @@
                     <el-input v-model="ruleForm.tfName" placeholder="请输入" clearable maxlength="32" show-word-limit></el-input>
                 </el-form-item>
                 <el-form-item label="接线方式:" prop="wiring" class="top">
-                    <el-select style="width: 100%" v-model="ruleForm.wiring" clearable placeholder="请选择接线方式">
+                    <el-select style="width: 100%" v-model="ruleForm.wiring" clearable placeholder="请选择接线方式" filterable>
                         <el-option
                             v-for="item in connectionType"
                             :key="item.id"
diff --git a/src/views/pqs/business/terminal/userLedger/components/addForm.vue b/src/views/pqs/business/terminal/userLedger/components/addForm.vue
index 650517c9..af2d3195 100644
--- a/src/views/pqs/business/terminal/userLedger/components/addForm.vue
+++ b/src/views/pqs/business/terminal/userLedger/components/addForm.vue
@@ -34,7 +34,7 @@
                 <el-input v-model.trim="form.orgId" :disabled="true" autocomplete="off" />
             </el-form-item> -->
             <el-form-item for="-" label="所在地市：" prop="city">
-                <el-select v-model="form.city" clearable placeholder="请选择所在地市">
+                <el-select v-model="form.city" clearable placeholder="请选择所在地市" filterable>
                     <el-option
                         v-for="item in areaOptionList"
                         :key="item.id"
@@ -76,7 +76,7 @@
             </el-form-item>
             <el-form-item for="-" label="用户性质：">
                 <!-- :disabled="resendId != '' && title != '编辑'" -->
-                <el-select v-model="form.userType" placeholder="请选择用户性质">
+                <el-select v-model="form.userType" placeholder="请选择用户性质" filterable>
                     <el-option
                         v-for="(item, index) in userTypeList"
                         :label="item.label"
@@ -97,7 +97,7 @@
             </el-form-item>
 
             <el-form-item for="-" label="用户状态：">
-                <el-select v-model="form.userStatus" placeholder="请选择用户状态">
+                <el-select v-model="form.userStatus" placeholder="请选择用户状态" filterable>
                     <el-option
                         v-for="(item, index) in userStateList"
                         :label="item.label"
@@ -161,7 +161,7 @@
                 />
             </el-form-item>
             <el-form-item for="-" label="电压等级：">
-                <el-select v-model="form.voltageLevel" placeholder="请选择电压等级" node-key="id">
+                <el-select v-model="form.voltageLevel" placeholder="请选择电压等级" node-key="id" filterable>
                     <el-option
                         v-for="(item, index) in voltageLevelList"
                         :label="item.name"
@@ -171,7 +171,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="所属电站：" prop="stationId">
-                <el-select v-model="form.stationId" filterable placeholder="请选择所属电站">
+                <el-select v-model="form.stationId" filterable placeholder="请选择所属电站" >
                     <el-option v-for="(item, index) in stationList" :label="item.name" :value="item.id" :key="index" />
                 </el-select>
             </el-form-item>
@@ -200,7 +200,7 @@
             </el-form-item>
 
             <el-form-item for="-" v-if="form.userType != '0' && form.userType != '1'" label="评估类型：">
-                <el-select v-model="form.evaluationType" placeholder="请选择评估类型">
+                <el-select v-model="form.evaluationType" placeholder="请选择评估类型" filterable>
                     <el-option
                         v-for="(item, index) in evaluationTypeList"
                         :key="index"
@@ -275,7 +275,7 @@
                 </el-input>
             </el-form-item>-->
             <el-form-item for="-" v-if="form.userType == '6'" label="行业：">
-                <el-select v-model="form.industry" placeholder="请选择行业">
+                <el-select v-model="form.industry" placeholder="请选择行业" filterable>
                     <el-option v-for="(item, index) in industryList" :label="item.name" :value="item.id" :key="index" />
                 </el-select>
             </el-form-item>
@@ -296,7 +296,7 @@
                     multiple
                     collapse-tags
                     collapse-tags-tooltip
-                    placeholder="请选择敏感电能质量指标"
+                    placeholder="请选择敏感电能质量指标" filterable
                 >
                     <el-option
                         v-for="(item, index) in energyQualityIndexList"
@@ -335,12 +335,12 @@
                 </el-radio-group>
             </el-form-item>
             <el-form-item for="-" v-if="form.userType == '6' && isInterferencemanagement" label="负荷级别：">
-                <el-select v-model="form.loadLevel" collapse-tags collapse-tags-tooltip placeholder="请选择负荷级别">
+                <el-select v-model="form.loadLevel" collapse-tags collapse-tags-tooltip placeholder="请选择负荷级别" filterable>
                     <el-option
                         v-for="(item, index) in loadLevelOptionList"
                         :label="item.name"
                         :value="item.id"
-                        :key="index"
+                        :key="index" 
                     />
                 </el-select>
             </el-form-item>
@@ -350,6 +350,7 @@
                     collapse-tags
                     collapse-tags-tooltip
                     placeholder="请选择供电电源情况"
+                    filterable
                 >
                     <el-option
                         v-for="(item, index) in powerSupplyInfoOptionList"
diff --git a/src/views/pqs/business/terminal/userLedger/index.vue b/src/views/pqs/business/terminal/userLedger/index.vue
index a244a78d..76457eeb 100644
--- a/src/views/pqs/business/terminal/userLedger/index.vue
+++ b/src/views/pqs/business/terminal/userLedger/index.vue
@@ -13,7 +13,7 @@
                     ></el-input>
                 </el-form-item>
                 <el-form-item label="所在地市">
-                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
+                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市" filterable>
                         <el-option
                             v-for="item in areaOptionList"
                             :key="item.id"
diff --git a/src/views/pqs/database/algorithm/components/form.vue b/src/views/pqs/database/algorithm/components/form.vue
index b7bc4a7c..6e4a74f3 100644
--- a/src/views/pqs/database/algorithm/components/form.vue
+++ b/src/views/pqs/database/algorithm/components/form.vue
@@ -15,7 +15,7 @@
                 <el-input v-model="form.name" placeholder="请输入算法名称" clearable maxlength="32" show-word-limit @input="handleInput('name', $event)"/>
             </el-form-item>
             <el-form-item label="计算周期" prop="period" v-if="title == '修改算法' ? TreeList.level == 4 : TreeList.level == 3">
-                <el-select v-model="form.period" placeholder="请选择计算周期" clearable>
+                <el-select v-model="form.period" placeholder="请选择计算周期" clearable filterable>
                     <el-option v-for="item in cycle" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </el-form-item>
diff --git a/src/views/pqs/database/standard/components/addTree.vue b/src/views/pqs/database/standard/components/addTree.vue
index b07169e7..50b179c4 100644
--- a/src/views/pqs/database/standard/components/addTree.vue
+++ b/src/views/pqs/database/standard/components/addTree.vue
@@ -4,7 +4,7 @@
             <el-form :inline="false" :model="form" label-width="auto" class="form-one" :rules="rules" ref="formRef">
                 <el-form-item label="上级名称" v-if="title == '新增'">
 
-                    <el-select v-model="form.pid" placeholder="请选择上级名称" clearable>
+                    <el-select v-model="form.pid" placeholder="请选择上级名称" clearable filterable>
                         <el-option v-for="item in dataTree" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
diff --git a/src/views/pqs/harmonicMonitoring/area/SteadyState/index.vue b/src/views/pqs/harmonicMonitoring/area/SteadyState/index.vue
index 20b260f1..93138b0c 100644
--- a/src/views/pqs/harmonicMonitoring/area/SteadyState/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/SteadyState/index.vue
@@ -9,6 +9,7 @@
                             placeholder="请选择统计类型"
                             value-key="id"
                             style="width: 100%"
+                            filterable
                         >
                             <el-option
                                 v-for="item in classificationData"
@@ -28,6 +29,7 @@
                             placeholder="请选择电压等级"
                             style="width: 100%"
                             value-key="id"
+                            filterable
                         >
                             <el-option
                                 v-for="item in voltageleveloption"
@@ -43,6 +45,7 @@
                             clearable
                             style="width: 100%"
                             placeholder="请选择电网标识"
+                            filterable
                         >
                             <el-option
                                 v-for="item in powerFlagList"
@@ -61,6 +64,7 @@
                             placeholder="请选择终端厂家"
                             style="width: 100%"
                             value-key="id"
+                            filterable
                         >
                             <el-option
                                 v-for="(item, index) in terminaloption"
@@ -79,7 +83,8 @@
                             placeholder="请选择干扰源类型"
                             style="width: 100%"
                             value-key="id"
-                        >
+                            filterable
+                            >
                             <el-option
                                 v-for="(item, index) in interfereoption"
                                 :key="index"
diff --git a/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue b/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue
index f4890e7b..61d7565d 100644
--- a/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue
@@ -17,6 +17,7 @@
                             v-model="tableStore.table.params.statisticalType"
                             value-key="id"
                             placeholder="请选择统计类型"
+                            filterable
                         >
                             <el-option
                                 v-for="item in classificationData"
@@ -35,6 +36,7 @@
                             clearable
                             value-key="id"
                             placeholder="请选择电压等级"
+                            filterable
                         >
                             <el-option
                                 v-for="item in voltageleveloption"
@@ -52,6 +54,7 @@
                             clearable
                             value-key="id"
                             placeholder="请选择终端厂家"
+                            filterable
                         >
                             <el-option
                                 v-for="item in terminaloption"
@@ -69,6 +72,7 @@
                             clearable
                             value-key="id"
                             placeholder="请选择干扰源类型"
+                            filterable
                         >
                             <el-option
                                 v-for="item in interfereoption"
diff --git a/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue b/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue
index 52a13039..1866aaf8 100644
--- a/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue
@@ -6,7 +6,7 @@
                 <template #select>
                     <el-form-item label="统计类型">
                         <el-select v-model="formData.statisticalType" placeholder="请选择统计类型" value-key="id"
-                            style="width: 100%">
+                            style="width: 100%" filterable>
                             <el-option v-for="item in classificationData" :key="item.id" :label="item.name"
                                 :value="item"></el-option>
                         </el-select>
@@ -36,28 +36,28 @@
                     </el-form-item>
                     <el-form-item label="电压等级">
                         <el-select v-model="formData.scale" multiple collapse-tags clearable placeholder="请选择电压等级"
-                            style="width: 100%" value-key="id">
+                            style="width: 100%" value-key="id" filterable>
                             <el-option v-for="item in voltageleveloption" :key="item.id" :label="item.name"
                                 :value="item"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="终端厂家">
                         <el-select v-model="formData.manufacturer" multiple collapse-tags clearable
-                            placeholder="请选择终端厂家" style="width: 100%" value-key="id">
+                            placeholder="请选择终端厂家" style="width: 100%" value-key="id" filterable>
                             <el-option v-for="(item, index) in terminaloption" :key="index" :label="item.name"
                                 :value="item"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="干扰源类型">
                         <el-select v-model="formData.loadType" multiple collapse-tags clearable placeholder="请选择干扰源类型"
-                            style="width: 100%" value-key="id">
+                            style="width: 100%" value-key="id" filterable>
                             <el-option v-for="(item, index) in interfereoption" :key="index" :label="item.name"
                                 :value="item"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="通讯状态">
                         <el-select v-model="tableStore.table.params.comFlagStatus" clearable placeholder="请选择通讯状态"
-                            style="width: 100%">
+                            style="width: 100%" filterable>
                             <el-option label="正常" value="1" />
                             <el-option label="中断" value="0" />
 
diff --git a/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index.vue b/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index.vue
index f7804040..7cf5fd1d 100644
--- a/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index.vue
@@ -9,6 +9,7 @@
                             placeholder="请选择统计类型"
                             value-key="id"
                             style="width: 100%"
+                            filterable
                         >
                             <el-option
                                 v-for="item in classificationData"
@@ -28,6 +29,7 @@
                             placeholder="请选择电压等级"
                             style="width: 100%"
                             value-key="id"
+                            filterable
                         >
                             <el-option
                                 v-for="item in voltageleveloption"
@@ -46,6 +48,7 @@
                             placeholder="请选择终端厂家"
                             style="width: 100%"
                             value-key="id"
+                            filterable
                         >
                             <el-option
                                 v-for="(item, index) in terminaloption"
@@ -64,6 +67,7 @@
                             placeholder="请选择干扰源类型"
                             style="width: 100%"
                             value-key="id"
+                            filterable
                         >
                             <el-option
                                 v-for="(item, index) in interfereoption"
@@ -74,7 +78,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="电网标志">
-                        <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
+                        <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志" filterable>
                             <el-option
                                 v-for="item in sign"
                                 :key="item.id"
diff --git a/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index1.vue b/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index1.vue
index 4b102802..00b5910e 100644
--- a/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index1.vue
+++ b/src/views/pqs/harmonicMonitoring/area/harmonicDistortionRate/index1.vue
@@ -8,6 +8,7 @@
                             placeholder="请选择统计类型"
                             value-key="id"
                             style="width: 100%"
+                            filterable
                         >
                             <el-option
                                 v-for="item in classificationData"
@@ -27,6 +28,7 @@
                             placeholder="请选择电压等级"
                             style="width: 100%"
                             value-key="id"
+                            filterable
                         >
                             <el-option
                                 v-for="item in voltageleveloption"
@@ -45,6 +47,7 @@
                             placeholder="请选择终端厂家"
                             style="width: 100%"
                             value-key="id"
+                            filterable
                         >
                             <el-option
                                 v-for="(item, index) in terminaloption"
@@ -64,6 +67,7 @@
                             placeholder="请选择干扰源类型"
                             style="width: 100%"
                             value-key="id"
+                            filterable
                         >
                             <el-option
                                 v-for="(item, index) in interfereoption"
@@ -74,7 +78,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="电网标志">
-                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
+                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志" filterable>
                         <el-option v-for="item in sign" :key="item.id" :label="item.name" :value="item.algoDescribe" />
                     </el-select>
                     </el-form-item>
diff --git a/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue b/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue
index 7e9d9436..94a4d69c 100644
--- a/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue
@@ -9,6 +9,7 @@
                             placeholder="请选择统计类型"
                             value-key="id"
                             style="width: 100%"
+                            filterable
                         >
                             <el-option
                                 v-for="item in classificationData"
@@ -57,6 +58,7 @@
                             placeholder="请选择电压等级"
                             style="width: 100%"
                             value-key="id"
+                            filterable
                         >
                             <el-option
                                 v-for="item in voltageleveloption"
@@ -75,6 +77,7 @@
                             placeholder="请选择终端厂家"
                             style="width: 100%"
                             value-key="id"
+                            filterable
                         >
                             <el-option
                                 v-for="(item, index) in terminaloption"
@@ -93,6 +96,7 @@
                             placeholder="请选择干扰源类型"
                             style="width: 100%"
                             value-key="id"
+                            filterable
                         >
                             <el-option
                                 v-for="(item, index) in interfereoption"
diff --git a/src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue b/src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue
index 72567408..fbeb5f95 100644
--- a/src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue
@@ -3,7 +3,7 @@
         <TableHeader area datePicker ref="header">
             <template v-slot:select>
                 <el-form-item label="电网标志">
-                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
+                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志" filterable>
                         <el-option v-for="item in sign" :key="item.id" :label="item.name" :value="item.algoDescribe" />
                     </el-select>
                 </el-form-item>
diff --git a/src/views/pqs/harmonicMonitoring/area/qualifiedRate/index.vue b/src/views/pqs/harmonicMonitoring/area/qualifiedRate/index.vue
index ade12b77..6d3ad13b 100644
--- a/src/views/pqs/harmonicMonitoring/area/qualifiedRate/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/qualifiedRate/index.vue
@@ -9,6 +9,7 @@
                             placeholder="请选择统计类型"
                             value-key="id"
                             style="width: 100%"
+                            filterable
                         >
                             <el-option
                                 v-for="item in classificationData"
@@ -28,6 +29,7 @@
                             placeholder="请选择电压等级"
                             style="width: 100%"
                             value-key="id"
+                            filterable
                         >
                             <el-option
                                 v-for="item in voltageleveloption"
@@ -46,6 +48,7 @@
                             placeholder="请选择终端厂家"
                             style="width: 100%"
                             value-key="id"
+                            filterable
                         >
                             <el-option
                                 v-for="(item, index) in terminaloption"
@@ -64,6 +67,7 @@
                             placeholder="请选择干扰源类型"
                             style="width: 100%"
                             value-key="id"
+                            filterable
                         >
                             <el-option
                                 v-for="(item, index) in interfereoption"
@@ -74,7 +78,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="电网标志">
-                        <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
+                        <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志" filterable>
                             <el-option
                                 v-for="item in sign"
                                 :key="item.id"
diff --git a/src/views/pqs/harmonicMonitoring/area/qualifiedRate/index1.vue b/src/views/pqs/harmonicMonitoring/area/qualifiedRate/index1.vue
index e900f66b..e9d574a7 100644
--- a/src/views/pqs/harmonicMonitoring/area/qualifiedRate/index1.vue
+++ b/src/views/pqs/harmonicMonitoring/area/qualifiedRate/index1.vue
@@ -8,6 +8,7 @@
                             placeholder="请选择统计类型"
                             value-key="id"
                             style="width: 100%"
+                            filterable
                         >
                             <el-option
                                 v-for="item in classificationData"
@@ -27,6 +28,7 @@
                             placeholder="请选择电压等级"
                             style="width: 100%"
                             value-key="id"
+                            filterable
                         >
                             <el-option
                                 v-for="item in voltageleveloption"
@@ -45,6 +47,7 @@
                             placeholder="请选择终端厂家"
                             style="width: 100%"
                             value-key="id"
+                            filterable
                         >
                             <el-option
                                 v-for="(item, index) in terminaloption"
@@ -74,7 +77,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="电网标志">
-                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
+                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志" filterable>
                         <el-option v-for="item in sign" :key="item.id" :label="item.name" :value="item.algoDescribe" />
                     </el-select>
                     </el-form-item>
diff --git a/src/views/pqs/harmonicMonitoring/area/terminalonlinerate/index.vue b/src/views/pqs/harmonicMonitoring/area/terminalonlinerate/index.vue
index 28ee6160..de55e803 100644
--- a/src/views/pqs/harmonicMonitoring/area/terminalonlinerate/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/terminalonlinerate/index.vue
@@ -9,6 +9,7 @@
                             placeholder="请选择统计类型"
                             value-key="id"
                             style="width: 100%"
+                            filterable
                         >
                             <el-option
                                 v-for="item in classificationData"
@@ -28,6 +29,7 @@
                             placeholder="请选择终端厂家"
                             style="width: 100%"
                             value-key="id"
+                            filterable
                         >
                             <el-option
                                 v-for="(item, index) in terminaloption"
diff --git a/src/views/pqs/harmonicMonitoring/detailed/alarmStatistics/index.vue b/src/views/pqs/harmonicMonitoring/detailed/alarmStatistics/index.vue
index 438b0c89..1ac81c6c 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/alarmStatistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/alarmStatistics/index.vue
@@ -4,7 +4,7 @@
         <TableHeader date-picker area showExport showCustomColumn>
             <template #select>
                 <!-- <el-form-item label="统计类型:">
-                    <el-select v-model="tableStore.table.params.statisticalType" placeholder="请选择统计类型" value-key="id">
+                    <el-select v-model="tableStore.table.params.statisticalType" placeholder="请选择统计类型" value-key="id" filterable>
                         <el-option v-for="item in classificationData" :key="item.id" :label="item.name" :value="item">
                         </el-option>
                     </el-select>
diff --git a/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue b/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue
index bd3d0b79..2a45e7f0 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue
@@ -1,794 +1,795 @@
-<template>
-    <div class="default-main">
-        <TableHeader datePicker ref="header">
-            <template v-slot:select>
-                <el-form-item label="统计类型">
-                    <el-select
-                        v-model="tableStore.table.params.statisticalType"
-                        value-key="id"
-                        placeholder="请选择统计类型"
-                    >
-                        <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="电网标志">
-                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
-                        <el-option v-for="item in sign" :key="item.id" :label="item.name" :value="item.algoDescribe" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" icon="el-icon-DataAnalysis" @click="rankingClick(null, true)">
-                        污染最大10个监测点
-                    </el-button>
-                </el-form-item>
-            </template>
-        </TableHeader>
-        <div v-loading="tableStore.table.loading" class="pr10">
-            <el-row>
-                <el-col :span="12" class="pd10" style="position: relative">
-                    <div class="legend">
-                        <el-tag style="background: #339966" class="tag" size="small">1级</el-tag>
-                        <span style="color: #339966" class="text">:无污染[0,1]</span>
-                        <el-tag style="background: #3399ff" class="tag" size="small">2级</el-tag>
-                        <span style="color: #3399ff" class="text">:轻微污染(1,1.2]</span>
-                        <el-tag style="background: #ffcc33" class="tag" size="small">3级</el-tag>
-                        <span style="color: #ffcc33" class="text">:轻度污染(1.2,1.6]</span>
-                        <el-tag style="background: #ff9900" class="tag" size="small">4级</el-tag>
-                        <span style="color: #ff9900" class="text">:中度污染(1.6,2]</span>
-                        <el-tag style="background: #A52a2a" class="tag" size="small">5级</el-tag>
-                        <span style="color: #A52a2a" class="text">:重度污染(2,+∞)</span>
-                    </div>
-                    <el-tabs v-model="radio1" type="border-card" @tab-change="handleTabChange">
-                        <el-tab-pane label="列表" :name="0">
-                            <div :style="{ height: layout.height }" style="overflow-y: auto">
-                                <div class="cardBox">
-                                    <el-card v-for="(item, index) in tableStore.table.data" :key="index">
-                                        <template #header>
-                                            <div style="cursor: pointer" @click="queryline(item, false)">
-                                                <el-tag
-                                                    v-if="item.data == 3.14159"
-                                                    style="background: #ccc; color: #fff"
-                                                    size="small"
-                                                >
-                                                    无
-                                                </el-tag>
-                                                <el-tag
-                                                    v-if="0 <= item.data && item.data < 1 && item.data !== 3.14159"
-                                                    style="background: #339966; color: #fff"
-                                                    size="small"
-                                                >
-                                                    1级
-                                                </el-tag>
-                                                <el-tag
-                                                    v-if="1 <= item.data && item.data < 1.2 && item.data !== 3.14159"
-                                                    style="background: #3399ff; color: #fff"
-                                                    size="small"
-                                                >
-                                                    2级
-                                                </el-tag>
-                                                <el-tag
-                                                    v-if="1.2 <= item.data && item.data < 1.6 && item.data !== 3.14159"
-                                                    style="background: #ffcc33; color: #fff"
-                                                    size="small"
-                                                >
-                                                    3级
-                                                </el-tag>
-                                                <el-tag
-                                                    v-if="1.6 <= item.data && item.data < 2 && item.data !== 3.14159"
-                                                    style="background: #ff9900; color: #fff"
-                                                    size="small"
-                                                >
-                                                    4级
-                                                </el-tag>
-                                                <el-tag
-                                                    v-if="2 <= item.data && item.data && item.data !== 3.14159"
-                                                    style="background: #A52a2a; color: #fff"
-                                                    size="small"
-                                                >
-                                                    5级
-                                                </el-tag>
-                                                <span>{{ item.name }}</span>
-                                            </div>
-                                        </template>
-                                        <div class="card-content">
-                                            <div
-                                                class="card-item"
-                                                v-for="(item1, index1) in item.children"
-                                                :key="index1"
-                                                @click="queryline(item1, true)"
-                                            >
-                                                <el-tag
-                                                    v-if="item1.data == 3.14159"
-                                                    style="background: #ccc; color: #fff"
-                                                    size="small"
-                                                >
-                                                    无
-                                                </el-tag>
-                                                <el-tag
-                                                    v-if="0 <= item1.data && item1.data < 1 && item1.data !== 3.14159"
-                                                    style="background: #339966; color: #fff"
-                                                    size="small"
-                                                >
-                                                    1级
-                                                </el-tag>
-                                                <el-tag
-                                                    v-if="1 <= item1.data && item1.data < 1.2 && item1.data !== 3.14159"
-                                                    style="background: #3399ff; color: #fff"
-                                                    size="small"
-                                                >
-                                                    2级
-                                                </el-tag>
-                                                <el-tag
-                                                    v-if="
-                                                        1.2 <= item1.data && item1.data < 1.6 && item1.data !== 3.14159
-                                                    "
-                                                    style="background: #ffcc33; color: #fff"
-                                                    size="small"
-                                                >
-                                                    3级
-                                                </el-tag>
-                                                <el-tag
-                                                    v-if="1.6 <= item1.data && item1.data < 2 && item1.data !== 3.14159"
-                                                    style="background: #ff9900; color: #fff"
-                                                    size="small"
-                                                >
-                                                    4级
-                                                </el-tag>
-                                                <el-tag
-                                                    v-if="2 <= item1.data && item1.data && item1.data !== 3.14159"
-                                                    style="background: #A52a2a; color: #fff"
-                                                    size="small"
-                                                >
-                                                    5级
-                                                </el-tag>
-                                                <span class="xdf">
-                                                    <el-tooltip
-                                                        :show-arrow="false"
-                                                        :offset="-0"
-                                                        :content="item1.name"
-                                                        popper-class="atooltip"
-                                                        placement="bottom-start"
-                                                    >
-                                                        <div class="tooltipText">
-                                                            {{ item1.name }}
-                                                        </div>
-                                                    </el-tooltip>
-                                                </span>
-                                            </div>
-                                        </div>
-                                    </el-card>
-                                </div>
-                            </div>
-                        </el-tab-pane>
-                        <el-tab-pane label="图形" :name="1">
-                            <MyEchartMap
-                                :style="layout"
-                                style="width: 100%"
-                                id="EchartMap"
-                                ref="EchartMap"
-                                :options="echartMapList"
-                                class="map"
-                            />
-                        </el-tab-pane>
-                    </el-tabs>
-                </el-col>
-                <el-col :span="12">
-                    <my-echart class="tall" :options="echartList" />
-                    <div class="tall">
-                        <vxe-table height="auto" auto-resize :data="tableStore.table.data" v-bind="defaultAttribute">
-                            <vxe-column field="name" title="名称"></vxe-column>
-                            <vxe-column field="zc" title="污染值">
-                                <template #default="scope">
-                                    <span v-if="scope.row.data == 3.14159" style="color: #000">暂无数据</span>
-                                    <span v-if="scope.row.data !== 3.14159" style="color: #000">
-                                        {{ scope.row.data }}
-                                    </span>
-                                </template>
-                            </vxe-column>
-                            <vxe-column field="zd" title="评估">
-                                <template #default="scope">
-                                    <span
-                                        v-if="0 <= scope.row.data && scope.row.data < 1 && scope.row.data !== 3.14159"
-                                        style="font-weight: bold; color: #339966"
-                                    >
-                                        无污染
-                                    </span>
-                                    <span
-                                        v-if="1 <= scope.row.data && scope.row.data < 1.2 && scope.row.data !== 3.14159"
-                                        style="font-weight: bold; color: #3399ff"
-                                    >
-                                        轻微污染
-                                    </span>
-                                    <span
-                                        v-if="
-                                            1.2 <= scope.row.data && scope.row.data < 1.6 && scope.row.data !== 3.14159
-                                        "
-                                        style="font-weight: bold; color: #ffcc33"
-                                    >
-                                        轻度污染
-                                    </span>
-                                    <span
-                                        v-if="1.6 <= scope.row.data && scope.row.data < 2 && scope.row.data !== 3.14159"
-                                        style="font-weight: bold; color: #ff9900"
-                                    >
-                                        中度污染
-                                    </span>
-                                    <span
-                                        v-if="2 <= scope.row.data && scope.row.data && scope.row.data !== 3.14159"
-                                        style="font-weight: bold; color: #A52a2a"
-                                    >
-                                        重度污染
-                                    </span>
-                                    <span v-if="scope.row.data == 3.14159" style="color: #000">暂无评估</span>
-                                </template>
-                            </vxe-column>
-                        </vxe-table>
-                    </div>
-                </el-col>
-            </el-row>
-        </div>
-        <!-- 详情 -->
-        <provinceDetails ref="provinceDetailsRef" />
-        <!-- 排名前10的监测点 -->
-        <ranking ref="rankingRef" />
-    </div>
-</template>
-<script setup lang="ts">
-import TableHeader from '@/components/table/header/index.vue'
-import MyEchartMap from '@/components/echarts/MyEchartMap.vue'
-import { useDictData } from '@/stores/dictData'
-import { defaultAttribute } from '@/components/table/defaultAttribute'
-import provinceDetails from './components/provinceDetails.vue'
-import ranking from './components/ranking.vue'
-import MyEchart from '@/components/echarts/MyEchart.vue'
-import TableStore from '@/utils/tableStore'
-import { ref, onMounted, provide } from 'vue'
-import { mainHeight } from '@/utils/layout'
-import * as echarts from 'echarts/core'
-defineOptions({
-    name: 'harmonic-boot/qydetailedAnalysis/pollutionqy'
-})
-const carouselRef = ref()
-const radio1 = ref(0)
-const dictData = useDictData()
-const echartList = ref({})
-const provinceDetailsRef = ref()
-const rankingRef = ref()
-const EchartMap = ref()
-const echartMapList: any = ref({})
-const header = ref()
-const options = dictData.getBasicData('Pollution_Statis', [
-    'I_Neg',
-    'V_Inharm',
-    'V_Dev',
-    'V_Unbalance',
-    'Plt',
-    'Freq_Dev'
-])
-const sign = dictData.getBasicData('power_flag')
-console.log('🚀 ~ sign:', sign)
-const tableStore = new TableStore({
-    url: '/harmonic-boot/PollutionSubstation/deptSubstationRelations',
-    method: 'POST',
-    column: [],
-    beforeSearchFun: () => {
-        tableStore.table.params.reportFlag = tableStore.table.params.interval
-    },
-    loadCallback: () => {
-        histogram(tableStore.table.data)
-    }
-})
-provide('tableStore', tableStore)
-
-tableStore.table.params.deptIndex = dictData.state.area[0].id
-tableStore.table.params.statisticalType = options[0]
-tableStore.table.params.monitorFlag = 2
-tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
-
-tableStore.table.params.serverName = 'event-boot'
-const handleTabChange = (val: any) => {
-    if (val == 0) return
-    setTimeout(() => {
-        map(tableStore.table.data)
-        EchartMap.value.GetEchar(dictData.state.area[0].name)
-        // header.value.areaRef.change()
-    }, 100)
-}
-// 地图数处理
-const rankingClick = () => {
-    rankingRef.value.open(tableStore.table.params)
-}
-const queryline = (row: any, flag: boolean) => {
-    provinceDetailsRef.value.open(row, flag, tableStore.table.params)
-}
-
-// 表格数据处理
-// 柱状图数据处理
-const histogram = (res: any) => {
-    echartList.value = {
-        title: {
-            text: '区域'
-        },
-        tooltip: {
-            formatter: function (params: any) {
-                // console.log(params);
-                var tips = ''
-                for (var i = 0; i < params.length; i++) {
-                    tips += params[i].name + '</br/>'
-                    tips +=
-                        '监测等级' +
-                        ':' +
-                        '&nbsp' +
-                        '&nbsp' +
-                        (params[i].value == 0.14159
-                            ? '暂无数据'
-                            : params[i].value < 1
-                            ? '无污染'
-                            : params[i].value < 1.2
-                            ? '轻微污染'
-                            : params[i].value < 1.6
-                            ? '轻度污染'
-                            : params[i].value < 2
-                            ? '中度污染'
-                            : '重度污染') +
-                        '</br/>'
-                }
-                return tips
-            }
-        },
-
-        xAxis: {
-            name: '区域',
-            data: res.map((item: any) => item.name)
-        },
-        yAxis: {
-            name: '等级', // 给X轴加单位
-            min: 0,
-            max: 2,
-            interval: 0.2,
-            splitLine: {
-                show: false
-            },
-            axisLabel: {
-                show: true,
-
-                // 这里重新定义就可以
-                formatter: function (value, index) {
-                    var texts = []
-                    if (value === 1) {
-                        texts.push('1级')
-                    } else if (value === 1.2) {
-                        texts.push('2级')
-                    } else if (value === 1.4) {
-                        texts.push('3级')
-                    } else if (value === 1.6) {
-                        texts.push('4级')
-                    } else if (value === 2) {
-                        texts.push('5级')
-                    }
-                    return texts
-                }
-            }
-        },
-
-        options: {
-            dataZoom: null,
-            series: [
-                {
-                    type: 'bar',
-                    data: res.map((item: any) => {
-                        return item.data == 3.14159 ? 0.14159 : item.data
-                    }),
-                    barMaxWidth: 30,
-
-                    itemStyle: {
-                        normal: {
-                            // 随机显示
-                            //color:function(d){return "#"+Math.floor(Math.random()*(256*256*256-1)).toString(16);}
-
-                            // 定制显示（按顺序）
-                            color: function (params) {
-                                if (params.value == 0) {
-                                    return '#339966'
-                                } else if (params.value > 2) {
-                                    return new echarts.graphic.LinearGradient(
-                                        0,
-                                        1,
-                                        0,
-                                        0,
-                                        [
-                                            {
-                                                offset: 1,
-                                                color: '#A52a2a'
-                                            }
-                                        ],
-                                        false
-                                    )
-                                } else if (1.6 < params.value && params.value <= 2) {
-                                    return new echarts.graphic.LinearGradient(
-                                        0,
-                                        1,
-                                        0,
-                                        0,
-                                        [
-                                            {
-                                                offset: 1,
-                                                color: '#FF9900'
-                                            }
-                                        ],
-                                        false
-                                    )
-                                } else if (1.2 < params.value && params.value <= 1.6) {
-                                    return new echarts.graphic.LinearGradient(
-                                        0,
-                                        1,
-                                        0,
-                                        0,
-                                        [
-                                            {
-                                                offset: 1,
-                                                color: '#FFCC33'
-                                            }
-                                        ],
-                                        false
-                                    )
-                                } else if (1 < params.value && params.value <= 1.2) {
-                                    return new echarts.graphic.LinearGradient(
-                                        0,
-                                        1,
-                                        0,
-                                        0,
-                                        [
-                                            {
-                                                offset: 1,
-                                                color: '#3399FF'
-                                            }
-                                        ],
-                                        false
-                                    )
-                                } else if (
-                                    0 < params.value &&
-                                    params.value <= 1 &&
-                                    params.value >= 0 &&
-                                    params.value !== 0.14159
-                                ) {
-                                    return new echarts.graphic.LinearGradient(
-                                        0,
-                                        1,
-                                        0,
-                                        0,
-                                        [
-                                            {
-                                                offset: 1,
-                                                color: '#339966'
-                                            }
-                                        ],
-                                        false
-                                    )
-                                } else if (params.value == 0.14159) {
-                                    return new echarts.graphic.LinearGradient(
-                                        0,
-                                        1,
-                                        0,
-                                        0,
-                                        [
-                                            {
-                                                offset: 1,
-                                                color: '#999999'
-                                            }
-                                        ],
-                                        false
-                                    )
-                                }
-                            }
-                        }
-                    },
-                    markLine: {
-                        silent: false,
-                        symbol: 'circle',
-                        lineStyle: {
-                            color: 'red',
-                            width: 1
-                        },
-                        emphasis: {
-                            lineStyle: {
-                                width: 1
-                            }
-                        },
-                        data: [
-                            {
-                                name: '',
-                                yAxis: 1,
-                                lineStyle: {
-                                    color: '#339966'
-                                },
-                                label: {
-                                    //position: "middle",
-                                    formatter: '{b}',
-                                    textStyle: {
-                                        color: '#339966'
-                                    }
-                                }
-                            },
-                            {
-                                name: '',
-                                yAxis: 1.2,
-                                lineStyle: {
-                                    color: '#3399FF'
-                                },
-                                label: {
-                                    // position: "middle",
-                                    formatter: '{b}',
-                                    textStyle: {
-                                        color: '#3399FF'
-                                    }
-                                }
-                            },
-                            {
-                                name: '',
-                                yAxis: 1.4,
-                                lineStyle: {
-                                    color: '#FFCC33'
-                                },
-                                label: {
-                                    // position: "middle",
-                                    formatter: '{b}',
-                                    textStyle: {
-                                        color: '#FFCC33'
-                                    }
-                                }
-                            },
-                            {
-                                name: '',
-                                yAxis: 1.6,
-                                lineStyle: {
-                                    color: '#FF9900'
-                                },
-                                label: {
-                                    // position: "middle",
-                                    formatter: '{b}',
-                                    textStyle: {
-                                        color: '#FF9900'
-                                    }
-                                }
-                            },
-                            {
-                                name: '',
-                                yAxis: 2,
-                                lineStyle: {
-                                    color: '#A52a2a'
-                                },
-                                label: {
-                                    // position: "middle",
-                                    formatter: '{b}',
-                                    textStyle: {
-                                        color: '#A52a2a'
-                                    }
-                                }
-                            }
-                        ]
-                    }
-                }
-            ]
-        }
-    }
-}
-
-// 地图数处理
-const map = (res: any) => {
-    let areaData: any = []
-    let xarr = []
-    let yarr = []
-    let arr = []
-    let arr1: any = []
-    res.forEach(element => {
-        xarr.push(element.name)
-        if (element.data == 0) {
-            element.data = 0.1
-            yarr.push(element.data)
-        }
-        yarr.push(element.data)
-        let p = {
-            name: element.name,
-            value: element.data
-        }
-        arr.push(p)
-        let d = element.name.split('\n')
-        let p1 = {
-            name: d[0],
-            value: element.data == 3.14159 ? -1 : element.data
-        }
-
-        arr1.push(p1)
-    })
-
-    echartMapList.value = {
-        name: '',
-        title: {
-            text: '电能质量污区图分布'
-        },
-        tooltip: {
-            formatter: function (params) {
-                var tips = ''
-
-                if (params.value === -1 || window.isNaN(params.value)) {
-                    tips =
-                        "<font style='color:#fff'>" +
-                        params.name +
-                        '</font><br/>区域污染评估:' +
-                        "<font style='color:#fff'><font style='color:#fff'>暂无数据</font><br/>"
-                } else if (params.value === 0.1 || window.isNaN(params.value)) {
-                    tips =
-                        "<font style='color:#fff'>" +
-                        params.name +
-                        '</font><br/>区域污染评估:' +
-                        "<font style='color:#fff'><font style='color:#fff'>暂无数据</font><br/>"
-                } else {
-                    tips +=
-                        "<font style='color:#fff'>" +
-                        params.name +
-                        '</font><br/>区域污染评估' +
-                        "<font style='color:#fff'>：" +
-                        params.value +
-                        '</font><br/>'
-                }
-                return tips
-            }
-        },
-
-        visualMap: {
-            min: 0,
-            max: 2,
-            left: 25,
-            bottom: 40,
-            show: false,
-            pieces: [
-                {
-                    gt: 2,
-                    lt: 10000,
-                    label: '重度污染',
-                    color: '#A52a2a'
-                },
-                {
-                    gte: 1.2,
-                    lt: 1.6,
-                    label: '轻度污染',
-                    color: '#FFCC33'
-                },
-                {
-                    gt: 1.6,
-                    lt: 2,
-                    label: '中度污染',
-                    color: '#FF9900'
-                },
-                {
-                    gte: 1,
-                    lte: 1.2,
-                    label: '轻微污染',
-                    color: '#3399FF'
-                },
-                {
-                    gte: 0.1,
-                    lte: 1,
-                    label: '无污染',
-                    color: '#339966'
-                },
-                {
-                    gte: -1,
-                    lte: 0.14159,
-                    label: '无数据',
-                    color: '#ccc'
-                }
-            ]
-        },
-
-        options: {
-            series: [
-                {
-                    type: 'map',
-                    geoIndex: 0,
-                    data: arr1
-                }
-            ]
-        }
-    }
-}
-
-onMounted(() => {
-    setTimeout(() => {
-        tableStore.index()
-    }, 10)
-})
-const layout = mainHeight(160) as any
-const layout1 = mainHeight(93) as any
-</script>
-<style lang="scss" scoped>
-.tall {
-    height: calc(v-bind('layout1.height') / 2);
-}
-
-.tag {
-    color: #fff;
-    border: #fff;
-    margin-left: 5px;
-    width: 28px;
-}
-
-.text {
-    font-weight: bold;
-    font-size: 12px;
-}
-
-:deep(.cardBox) {
-    box-sizing: border-box;
-    overflow: auto;
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
-    grid-template-rows: max-content;
-    grid-gap: 10px;
-    justify-content: center;
-
-    .el-card {
-        background-image: linear-gradient(var(--el-color-primary), var(--el-color-primary-light-3));
-        font-weight: bold;
-
-        .el-card__header {
-            padding: 10px !important;
-            color: #fff;
-
-            div {
-                display: flex;
-                justify-content: space-between;
-            }
-        }
-
-        .el-card__body {
-            padding: 10px !important;
-        }
-
-        .card-content {
-            height: 200px;
-            display: flex;
-            flex-wrap: wrap;
-            justify-content: space-between;
-            overflow-y: auto;
-            color: #000;
-
-            .card-item {
-                margin-bottom: 20px;
-                width: 50%;
-                display: flex;
-                cursor: pointer;
-            }
-
-            .xdf {
-                width: 70%;
-            }
-
-            .tooltipText {
-                font-weight: 500;
-                font-size: 12px;
-                color: #fff;
-                // width: 50%;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-                margin-left: 5px;
-            }
-        }
-    }
-}
-.map {
-    height: v-bind('layout.height');
-    width: 100%;
-}
-:deep(.el-carousel__indicators) {
-    display: none;
-}
-.legend {
-    position: absolute;
-    right: 15px;
-    top: 20px;
-    z-index: 99;
-}
-</style>
+<template>
+    <div class="default-main">
+        <TableHeader datePicker ref="header">
+            <template v-slot:select>
+                <el-form-item label="统计类型">
+                    <el-select
+                        v-model="tableStore.table.params.statisticalType"
+                        value-key="id"
+                        placeholder="请选择统计类型"
+                        filterable
+                    >
+                        <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="电网标志">
+                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志" filterable>
+                        <el-option v-for="item in sign" :key="item.id" :label="item.name" :value="item.algoDescribe" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-DataAnalysis" @click="rankingClick(null, true)">
+                        污染最大10个监测点
+                    </el-button>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <div v-loading="tableStore.table.loading" class="pr10">
+            <el-row>
+                <el-col :span="12" class="pd10" style="position: relative">
+                    <div class="legend">
+                        <el-tag style="background: #339966" class="tag" size="small">1级</el-tag>
+                        <span style="color: #339966" class="text">:无污染[0,1]</span>
+                        <el-tag style="background: #3399ff" class="tag" size="small">2级</el-tag>
+                        <span style="color: #3399ff" class="text">:轻微污染(1,1.2]</span>
+                        <el-tag style="background: #ffcc33" class="tag" size="small">3级</el-tag>
+                        <span style="color: #ffcc33" class="text">:轻度污染(1.2,1.6]</span>
+                        <el-tag style="background: #ff9900" class="tag" size="small">4级</el-tag>
+                        <span style="color: #ff9900" class="text">:中度污染(1.6,2]</span>
+                        <el-tag style="background: #A52a2a" class="tag" size="small">5级</el-tag>
+                        <span style="color: #A52a2a" class="text">:重度污染(2,+∞)</span>
+                    </div>
+                    <el-tabs v-model="radio1" type="border-card" @tab-change="handleTabChange">
+                        <el-tab-pane label="列表" :name="0">
+                            <div :style="{ height: layout.height }" style="overflow-y: auto">
+                                <div class="cardBox">
+                                    <el-card v-for="(item, index) in tableStore.table.data" :key="index">
+                                        <template #header>
+                                            <div style="cursor: pointer" @click="queryline(item, false)">
+                                                <el-tag
+                                                    v-if="item.data == 3.14159"
+                                                    style="background: #ccc; color: #fff"
+                                                    size="small"
+                                                >
+                                                    无
+                                                </el-tag>
+                                                <el-tag
+                                                    v-if="0 <= item.data && item.data < 1 && item.data !== 3.14159"
+                                                    style="background: #339966; color: #fff"
+                                                    size="small"
+                                                >
+                                                    1级
+                                                </el-tag>
+                                                <el-tag
+                                                    v-if="1 <= item.data && item.data < 1.2 && item.data !== 3.14159"
+                                                    style="background: #3399ff; color: #fff"
+                                                    size="small"
+                                                >
+                                                    2级
+                                                </el-tag>
+                                                <el-tag
+                                                    v-if="1.2 <= item.data && item.data < 1.6 && item.data !== 3.14159"
+                                                    style="background: #ffcc33; color: #fff"
+                                                    size="small"
+                                                >
+                                                    3级
+                                                </el-tag>
+                                                <el-tag
+                                                    v-if="1.6 <= item.data && item.data < 2 && item.data !== 3.14159"
+                                                    style="background: #ff9900; color: #fff"
+                                                    size="small"
+                                                >
+                                                    4级
+                                                </el-tag>
+                                                <el-tag
+                                                    v-if="2 <= item.data && item.data && item.data !== 3.14159"
+                                                    style="background: #A52a2a; color: #fff"
+                                                    size="small"
+                                                >
+                                                    5级
+                                                </el-tag>
+                                                <span>{{ item.name }}</span>
+                                            </div>
+                                        </template>
+                                        <div class="card-content">
+                                            <div
+                                                class="card-item"
+                                                v-for="(item1, index1) in item.children"
+                                                :key="index1"
+                                                @click="queryline(item1, true)"
+                                            >
+                                                <el-tag
+                                                    v-if="item1.data == 3.14159"
+                                                    style="background: #ccc; color: #fff"
+                                                    size="small"
+                                                >
+                                                    无
+                                                </el-tag>
+                                                <el-tag
+                                                    v-if="0 <= item1.data && item1.data < 1 && item1.data !== 3.14159"
+                                                    style="background: #339966; color: #fff"
+                                                    size="small"
+                                                >
+                                                    1级
+                                                </el-tag>
+                                                <el-tag
+                                                    v-if="1 <= item1.data && item1.data < 1.2 && item1.data !== 3.14159"
+                                                    style="background: #3399ff; color: #fff"
+                                                    size="small"
+                                                >
+                                                    2级
+                                                </el-tag>
+                                                <el-tag
+                                                    v-if="
+                                                        1.2 <= item1.data && item1.data < 1.6 && item1.data !== 3.14159
+                                                    "
+                                                    style="background: #ffcc33; color: #fff"
+                                                    size="small"
+                                                >
+                                                    3级
+                                                </el-tag>
+                                                <el-tag
+                                                    v-if="1.6 <= item1.data && item1.data < 2 && item1.data !== 3.14159"
+                                                    style="background: #ff9900; color: #fff"
+                                                    size="small"
+                                                >
+                                                    4级
+                                                </el-tag>
+                                                <el-tag
+                                                    v-if="2 <= item1.data && item1.data && item1.data !== 3.14159"
+                                                    style="background: #A52a2a; color: #fff"
+                                                    size="small"
+                                                >
+                                                    5级
+                                                </el-tag>
+                                                <span class="xdf">
+                                                    <el-tooltip
+                                                        :show-arrow="false"
+                                                        :offset="-0"
+                                                        :content="item1.name"
+                                                        popper-class="atooltip"
+                                                        placement="bottom-start"
+                                                    >
+                                                        <div class="tooltipText">
+                                                            {{ item1.name }}
+                                                        </div>
+                                                    </el-tooltip>
+                                                </span>
+                                            </div>
+                                        </div>
+                                    </el-card>
+                                </div>
+                            </div>
+                        </el-tab-pane>
+                        <el-tab-pane label="图形" :name="1">
+                            <MyEchartMap
+                                :style="layout"
+                                style="width: 100%"
+                                id="EchartMap"
+                                ref="EchartMap"
+                                :options="echartMapList"
+                                class="map"
+                            />
+                        </el-tab-pane>
+                    </el-tabs>
+                </el-col>
+                <el-col :span="12">
+                    <my-echart class="tall" :options="echartList" />
+                    <div class="tall">
+                        <vxe-table height="auto" auto-resize :data="tableStore.table.data" v-bind="defaultAttribute">
+                            <vxe-column field="name" title="名称"></vxe-column>
+                            <vxe-column field="zc" title="污染值">
+                                <template #default="scope">
+                                    <span v-if="scope.row.data == 3.14159" style="color: #000">暂无数据</span>
+                                    <span v-if="scope.row.data !== 3.14159" style="color: #000">
+                                        {{ scope.row.data }}
+                                    </span>
+                                </template>
+                            </vxe-column>
+                            <vxe-column field="zd" title="评估">
+                                <template #default="scope">
+                                    <span
+                                        v-if="0 <= scope.row.data && scope.row.data < 1 && scope.row.data !== 3.14159"
+                                        style="font-weight: bold; color: #339966"
+                                    >
+                                        无污染
+                                    </span>
+                                    <span
+                                        v-if="1 <= scope.row.data && scope.row.data < 1.2 && scope.row.data !== 3.14159"
+                                        style="font-weight: bold; color: #3399ff"
+                                    >
+                                        轻微污染
+                                    </span>
+                                    <span
+                                        v-if="
+                                            1.2 <= scope.row.data && scope.row.data < 1.6 && scope.row.data !== 3.14159
+                                        "
+                                        style="font-weight: bold; color: #ffcc33"
+                                    >
+                                        轻度污染
+                                    </span>
+                                    <span
+                                        v-if="1.6 <= scope.row.data && scope.row.data < 2 && scope.row.data !== 3.14159"
+                                        style="font-weight: bold; color: #ff9900"
+                                    >
+                                        中度污染
+                                    </span>
+                                    <span
+                                        v-if="2 <= scope.row.data && scope.row.data && scope.row.data !== 3.14159"
+                                        style="font-weight: bold; color: #A52a2a"
+                                    >
+                                        重度污染
+                                    </span>
+                                    <span v-if="scope.row.data == 3.14159" style="color: #000">暂无评估</span>
+                                </template>
+                            </vxe-column>
+                        </vxe-table>
+                    </div>
+                </el-col>
+            </el-row>
+        </div>
+        <!-- 详情 -->
+        <provinceDetails ref="provinceDetailsRef" />
+        <!-- 排名前10的监测点 -->
+        <ranking ref="rankingRef" />
+    </div>
+</template>
+<script setup lang="ts">
+import TableHeader from '@/components/table/header/index.vue'
+import MyEchartMap from '@/components/echarts/MyEchartMap.vue'
+import { useDictData } from '@/stores/dictData'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import provinceDetails from './components/provinceDetails.vue'
+import ranking from './components/ranking.vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import TableStore from '@/utils/tableStore'
+import { ref, onMounted, provide } from 'vue'
+import { mainHeight } from '@/utils/layout'
+import * as echarts from 'echarts/core'
+defineOptions({
+    name: 'harmonic-boot/qydetailedAnalysis/pollutionqy'
+})
+const carouselRef = ref()
+const radio1 = ref(0)
+const dictData = useDictData()
+const echartList = ref({})
+const provinceDetailsRef = ref()
+const rankingRef = ref()
+const EchartMap = ref()
+const echartMapList: any = ref({})
+const header = ref()
+const options = dictData.getBasicData('Pollution_Statis', [
+    'I_Neg',
+    'V_Inharm',
+    'V_Dev',
+    'V_Unbalance',
+    'Plt',
+    'Freq_Dev'
+])
+const sign = dictData.getBasicData('power_flag')
+console.log('🚀 ~ sign:', sign)
+const tableStore = new TableStore({
+    url: '/harmonic-boot/PollutionSubstation/deptSubstationRelations',
+    method: 'POST',
+    column: [],
+    beforeSearchFun: () => {
+        tableStore.table.params.reportFlag = tableStore.table.params.interval
+    },
+    loadCallback: () => {
+        histogram(tableStore.table.data)
+    }
+})
+provide('tableStore', tableStore)
+
+tableStore.table.params.deptIndex = dictData.state.area[0].id
+tableStore.table.params.statisticalType = options[0]
+tableStore.table.params.monitorFlag = 2
+tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
+
+tableStore.table.params.serverName = 'event-boot'
+const handleTabChange = (val: any) => {
+    if (val == 0) return
+    setTimeout(() => {
+        map(tableStore.table.data)
+        EchartMap.value.GetEchar(dictData.state.area[0].name)
+        // header.value.areaRef.change()
+    }, 100)
+}
+// 地图数处理
+const rankingClick = () => {
+    rankingRef.value.open(tableStore.table.params)
+}
+const queryline = (row: any, flag: boolean) => {
+    provinceDetailsRef.value.open(row, flag, tableStore.table.params)
+}
+
+// 表格数据处理
+// 柱状图数据处理
+const histogram = (res: any) => {
+    echartList.value = {
+        title: {
+            text: '区域'
+        },
+        tooltip: {
+            formatter: function (params: any) {
+                // console.log(params);
+                var tips = ''
+                for (var i = 0; i < params.length; i++) {
+                    tips += params[i].name + '</br/>'
+                    tips +=
+                        '监测等级' +
+                        ':' +
+                        '&nbsp' +
+                        '&nbsp' +
+                        (params[i].value == 0.14159
+                            ? '暂无数据'
+                            : params[i].value < 1
+                            ? '无污染'
+                            : params[i].value < 1.2
+                            ? '轻微污染'
+                            : params[i].value < 1.6
+                            ? '轻度污染'
+                            : params[i].value < 2
+                            ? '中度污染'
+                            : '重度污染') +
+                        '</br/>'
+                }
+                return tips
+            }
+        },
+
+        xAxis: {
+            name: '区域',
+            data: res.map((item: any) => item.name)
+        },
+        yAxis: {
+            name: '等级', // 给X轴加单位
+            min: 0,
+            max: 2,
+            interval: 0.2,
+            splitLine: {
+                show: false
+            },
+            axisLabel: {
+                show: true,
+
+                // 这里重新定义就可以
+                formatter: function (value, index) {
+                    var texts = []
+                    if (value === 1) {
+                        texts.push('1级')
+                    } else if (value === 1.2) {
+                        texts.push('2级')
+                    } else if (value === 1.4) {
+                        texts.push('3级')
+                    } else if (value === 1.6) {
+                        texts.push('4级')
+                    } else if (value === 2) {
+                        texts.push('5级')
+                    }
+                    return texts
+                }
+            }
+        },
+
+        options: {
+            dataZoom: null,
+            series: [
+                {
+                    type: 'bar',
+                    data: res.map((item: any) => {
+                        return item.data == 3.14159 ? 0.14159 : item.data
+                    }),
+                    barMaxWidth: 30,
+
+                    itemStyle: {
+                        normal: {
+                            // 随机显示
+                            //color:function(d){return "#"+Math.floor(Math.random()*(256*256*256-1)).toString(16);}
+
+                            // 定制显示（按顺序）
+                            color: function (params) {
+                                if (params.value == 0) {
+                                    return '#339966'
+                                } else if (params.value > 2) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#A52a2a'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                } else if (1.6 < params.value && params.value <= 2) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#FF9900'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                } else if (1.2 < params.value && params.value <= 1.6) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#FFCC33'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                } else if (1 < params.value && params.value <= 1.2) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#3399FF'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                } else if (
+                                    0 < params.value &&
+                                    params.value <= 1 &&
+                                    params.value >= 0 &&
+                                    params.value !== 0.14159
+                                ) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#339966'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                } else if (params.value == 0.14159) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#999999'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                }
+                            }
+                        }
+                    },
+                    markLine: {
+                        silent: false,
+                        symbol: 'circle',
+                        lineStyle: {
+                            color: 'red',
+                            width: 1
+                        },
+                        emphasis: {
+                            lineStyle: {
+                                width: 1
+                            }
+                        },
+                        data: [
+                            {
+                                name: '',
+                                yAxis: 1,
+                                lineStyle: {
+                                    color: '#339966'
+                                },
+                                label: {
+                                    //position: "middle",
+                                    formatter: '{b}',
+                                    textStyle: {
+                                        color: '#339966'
+                                    }
+                                }
+                            },
+                            {
+                                name: '',
+                                yAxis: 1.2,
+                                lineStyle: {
+                                    color: '#3399FF'
+                                },
+                                label: {
+                                    // position: "middle",
+                                    formatter: '{b}',
+                                    textStyle: {
+                                        color: '#3399FF'
+                                    }
+                                }
+                            },
+                            {
+                                name: '',
+                                yAxis: 1.4,
+                                lineStyle: {
+                                    color: '#FFCC33'
+                                },
+                                label: {
+                                    // position: "middle",
+                                    formatter: '{b}',
+                                    textStyle: {
+                                        color: '#FFCC33'
+                                    }
+                                }
+                            },
+                            {
+                                name: '',
+                                yAxis: 1.6,
+                                lineStyle: {
+                                    color: '#FF9900'
+                                },
+                                label: {
+                                    // position: "middle",
+                                    formatter: '{b}',
+                                    textStyle: {
+                                        color: '#FF9900'
+                                    }
+                                }
+                            },
+                            {
+                                name: '',
+                                yAxis: 2,
+                                lineStyle: {
+                                    color: '#A52a2a'
+                                },
+                                label: {
+                                    // position: "middle",
+                                    formatter: '{b}',
+                                    textStyle: {
+                                        color: '#A52a2a'
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    }
+}
+
+// 地图数处理
+const map = (res: any) => {
+    let areaData: any = []
+    let xarr = []
+    let yarr = []
+    let arr = []
+    let arr1: any = []
+    res.forEach(element => {
+        xarr.push(element.name)
+        if (element.data == 0) {
+            element.data = 0.1
+            yarr.push(element.data)
+        }
+        yarr.push(element.data)
+        let p = {
+            name: element.name,
+            value: element.data
+        }
+        arr.push(p)
+        let d = element.name.split('\n')
+        let p1 = {
+            name: d[0],
+            value: element.data == 3.14159 ? -1 : element.data
+        }
+
+        arr1.push(p1)
+    })
+
+    echartMapList.value = {
+        name: '',
+        title: {
+            text: '电能质量污区图分布'
+        },
+        tooltip: {
+            formatter: function (params) {
+                var tips = ''
+
+                if (params.value === -1 || window.isNaN(params.value)) {
+                    tips =
+                        "<font style='color:#fff'>" +
+                        params.name +
+                        '</font><br/>区域污染评估:' +
+                        "<font style='color:#fff'><font style='color:#fff'>暂无数据</font><br/>"
+                } else if (params.value === 0.1 || window.isNaN(params.value)) {
+                    tips =
+                        "<font style='color:#fff'>" +
+                        params.name +
+                        '</font><br/>区域污染评估:' +
+                        "<font style='color:#fff'><font style='color:#fff'>暂无数据</font><br/>"
+                } else {
+                    tips +=
+                        "<font style='color:#fff'>" +
+                        params.name +
+                        '</font><br/>区域污染评估' +
+                        "<font style='color:#fff'>：" +
+                        params.value +
+                        '</font><br/>'
+                }
+                return tips
+            }
+        },
+
+        visualMap: {
+            min: 0,
+            max: 2,
+            left: 25,
+            bottom: 40,
+            show: false,
+            pieces: [
+                {
+                    gt: 2,
+                    lt: 10000,
+                    label: '重度污染',
+                    color: '#A52a2a'
+                },
+                {
+                    gte: 1.2,
+                    lt: 1.6,
+                    label: '轻度污染',
+                    color: '#FFCC33'
+                },
+                {
+                    gt: 1.6,
+                    lt: 2,
+                    label: '中度污染',
+                    color: '#FF9900'
+                },
+                {
+                    gte: 1,
+                    lte: 1.2,
+                    label: '轻微污染',
+                    color: '#3399FF'
+                },
+                {
+                    gte: 0.1,
+                    lte: 1,
+                    label: '无污染',
+                    color: '#339966'
+                },
+                {
+                    gte: -1,
+                    lte: 0.14159,
+                    label: '无数据',
+                    color: '#ccc'
+                }
+            ]
+        },
+
+        options: {
+            series: [
+                {
+                    type: 'map',
+                    geoIndex: 0,
+                    data: arr1
+                }
+            ]
+        }
+    }
+}
+
+onMounted(() => {
+    setTimeout(() => {
+        tableStore.index()
+    }, 10)
+})
+const layout = mainHeight(160) as any
+const layout1 = mainHeight(93) as any
+</script>
+<style lang="scss" scoped>
+.tall {
+    height: calc(v-bind('layout1.height') / 2);
+}
+
+.tag {
+    color: #fff;
+    border: #fff;
+    margin-left: 5px;
+    width: 28px;
+}
+
+.text {
+    font-weight: bold;
+    font-size: 12px;
+}
+
+:deep(.cardBox) {
+    box-sizing: border-box;
+    overflow: auto;
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+    grid-template-rows: max-content;
+    grid-gap: 10px;
+    justify-content: center;
+
+    .el-card {
+        background-image: linear-gradient(var(--el-color-primary), var(--el-color-primary-light-3));
+        font-weight: bold;
+
+        .el-card__header {
+            padding: 10px !important;
+            color: #fff;
+
+            div {
+                display: flex;
+                justify-content: space-between;
+            }
+        }
+
+        .el-card__body {
+            padding: 10px !important;
+        }
+
+        .card-content {
+            height: 200px;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            overflow-y: auto;
+            color: #000;
+
+            .card-item {
+                margin-bottom: 20px;
+                width: 50%;
+                display: flex;
+                cursor: pointer;
+            }
+
+            .xdf {
+                width: 70%;
+            }
+
+            .tooltipText {
+                font-weight: 500;
+                font-size: 12px;
+                color: #fff;
+                // width: 50%;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                margin-left: 5px;
+            }
+        }
+    }
+}
+.map {
+    height: v-bind('layout.height');
+    width: 100%;
+}
+:deep(.el-carousel__indicators) {
+    display: none;
+}
+.legend {
+    position: absolute;
+    right: 15px;
+    top: 20px;
+    z-index: 99;
+}
+</style>
diff --git a/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue b/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
index a4cbce59..b1127331 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/harmonicStatistics/index.vue
@@ -3,12 +3,12 @@
         <TableHeader datePicker ref="header">
             <template v-slot:select>
                 <el-form-item label="统计类型">
-                    <el-select v-model="tableStore.table.params.statisticalType" value-key="id" placeholder="请选择统计类型">
+                    <el-select v-model="tableStore.table.params.statisticalType" value-key="id" placeholder="请选择统计类型" filterable>
                         <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="电网标志">
-                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
+                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志" filterable  >
                         <el-option v-for="item in sign" :key="item.id" :label="item.name" :value="item.algoDescribe" />
                     </el-select>
                 </el-form-item>
diff --git a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/MonitoringPointTab.vue b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/MonitoringPointTab.vue
index 90ec3c34..a451c35e 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/MonitoringPointTab.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/MonitoringPointTab.vue
@@ -17,6 +17,7 @@
                         value-key="id"
                         placeholder="请选择统计类型"
                         @change="handleStatisticalTypeChange"
+                        filterable
                     >
                         <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
                     </el-select>
@@ -26,6 +27,7 @@
                         v-model="tableStore.table.params.powerFlag"
                         placeholder="请选择电网标志"
                         @change="handleFilterChange"
+                        filterable
                     >
                         <el-option label="全部" value="0"></el-option>
                         <el-option label="电网侧" value="1"></el-option>
diff --git a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/SubstationTab.vue b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/SubstationTab.vue
index 30285d4c..a8169c20 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/SubstationTab.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/SubstationTab.vue
@@ -15,7 +15,8 @@
                     <el-select
                         v-model="tableStore.table.params.statisticalType"
                         value-key="id"
-                        placeholder="请选择统计类型"
+                        placeholder="请选择统计类型" 
+                        filterable
                     >
                         <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
                     </el-select>
@@ -25,6 +26,7 @@
             v-model="tableStore.table.params.powerFlag" 
             placeholder="请选择电网标志"
             @change="handleFilterChange"
+            filterable
           >
             <el-option label="全部" value="0"></el-option>
             <el-option label="电网侧" value="1"></el-option>
diff --git a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/regionalAssessment.vue b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/regionalAssessment.vue
index 9e21ca8f..39a1786d 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/regionalAssessment.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/regionalAssessment.vue
@@ -7,6 +7,7 @@
                         v-model="tableStore.table.params.statisticalType"
                         value-key="id"
                         placeholder="请选择统计类型"
+                        filterable
                     >
                         <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
                     </el-select>
diff --git a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue
index ed18109d..644bfd04 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue
@@ -7,6 +7,7 @@
                         v-model="tableStore.table.params.statisticalType"
                         value-key="id"
                         placeholder="请选择统计类型"
+                        filterable
                     >
                         <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
                     </el-select>
diff --git a/src/views/pqs/harmonicMonitoring/detailed/powerQualityPollutionMap/index.vue b/src/views/pqs/harmonicMonitoring/detailed/powerQualityPollutionMap/index.vue
index dcf934a2..16527179 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/powerQualityPollutionMap/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/powerQualityPollutionMap/index.vue
@@ -3,7 +3,7 @@
         <TableHeader area date-picker ref="header">
             <template v-slot:select>
                 <el-form-item label="统计类型">
-                    <el-select v-model="tableStore.table.params.statisticalType" value-key="id" placeholder="请选择统计类型">
+                    <el-select v-model="tableStore.table.params.statisticalType" value-key="id" placeholder="请选择统计类型" filterable>
                         <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
                     </el-select>
                 </el-form-item>
diff --git a/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue b/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue
index faa59f7b..dde14517 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue
@@ -7,6 +7,7 @@
                         v-model="tableStore.table.params.statisticalType"
                         placeholder="请选择统计类型"
                         value-key="id"
+                        filterable
                     >
                         <el-option
                             v-for="item in classificationData"
diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/echart.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/echart.vue
index 84f3d310..8915f38b 100644
--- a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/echart.vue
+++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/echart.vue
@@ -6,6 +6,7 @@
                     v-model="tableStore.table.params.statisticalType"
                     value-key="id"
                     placeholder="请选择统计类型"
+                    filterable
                 >
                     <el-option
                         v-for="item in classificationData"
@@ -24,6 +25,7 @@
                     clearable
                     value-key="id"
                     placeholder="请选择电压等级"
+                    filterable
                 >
                     <el-option
                         v-for="item in voltageleveloption"
@@ -41,6 +43,7 @@
                     clearable
                     value-key="id"
                     placeholder="请选择终端厂家"
+                    filterable
                 >
                     <el-option
                         v-for="item in terminaloption"
@@ -58,7 +61,8 @@
                     clearable
                     value-key="id"
                     placeholder="请选择干扰源类型"
-                >
+                    filterable
+                    >
                     <el-option
                         v-for="item in interfereoption"
                         :key="item.id"
diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue
index a38957f5..2df971ec 100644
--- a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue
+++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue
@@ -13,6 +13,7 @@
                     v-model="tableStore.table.params.statisticalType"
                     value-key="id"
                     placeholder="请选择统计类型"
+                    filterable
                 >
                     <el-option
                         v-for="item in classificationData"
@@ -31,6 +32,7 @@
                     clearable
                     value-key="id"
                     placeholder="请选择电压等级"
+                    filterable
                 >
                     <el-option
                         v-for="item in voltageleveloption"
@@ -48,6 +50,7 @@
                     clearable
                     value-key="id"
                     placeholder="请选择终端厂家"
+                    filterable
                 >
                     <el-option
                         v-for="item in terminaloption"
@@ -65,6 +68,7 @@
                     clearable
                     value-key="id"
                     placeholder="请选择干扰源类型"
+                    filterable
                 >
                     <el-option
                         v-for="item in interfereoption"
diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/echart.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/echart.vue
index 84f3d310..8d8ca9a2 100644
--- a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/echart.vue
+++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/echart.vue
@@ -6,6 +6,7 @@
                     v-model="tableStore.table.params.statisticalType"
                     value-key="id"
                     placeholder="请选择统计类型"
+                    filterable
                 >
                     <el-option
                         v-for="item in classificationData"
@@ -24,6 +25,7 @@
                     clearable
                     value-key="id"
                     placeholder="请选择电压等级"
+                    filterable
                 >
                     <el-option
                         v-for="item in voltageleveloption"
@@ -41,6 +43,7 @@
                     clearable
                     value-key="id"
                     placeholder="请选择终端厂家"
+                    filterable
                 >
                     <el-option
                         v-for="item in terminaloption"
@@ -58,6 +61,7 @@
                     clearable
                     value-key="id"
                     placeholder="请选择干扰源类型"
+                    filterable
                 >
                     <el-option
                         v-for="item in interfereoption"
diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/table.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/table.vue
index ab56ade6..872dd84b 100644
--- a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/table.vue
+++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/table.vue
@@ -13,6 +13,7 @@
                     v-model="tableStore.table.params.statisticalType"
                     value-key="id"
                     placeholder="请选择统计类型"
+                    filterable
                 >
                     <el-option
                         v-for="item in classificationData"
@@ -31,6 +32,7 @@
                     clearable
                     value-key="id"
                     placeholder="请选择电压等级"
+                    filterable
                 >
                     <el-option
                         v-for="item in voltageleveloption"
@@ -48,6 +50,7 @@
                     clearable
                     value-key="id"
                     placeholder="请选择终端厂家"
+                    filterable
                 >
                     <el-option
                         v-for="item in terminaloption"
@@ -65,6 +68,7 @@
                     clearable
                     value-key="id"
                     placeholder="请选择干扰源类型"
+                    filterable
                 >
                     <el-option
                         v-for="item in interfereoption"
diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue
index 2f80f16e..60eacd90 100644
--- a/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue
+++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/index_JB.vue
@@ -3,7 +3,7 @@
         <TableHeader date-picker area ref="TableHeaderRef">
             <template v-slot:select>
                 <el-form-item label="运行状态">
-                    <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态">
+                    <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态" filterable>
                         <el-option
                             v-for="item in runFlagList"
                             :key="item.id"
diff --git a/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/echart.vue b/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/echart.vue
index 7167c5ee..9e5a7e6d 100644
--- a/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/echart.vue
+++ b/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/echart.vue
@@ -6,6 +6,7 @@
                     v-model="tableStore.table.params.statisticalType"
                     value-key="id"
                     placeholder="请选择统计类型"
+                    filterable
                 >
                     <el-option
                         v-for="item in classificationData"
@@ -24,6 +25,7 @@
                     clearable
                     value-key="id"
                     placeholder="请选择电压等级"
+                    filterable
                 >
                     <el-option
                         v-for="item in voltageleveloption"
@@ -41,6 +43,7 @@
                     clearable
                     value-key="id"
                     placeholder="请选择终端厂家"
+                    filterable
                 >
                     <el-option
                         v-for="item in terminaloption"
@@ -58,6 +61,7 @@
                     clearable
                     value-key="id"
                     placeholder="请选择干扰源类型"
+                    filterable
                 >
                     <el-option
                         v-for="item in interfereoption"
diff --git a/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/table.vue b/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/table.vue
index 5368fdc1..489be297 100644
--- a/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/table.vue
+++ b/src/views/pqs/harmonicMonitoring/embed/onlinerate/components/table.vue
@@ -5,7 +5,7 @@
                 <el-input v-model="tableStore.table.params.filterName" @keyup="searchEvent" placeholder="输入关键字筛选" />
             </el-form-item>
             <el-form-item label="统计类型:">
-                <el-select v-model="tableStore.table.params.statisticalType" value-key="id" placeholder="请选择统计类型">
+                <el-select v-model="tableStore.table.params.statisticalType" value-key="id" placeholder="请选择统计类型" filterable>
                     <el-option v-for="item in classificationData" :key="item.id" :label="item.name"
                         :value="item"></el-option>
                 </el-select>
@@ -13,21 +13,21 @@
 
             <el-form-item label="电压等级:">
                 <el-select v-model="tableStore.table.params.scale" multiple collapse-tags clearable value-key="id"
-                    placeholder="请选择电压等级">
+                    placeholder="请选择电压等级" filterable>
                     <el-option v-for="item in voltageleveloption" :key="item.id" :label="item.name"
                         :value="item"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="终端厂家:">
                 <el-select v-model="tableStore.table.params.manufacturer" multiple collapse-tags clearable
-                    value-key="id" placeholder="请选择终端厂家">
+                    value-key="id" placeholder="请选择终端厂家" filterable>
                     <el-option v-for="item in terminaloption" :key="item.id" :label="item.name"
                         :value="item"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="干扰源类型:">
                 <el-select v-model="tableStore.table.params.loadType" multiple collapse-tags clearable value-key="id"
-                    placeholder="请选择干扰源类型">
+                    placeholder="请选择干扰源类型" filterable>
                     <el-option v-for="item in interfereoption" :key="item.id" :label="item.name"
                         :value="item"></el-option>
                 </el-select>
diff --git a/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue b/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue
index fee0ce9b..1dafd360 100644
--- a/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue
+++ b/src/views/pqs/harmonicMonitoring/embed/onlinerate/index_JB.vue
@@ -3,7 +3,7 @@
         <TableHeader date-picker area ref="TableHeaderRef">
             <template v-slot:select>
                 <el-form-item label="运行状态">
-                    <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态">
+                    <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态" filterable>
                         <el-option
                             v-for="item in runFlagList"
                             :key="item.id"
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/gaojingshujutongji/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/gaojingshujutongji/index.vue
index 4a3c4cbe..bcbe5e25 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/gaojingshujutongji/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/gaojingshujutongji/index.vue
@@ -28,7 +28,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="谐波次数:" v-if="showXieBoCiShu">
-                <el-select style="width: 100%" v-model="formData.harmonic" placeholder="请选择谐波">
+                <el-select style="width: 100%" v-model="formData.harmonic" placeholder="请选择谐波" filterable>
                     <el-option
                         v-for="item in harmonicOptions"
                         :key="item.value"
@@ -38,7 +38,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item v-if="showJianXieBoCiShu" label="间谐波次数:">
-                <el-select style="width: 100%" v-model="formData.inHarmonic" placeholder="请选择间谐波">
+                <el-select style="width: 100%" v-model="formData.inHarmonic" placeholder="请选择间谐波" filterable>
                     <el-option
                         v-for="item in inharmonicOptions"
                         :key="item.value"
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/gaojingshujutongji/index_JB.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/gaojingshujutongji/index_JB.vue
index bc6ca2d1..35cf0b5d 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/gaojingshujutongji/index_JB.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/gaojingshujutongji/index_JB.vue
@@ -6,7 +6,7 @@
                     <el-select
                         v-model="tableStore.table.params.targetId"
                         clearable
-                      
+                        filterable
                         collapse-tags
                         collapse-tags-tooltip
                         placeholder="请选择超标指标"
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/spectrum.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/spectrum.vue
index 7e9199d6..19c6cd47 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/spectrum.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/spectrum.vue
@@ -3,7 +3,7 @@
         <el-button class="shutDown" icon="el-icon-Back" @click="emit('shutDown')">返回</el-button>
         <div class="select">
             <div class="mr10">谐波次数</div>
-            <el-select v-model="selectValue" style="width: 100px" @change="loading = true">
+            <el-select v-model="selectValue" style="width: 100px" @change="loading = true" filterable>
                 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
         </div>
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/trend.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/trend.vue
index 399a0e92..d0cd4f04 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/trend.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/trend.vue
@@ -1,407 +1,408 @@
-<template>
-    <div class="pt50">
-        <el-button class="shutDown" icon="el-icon-Back" @click="emit('shutDown')">返回</el-button>
-        <div class="select">
-            <el-form :model="searchForm" id="history_select">
-                <el-form-item label="稳态指标">
-                    <el-select
-                        multiple
-                        collapse-tags
-                        collapse-tags-tooltip
-                        v-model.trim="searchForm.index"
-                        placeholder="请选择统计指标"
-                        :multiple-limit="3"
-                        value-key="id"
-                        @change="change"
-                    >
-                        <el-option
-                            v-for="(item, index) in indexOptions"
-                            :label="item.name"
-                            :key="index"
-                            :value="item"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-            </el-form>
-        </div>
-        <div v-loading="loading" id="trend">
-            <div :style="height" v-for="(item, index) in searchForm.index" :key="index">
-                <MyEchart ref="MyEchartRef" :options="item.echartsData" :isInterVal="true"   @group="group"></MyEchart>
-            </div>
-        </div>
-    </div>
-</template>
-<script setup lang="ts">
-import { ref, reactive, onMounted, onBeforeUnmount } from 'vue'
-import MyEchart from '@/components/echarts/MyEchart.vue'
-import { mainHeight } from '@/utils/layout'
-import { timeFormat } from '@/utils/common'
-import { useConfig } from '@/stores/config'
-import { yMethod } from '@/utils/echartMethod'
-import html2canvas from 'html2canvas'
-import * as echarts from 'echarts' // 全引入
-const config = useConfig()
-const props = defineProps({
-    ptName: {
-        type: String
-    }
-})
-const loading = ref(true)
-const emit = defineEmits(['shutDown'])
-const searchForm: any = ref({ index: [] })
-const timeList = ref([])
-const MyEchartRef = ref()
-const height = ref(mainHeight(150, 2))
-//统计指标
-const indexOptions: any = ref([
-    {
-        id: 0,
-        name: '电压总有效值(kV)',
-        children: [
-            { name: 'vRmsA', phase: props.ptName == 'star' ? 'A相' : 'AB相', data: [] },
-            { name: 'vRmsB', phase: props.ptName == 'star' ? 'B相' : 'BC相', data: [] },
-            { name: 'vRmsC', phase: props.ptName == 'star' ? 'C相' : 'CA相', data: [] }
-        ],
-        color: ['#DAA520', '#2E8B57', '#A52a2a'],
-        unit: 'kV',
-        data: []
-    },
-    {
-        id: 1,
-        name: '电流总有效值(A)',
-        children: [
-            { name: 'iRmsA', phase: 'A相', data: [] },
-            { name: 'iRmsB', phase: 'B相', data: [] },
-            { name: 'iRmsC', phase: 'C相', data: [] }
-        ],
-        color: ['#DAA520', '#2E8B57', '#A52a2a'],
-        unit: 'A',
-        data: []
-    },
-    {
-        id: 2,
-        name: '有功功率(kW)',
-        children:
-            props.ptName == 'star'
-                ? [
-                      { name: 'pA', phase: 'A相', data: [] },
-                      { name: 'pB', phase: 'B相', data: [] },
-                      { name: 'pC', phase: 'C相', data: [] },
-                      { name: 'pTot', phase: '总', data: [] }
-                  ]
-                : [{ name: 'pTot', phase: '总', data: [] }],
-        color: props.ptName == 'star' ? ['#DAA520', '#2E8B57', '#A52a2a', '#000'] : ['#000'],
-        unit: 'kW',
-        data: []
-    },
-    {
-        id: 3,
-        name: '无功功率(kW)',
-        children:
-            props.ptName == 'star'
-                ? [
-                      { name: 'qA', phase: 'A相', data: [] },
-                      { name: 'qB', phase: 'B相', data: [] },
-                      { name: 'qC', phase: 'C相', data: [] },
-                      { name: 'qTot', phase: '总', data: [] }
-                  ]
-                : [{ name: 'qTot', phase: '总', data: [] }],
-        color: props.ptName == 'star' ? ['#DAA520', '#2E8B57', '#A52a2a', '#000'] : ['#000'],
-        unit: 'kW',
-        data: []
-    },
-
-    {
-        id: 4,
-        name: '基波电压总有效值(kV)',
-        children: [
-            { name: 'v1A', phase: props.ptName == 'star' ? 'A相' : 'AB相', data: [] },
-            { name: 'v1B', phase: props.ptName == 'star' ? 'B相' : 'BC相', data: [] },
-            { name: 'v1C', phase: props.ptName == 'star' ? 'C相' : 'CA相', data: [] }
-        ],
-        color: ['#DAA520', '#2E8B57', '#A52a2a'],
-        unit: 'kV',
-        data: []
-    },
-    {
-        id: 5,
-        name: '基波电流总有效值(A)',
-        children: [
-            { name: 'i1A', phase: 'A相', data: [] },
-            { name: 'i1B', phase: 'B相', data: [] },
-            { name: 'i1C', phase: 'C相', data: [] }
-        ],
-        color: ['#DAA520', '#2E8B57', '#A52a2a'],
-        unit: 'A',
-        data: []
-    },
-    {
-        id: 6,
-        name: '频率(Hz)',
-        children: [
-            { name: 'freq', phase: '频率', data: [] },
-            { name: 'freqDev', phase: '频率偏差', data: [] }
-        ],
-        color: [config.layout.elementUiPrimary[0], '#00BFF5'],
-        unit: 'Hz',
-        data: []
-    },
-    {
-        id: 7,
-        name: '电压不平衡度(%)',
-        children: [{ name: 'vUnbalance', phase: '电压不平衡度', data: [] }],
-        color: [config.layout.elementUiPrimary[0]],
-        unit: '%',
-        data: []
-    },
-    {
-        id: 8,
-        name: '电流不平衡度(%)',
-        children: [{ name: 'iUnbalance', phase: '电流不平衡度', data: [] }],
-        color: [config.layout.elementUiPrimary[0]],
-        unit: '%',
-        data: []
-    }
-])
-const group = (e: any) => {
-    e.group = 'group'
-}
-const change = () => {
-    height.value = mainHeight(150, searchForm.value.index.length)
-    // let name = searchForm.value.index.map(item => item.name)
-    // let list = indexOptions.value.filter(item => !name.includes(item.name))
-    loading.value = true
-    searchForm.value.index.forEach((item: any) => {
-        item.echartsData.xAxis.data = []
-        item.echartsData.series.forEach((child: any) => {
-            child.data = []
-        })
-    })
-
-    // console.log("🚀 ~ change ~ MyEchartRef.value[0]?.getChart():", MyEchartRef.value[0]?.getChart())
-}
-onMounted(() => {
-    setEcharts()
-    searchForm.value.index.push(...[indexOptions.value[0], indexOptions.value[1]])
-})
-const init = (row: any) => {
-    // timeList.value.push(timeFormat(row.TIME - 0))
-    searchForm.value.index.forEach((item: any, index: any) => {
-        // item.echartsData.xAxis.data.push(timeFormat(row.TIME - 0))
-        let time = timeFormat(row.TIME - 0)
-        switch (item.name) {
-            case '电压总有效值(kV)':
-                item.echartsData.series[0].data.push([
-                    time,
-                    Math.floor((props.ptName == 'star' ? row.V.A?.VRMS : row.V.A?.VRMS_LVR) * 100) / 100
-                ])
-                item.echartsData.series[1].data.push([
-                    time,
-                    Math.floor((props.ptName == 'star' ? row.V.B?.VRMS : row.V.B?.VRMS_LVR) * 100) / 100
-                ])
-                item.echartsData.series[2].data.push([
-                    time,
-                    Math.floor((props.ptName == 'star' ? row.V.C?.VRMS : row.V.C?.VRMS_LVR) * 100) / 100
-                ])
-                break
-            case '电流总有效值(A)':
-                item.echartsData.series[0].data.push([time, Math.floor(row.I.A?.IRMS * 100) / 100])
-                item.echartsData.series[1].data.push([time, Math.floor(row.I.B?.IRMS * 100) / 100])
-                item.echartsData.series[2].data.push([time, Math.floor(row.I.C?.IRMS * 100) / 100])
-                break
-            case '有功功率(kW)':
-                if (props.ptName == 'star') {
-                    item.echartsData.series[0].data.push([time, Math.floor(row.PQ.A?.P * 100) / 100])
-                    item.echartsData.series[1].data.push([time, Math.floor(row.PQ.B?.P * 100) / 100])
-                    item.echartsData.series[2].data.push([time, Math.floor(row.PQ.C?.P * 100) / 100])
-                    item.echartsData.series[3].data.push([time, Math.floor(row.PQ.T?.P * 100) / 100])
-                } else {
-                    item.echartsData.series[0].data.push([time, Math.floor(row.PQ.T?.P * 100) / 100])
-                }
-
-                break
-            case '无功功率(kW)':
-                if (props.ptName == 'star') {
-                    item.echartsData.series[0].data.push([time, Math.floor(row.PQ.A?.Q * 100) / 100])
-                    item.echartsData.series[1].data.push([time, Math.floor(row.PQ.B?.Q * 100) / 100])
-                    item.echartsData.series[2].data.push([time, Math.floor(row.PQ.C?.Q * 100) / 100])
-                    item.echartsData.series[3].data.push([time, Math.floor(row.PQ.T?.Q * 100) / 100])
-                } else {
-                    item.echartsData.series[0].data.push([time, Math.floor(row.PQ.T?.Q * 100) / 100])
-                }
-
-                break
-            case '基波电压总有效值(kV)':
-                item.echartsData.series[0].data.push([time, Math.floor(row.V.A?.V1 * 100) / 100])
-                item.echartsData.series[1].data.push([time, Math.floor(row.V.B?.V1 * 100) / 100])
-                item.echartsData.series[2].data.push([time, Math.floor(row.V.C?.V1 * 100) / 100])
-                break
-            case '基波电流总有效值(A)':
-                item.echartsData.series[0].data.push([time, Math.floor(row.I.A?.I1 * 100) / 100])
-                item.echartsData.series[1].data.push([time, Math.floor(row.I.B?.I1 * 100) / 100])
-                item.echartsData.series[2].data.push([time, Math.floor(row.I.C?.I1 * 100) / 100])
-                break
-            case '频率(Hz)':
-                item.echartsData.series[0].data.push([time, Math.floor(row.V.T?.FREQ * 100) / 100])
-                item.echartsData.series[1].data.push([time, Math.floor(row.V.T?.DELTA_FREQ * 100) / 100])
-                break
-            case '电压不平衡度(%)':
-                item.echartsData.series[0].data.push([time, Math.floor(row.V.T?.V_UNBAN * 100) / 100])
-
-                break
-            case '电流不平衡度(%)':
-                item.echartsData.series[0].data.push([time, Math.floor(row.I.T?.I_UNBAN * 100) / 100])
-                break
-        }
-        item.echartsData.series.forEach((item1: any) => {
-            if (item1.data.length > 60) {
-                item1.data.shift()
-            }
-        })
-
-        let [min, max] = yMethod([].concat(...item.echartsData.series.map(k => k.data).map(k1 => k1.map(k2 => k2[1]))))
-        item.echartsData.yAxis.min = min
-        item.echartsData.yAxis.max = max
-    })
-
-    MyEchartRef.value[0]?.setOptions(searchForm.value.index[0].echartsData)
-    MyEchartRef.value[1]?.setOptions(searchForm.value.index[1].echartsData)
-    MyEchartRef.value[2]?.setOptions(searchForm.value.index[2].echartsData)
-    if (loading.value) {
-        echarts.connect('group')
-    }
-
-    loading.value = false
-}
-const setEcharts = () => {
-    indexOptions.value.forEach((item: any, index: any) => {
-        item.echartsData = {
-            title: {
-                text: item.name
-            },
-
-            xAxis: {
-                name: '时间',
-                type: 'time',
-                axisLabel: {
-                    interval: 0, // 强制显示所有标签
-                    formatter: {
-                        day: '{MM}-{dd}',
-                        month: '{MM}',
-                        year: '{yyyy}'
-                    }
-                },
-
-                data: []
-            },
-
-            yAxis: {
-                // type: 'value',
-                name: item.unit,
-                splitNumber: 5,
-                minInterval: 1,
-                alignTicks: true // 强制对齐刻度
-            },
-            toolbox: {
-                right: 20,
-                top: 15,
-                show: index == 0 ? true : false,
-                feature: {
-                    // 移除默认的 saveAsImage
-                    // saveAsImage: { title: '保存图片' }
-                    myCustomDownload: {
-                        title: '', // 按钮标题
-                        icon: 'path://M892.342857 463.238095l-73.142857-68.266666-258.438095 258.438095V29.257143h-97.52381v624.152381L204.8 394.971429 131.657143 463.238095l380.342857 380.342857zM107.27619 897.219048h804.571429v97.523809H107.27619z', // 自定义图标路径
-
-                        onclick: function () {
-                            html2canvas(document.getElementById('trend'), {
-                                scale: 1
-                            }).then(function (canvas) {
-                                // 创建a标签，实现下载
-                                let creatIMg = document.createElement('a')
-                                creatIMg.download = '实时趋势.png' // 设置下载的文件名，
-                                creatIMg.href = canvas.toDataURL() // 下载url
-                                creatIMg.click()
-                                creatIMg.remove() // 下载之后把创建的元素删除
-                            })
-                        }
-                    }
-                }
-            },
-
-            tooltip: {
-                axisPointer: {
-                    type: 'cross',
-                    label: {
-                        color: '#fff',
-                        fontSize: 16
-                    }
-                },
-                textStyle: {
-                    color: '#fff',
-                    fontStyle: 'normal',
-                    opacity: 0.35,
-                    fontSize: 14
-                },
-                backgroundColor: 'rgba(0,0,0,0.55)',
-                borderWidth: 0,
-                formatter(params: any) {
-                  
-                    const xname = params[0].value[0]
-                    let str = `${xname}<br>`
-                    params.forEach((el: any, index: any) => {
-                        let marker = ''
-
-                        // if (el.value[3] == 'dashed') {
-                        //     for (let i = 0; i < 3; i++) {
-                        //         marker += `<span style="display:inline-block;border: 2px ${el.color} solid;margin-right:5px;width:10px;height:0px;background-color:#ffffff00;"></span>`
-                        //     }
-                        // } else {
-                        //     marker = `<span style="display:inline-block;border: 2px ${el.color} ${el.value[3]};margin-right:5px;width:40px;height:0px;background-color:#ffffff00;"></span>`
-                        // }
-                        str += `${el.marker} ${el.seriesName.split('(')[0]}：${
-                            el.value[1] ? el.value[1] + ' ' + (el.value[2] || '') : '-'
-                        }<br>`
-                    })
-                    return str
-                }
-            },
-            series: []
-        }
-        item.children.map((zz: any, zzIndex: any) => {
-            item.echartsData.series.push({
-                name: zz.phase,
-                type: 'line',
-                increment: true,
-                itemStyle: {
-                    barBorderRadius: [3, 3, 0, 0],
-                    color: [...item.color][zzIndex]
-                },
-                data: [],
-                smooth: true, // 这里设置平滑曲线
-                symbol: 'none' // 设置为 'none' 去掉折点小圆
-            })
-        })
-    })
-}
-onBeforeUnmount(() => {
-    echarts.disconnect('group')
-})
-defineExpose({
-    init
-})
-</script>
-<style lang="scss" scoped>
-.shutDown {
-    position: absolute;
-    right: 10px;
-    top: 10px;
-}
-.select {
-    position: absolute;
-    top: 10px;
-    display: flex;
-    align-items: center;
-    font-size: 14px;
-}
-</style>
+<template>
+    <div class="pt50">
+        <el-button class="shutDown" icon="el-icon-Back" @click="emit('shutDown')">返回</el-button>
+        <div class="select">
+            <el-form :model="searchForm" id="history_select">
+                <el-form-item label="稳态指标">
+                    <el-select
+                        multiple
+                        collapse-tags
+                        collapse-tags-tooltip
+                        v-model.trim="searchForm.index"
+                        placeholder="请选择统计指标"
+                        :multiple-limit="3"
+                        value-key="id"
+                        @change="change"
+                        filterable
+                    >
+                        <el-option
+                            v-for="(item, index) in indexOptions"
+                            :label="item.name"
+                            :key="index"
+                            :value="item"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+        </div>
+        <div v-loading="loading" id="trend">
+            <div :style="height" v-for="(item, index) in searchForm.index" :key="index">
+                <MyEchart ref="MyEchartRef" :options="item.echartsData" :isInterVal="true"   @group="group"></MyEchart>
+            </div>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, reactive, onMounted, onBeforeUnmount } from 'vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { mainHeight } from '@/utils/layout'
+import { timeFormat } from '@/utils/common'
+import { useConfig } from '@/stores/config'
+import { yMethod } from '@/utils/echartMethod'
+import html2canvas from 'html2canvas'
+import * as echarts from 'echarts' // 全引入
+const config = useConfig()
+const props = defineProps({
+    ptName: {
+        type: String
+    }
+})
+const loading = ref(true)
+const emit = defineEmits(['shutDown'])
+const searchForm: any = ref({ index: [] })
+const timeList = ref([])
+const MyEchartRef = ref()
+const height = ref(mainHeight(150, 2))
+//统计指标
+const indexOptions: any = ref([
+    {
+        id: 0,
+        name: '电压总有效值(kV)',
+        children: [
+            { name: 'vRmsA', phase: props.ptName == 'star' ? 'A相' : 'AB相', data: [] },
+            { name: 'vRmsB', phase: props.ptName == 'star' ? 'B相' : 'BC相', data: [] },
+            { name: 'vRmsC', phase: props.ptName == 'star' ? 'C相' : 'CA相', data: [] }
+        ],
+        color: ['#DAA520', '#2E8B57', '#A52a2a'],
+        unit: 'kV',
+        data: []
+    },
+    {
+        id: 1,
+        name: '电流总有效值(A)',
+        children: [
+            { name: 'iRmsA', phase: 'A相', data: [] },
+            { name: 'iRmsB', phase: 'B相', data: [] },
+            { name: 'iRmsC', phase: 'C相', data: [] }
+        ],
+        color: ['#DAA520', '#2E8B57', '#A52a2a'],
+        unit: 'A',
+        data: []
+    },
+    {
+        id: 2,
+        name: '有功功率(kW)',
+        children:
+            props.ptName == 'star'
+                ? [
+                      { name: 'pA', phase: 'A相', data: [] },
+                      { name: 'pB', phase: 'B相', data: [] },
+                      { name: 'pC', phase: 'C相', data: [] },
+                      { name: 'pTot', phase: '总', data: [] }
+                  ]
+                : [{ name: 'pTot', phase: '总', data: [] }],
+        color: props.ptName == 'star' ? ['#DAA520', '#2E8B57', '#A52a2a', '#000'] : ['#000'],
+        unit: 'kW',
+        data: []
+    },
+    {
+        id: 3,
+        name: '无功功率(kW)',
+        children:
+            props.ptName == 'star'
+                ? [
+                      { name: 'qA', phase: 'A相', data: [] },
+                      { name: 'qB', phase: 'B相', data: [] },
+                      { name: 'qC', phase: 'C相', data: [] },
+                      { name: 'qTot', phase: '总', data: [] }
+                  ]
+                : [{ name: 'qTot', phase: '总', data: [] }],
+        color: props.ptName == 'star' ? ['#DAA520', '#2E8B57', '#A52a2a', '#000'] : ['#000'],
+        unit: 'kW',
+        data: []
+    },
+
+    {
+        id: 4,
+        name: '基波电压总有效值(kV)',
+        children: [
+            { name: 'v1A', phase: props.ptName == 'star' ? 'A相' : 'AB相', data: [] },
+            { name: 'v1B', phase: props.ptName == 'star' ? 'B相' : 'BC相', data: [] },
+            { name: 'v1C', phase: props.ptName == 'star' ? 'C相' : 'CA相', data: [] }
+        ],
+        color: ['#DAA520', '#2E8B57', '#A52a2a'],
+        unit: 'kV',
+        data: []
+    },
+    {
+        id: 5,
+        name: '基波电流总有效值(A)',
+        children: [
+            { name: 'i1A', phase: 'A相', data: [] },
+            { name: 'i1B', phase: 'B相', data: [] },
+            { name: 'i1C', phase: 'C相', data: [] }
+        ],
+        color: ['#DAA520', '#2E8B57', '#A52a2a'],
+        unit: 'A',
+        data: []
+    },
+    {
+        id: 6,
+        name: '频率(Hz)',
+        children: [
+            { name: 'freq', phase: '频率', data: [] },
+            { name: 'freqDev', phase: '频率偏差', data: [] }
+        ],
+        color: [config.layout.elementUiPrimary[0], '#00BFF5'],
+        unit: 'Hz',
+        data: []
+    },
+    {
+        id: 7,
+        name: '电压不平衡度(%)',
+        children: [{ name: 'vUnbalance', phase: '电压不平衡度', data: [] }],
+        color: [config.layout.elementUiPrimary[0]],
+        unit: '%',
+        data: []
+    },
+    {
+        id: 8,
+        name: '电流不平衡度(%)',
+        children: [{ name: 'iUnbalance', phase: '电流不平衡度', data: [] }],
+        color: [config.layout.elementUiPrimary[0]],
+        unit: '%',
+        data: []
+    }
+])
+const group = (e: any) => {
+    e.group = 'group'
+}
+const change = () => {
+    height.value = mainHeight(150, searchForm.value.index.length)
+    // let name = searchForm.value.index.map(item => item.name)
+    // let list = indexOptions.value.filter(item => !name.includes(item.name))
+    loading.value = true
+    searchForm.value.index.forEach((item: any) => {
+        item.echartsData.xAxis.data = []
+        item.echartsData.series.forEach((child: any) => {
+            child.data = []
+        })
+    })
+
+    // console.log("🚀 ~ change ~ MyEchartRef.value[0]?.getChart():", MyEchartRef.value[0]?.getChart())
+}
+onMounted(() => {
+    setEcharts()
+    searchForm.value.index.push(...[indexOptions.value[0], indexOptions.value[1]])
+})
+const init = (row: any) => {
+    // timeList.value.push(timeFormat(row.TIME - 0))
+    searchForm.value.index.forEach((item: any, index: any) => {
+        // item.echartsData.xAxis.data.push(timeFormat(row.TIME - 0))
+        let time = timeFormat(row.TIME - 0)
+        switch (item.name) {
+            case '电压总有效值(kV)':
+                item.echartsData.series[0].data.push([
+                    time,
+                    Math.floor((props.ptName == 'star' ? row.V.A?.VRMS : row.V.A?.VRMS_LVR) * 100) / 100
+                ])
+                item.echartsData.series[1].data.push([
+                    time,
+                    Math.floor((props.ptName == 'star' ? row.V.B?.VRMS : row.V.B?.VRMS_LVR) * 100) / 100
+                ])
+                item.echartsData.series[2].data.push([
+                    time,
+                    Math.floor((props.ptName == 'star' ? row.V.C?.VRMS : row.V.C?.VRMS_LVR) * 100) / 100
+                ])
+                break
+            case '电流总有效值(A)':
+                item.echartsData.series[0].data.push([time, Math.floor(row.I.A?.IRMS * 100) / 100])
+                item.echartsData.series[1].data.push([time, Math.floor(row.I.B?.IRMS * 100) / 100])
+                item.echartsData.series[2].data.push([time, Math.floor(row.I.C?.IRMS * 100) / 100])
+                break
+            case '有功功率(kW)':
+                if (props.ptName == 'star') {
+                    item.echartsData.series[0].data.push([time, Math.floor(row.PQ.A?.P * 100) / 100])
+                    item.echartsData.series[1].data.push([time, Math.floor(row.PQ.B?.P * 100) / 100])
+                    item.echartsData.series[2].data.push([time, Math.floor(row.PQ.C?.P * 100) / 100])
+                    item.echartsData.series[3].data.push([time, Math.floor(row.PQ.T?.P * 100) / 100])
+                } else {
+                    item.echartsData.series[0].data.push([time, Math.floor(row.PQ.T?.P * 100) / 100])
+                }
+
+                break
+            case '无功功率(kW)':
+                if (props.ptName == 'star') {
+                    item.echartsData.series[0].data.push([time, Math.floor(row.PQ.A?.Q * 100) / 100])
+                    item.echartsData.series[1].data.push([time, Math.floor(row.PQ.B?.Q * 100) / 100])
+                    item.echartsData.series[2].data.push([time, Math.floor(row.PQ.C?.Q * 100) / 100])
+                    item.echartsData.series[3].data.push([time, Math.floor(row.PQ.T?.Q * 100) / 100])
+                } else {
+                    item.echartsData.series[0].data.push([time, Math.floor(row.PQ.T?.Q * 100) / 100])
+                }
+
+                break
+            case '基波电压总有效值(kV)':
+                item.echartsData.series[0].data.push([time, Math.floor(row.V.A?.V1 * 100) / 100])
+                item.echartsData.series[1].data.push([time, Math.floor(row.V.B?.V1 * 100) / 100])
+                item.echartsData.series[2].data.push([time, Math.floor(row.V.C?.V1 * 100) / 100])
+                break
+            case '基波电流总有效值(A)':
+                item.echartsData.series[0].data.push([time, Math.floor(row.I.A?.I1 * 100) / 100])
+                item.echartsData.series[1].data.push([time, Math.floor(row.I.B?.I1 * 100) / 100])
+                item.echartsData.series[2].data.push([time, Math.floor(row.I.C?.I1 * 100) / 100])
+                break
+            case '频率(Hz)':
+                item.echartsData.series[0].data.push([time, Math.floor(row.V.T?.FREQ * 100) / 100])
+                item.echartsData.series[1].data.push([time, Math.floor(row.V.T?.DELTA_FREQ * 100) / 100])
+                break
+            case '电压不平衡度(%)':
+                item.echartsData.series[0].data.push([time, Math.floor(row.V.T?.V_UNBAN * 100) / 100])
+
+                break
+            case '电流不平衡度(%)':
+                item.echartsData.series[0].data.push([time, Math.floor(row.I.T?.I_UNBAN * 100) / 100])
+                break
+        }
+        item.echartsData.series.forEach((item1: any) => {
+            if (item1.data.length > 60) {
+                item1.data.shift()
+            }
+        })
+
+        let [min, max] = yMethod([].concat(...item.echartsData.series.map(k => k.data).map(k1 => k1.map(k2 => k2[1]))))
+        item.echartsData.yAxis.min = min
+        item.echartsData.yAxis.max = max
+    })
+
+    MyEchartRef.value[0]?.setOptions(searchForm.value.index[0].echartsData)
+    MyEchartRef.value[1]?.setOptions(searchForm.value.index[1].echartsData)
+    MyEchartRef.value[2]?.setOptions(searchForm.value.index[2].echartsData)
+    if (loading.value) {
+        echarts.connect('group')
+    }
+
+    loading.value = false
+}
+const setEcharts = () => {
+    indexOptions.value.forEach((item: any, index: any) => {
+        item.echartsData = {
+            title: {
+                text: item.name
+            },
+
+            xAxis: {
+                name: '时间',
+                type: 'time',
+                axisLabel: {
+                    interval: 0, // 强制显示所有标签
+                    formatter: {
+                        day: '{MM}-{dd}',
+                        month: '{MM}',
+                        year: '{yyyy}'
+                    }
+                },
+
+                data: []
+            },
+
+            yAxis: {
+                // type: 'value',
+                name: item.unit,
+                splitNumber: 5,
+                minInterval: 1,
+                alignTicks: true // 强制对齐刻度
+            },
+            toolbox: {
+                right: 20,
+                top: 15,
+                show: index == 0 ? true : false,
+                feature: {
+                    // 移除默认的 saveAsImage
+                    // saveAsImage: { title: '保存图片' }
+                    myCustomDownload: {
+                        title: '', // 按钮标题
+                        icon: 'path://M892.342857 463.238095l-73.142857-68.266666-258.438095 258.438095V29.257143h-97.52381v624.152381L204.8 394.971429 131.657143 463.238095l380.342857 380.342857zM107.27619 897.219048h804.571429v97.523809H107.27619z', // 自定义图标路径
+
+                        onclick: function () {
+                            html2canvas(document.getElementById('trend'), {
+                                scale: 1
+                            }).then(function (canvas) {
+                                // 创建a标签，实现下载
+                                let creatIMg = document.createElement('a')
+                                creatIMg.download = '实时趋势.png' // 设置下载的文件名，
+                                creatIMg.href = canvas.toDataURL() // 下载url
+                                creatIMg.click()
+                                creatIMg.remove() // 下载之后把创建的元素删除
+                            })
+                        }
+                    }
+                }
+            },
+
+            tooltip: {
+                axisPointer: {
+                    type: 'cross',
+                    label: {
+                        color: '#fff',
+                        fontSize: 16
+                    }
+                },
+                textStyle: {
+                    color: '#fff',
+                    fontStyle: 'normal',
+                    opacity: 0.35,
+                    fontSize: 14
+                },
+                backgroundColor: 'rgba(0,0,0,0.55)',
+                borderWidth: 0,
+                formatter(params: any) {
+                  
+                    const xname = params[0].value[0]
+                    let str = `${xname}<br>`
+                    params.forEach((el: any, index: any) => {
+                        let marker = ''
+
+                        // if (el.value[3] == 'dashed') {
+                        //     for (let i = 0; i < 3; i++) {
+                        //         marker += `<span style="display:inline-block;border: 2px ${el.color} solid;margin-right:5px;width:10px;height:0px;background-color:#ffffff00;"></span>`
+                        //     }
+                        // } else {
+                        //     marker = `<span style="display:inline-block;border: 2px ${el.color} ${el.value[3]};margin-right:5px;width:40px;height:0px;background-color:#ffffff00;"></span>`
+                        // }
+                        str += `${el.marker} ${el.seriesName.split('(')[0]}：${
+                            el.value[1] ? el.value[1] + ' ' + (el.value[2] || '') : '-'
+                        }<br>`
+                    })
+                    return str
+                }
+            },
+            series: []
+        }
+        item.children.map((zz: any, zzIndex: any) => {
+            item.echartsData.series.push({
+                name: zz.phase,
+                type: 'line',
+                increment: true,
+                itemStyle: {
+                    barBorderRadius: [3, 3, 0, 0],
+                    color: [...item.color][zzIndex]
+                },
+                data: [],
+                smooth: true, // 这里设置平滑曲线
+                symbol: 'none' // 设置为 'none' 去掉折点小圆
+            })
+        })
+    })
+}
+onBeforeUnmount(() => {
+    echarts.disconnect('group')
+})
+defineExpose({
+    init
+})
+</script>
+<style lang="scss" scoped>
+.shutDown {
+    position: absolute;
+    right: 10px;
+    top: 10px;
+}
+.select {
+    position: absolute;
+    top: 10px;
+    display: flex;
+    align-items: center;
+    font-size: 14px;
+}
+</style>
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue
index 7dd9baa5..e99bd9d9 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue
@@ -3,7 +3,7 @@
         <TableHeader ref="TableHeaderRef" datePicker @selectChange="selectChange">
             <template v-slot:select>
                 <el-form-item label="模板策略">
-                    <el-select v-model="Template" @change="changetype" placeholder="请选择模版" value-key="id">
+                    <el-select v-model="Template" @change="changetype" placeholder="请选择模版" value-key="id" filterable>
                         <el-option
                             v-for="item in templatePolicy"
                             :key="item.id"
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue
index 761c1548..9c3e2b41 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue
@@ -30,7 +30,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="数值类型:">
-                        <el-select style="width: 100%" v-model="formData.valueType" placeholder="请选择类型">
+                        <el-select style="width: 100%" v-model="formData.valueType" placeholder="请选择类型" filterable>
                             <el-option
                                 v-for="item in typeOptions"
                                 :key="item.value"
@@ -40,7 +40,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="谐波次数:" v-show="showXieBoCiShu">
-                        <el-select style="width: 100%" v-model="formData.harmonic" placeholder="请选择谐波">
+                        <el-select style="width: 100%" v-model="formData.harmonic" placeholder="请选择谐波" filterable>
                             <el-option
                                 v-for="item in harmonicOptions"
                                 :key="item.value"
@@ -50,7 +50,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item v-show="showJianXieBoCiShu" label="间谐波次数:">
-                        <el-select style="width: 100%" v-model="formData.inHarmonic" placeholder="请选择间谐波">
+                        <el-select style="width: 100%" v-model="formData.inHarmonic" placeholder="请选择间谐波" filterable>
                             <el-option
                                 v-for="item in inharmonicOptions"
                                 :key="item.value"
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index1.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index1.vue
index 172c1afc..d0e6df30 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index1.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index1.vue
@@ -17,19 +17,19 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="数值类型:">
-                <el-select style="width: 100%" v-model="formData.valueType" placeholder="请选择类型">
+                <el-select style="width: 100%" v-model="formData.valueType" placeholder="请选择类型" filterable>
                     <el-option v-for="item in typeOptions" :key="item.value" :label="item.label"
                         :value="item.value"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="谐波次数:" v-if="showXieBoCiShu">
-                <el-select style="width: 100%" v-model="formData.harmonic" placeholder="请选择谐波">
+                <el-select style="width: 100%" v-model="formData.harmonic" placeholder="请选择谐波" filterable>
                     <el-option v-for="item in harmonicOptions" :key="item.value" :label="item.label"
                         :value="item.value"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item v-if="showJianXieBoCiShu" label="间谐波次数:">
-                <el-select style="width: 100%" v-model="formData.inHarmonic" placeholder="请选择间谐波">
+                <el-select style="width: 100%" v-model="formData.inHarmonic" placeholder="请选择间谐波" filterable>
                     <el-option v-for="item in inharmonicOptions" :key="item.value" :label="item.label"
                         :value="item.value"></el-option>
                 </el-select>
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaizhibiaohegelv/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaizhibiaohegelv/index.vue
index 3724acb0..dfa49874 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaizhibiaohegelv/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaizhibiaohegelv/index.vue
@@ -6,7 +6,7 @@
                     <DatePicker ref="datePickerRef"></DatePicker>
                 </el-form-item>
                 <el-form-item label="对比">
-                    <el-select v-model="searchType" clearable placeholder="可选择同比、环比">
+                    <el-select v-model="searchType" clearable placeholder="可选择同比、环比" filterable>
                         <el-option
                             v-for="item in searchTypeOptions"
                             :key="item.value"
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/yunxingzhuangtai/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/yunxingzhuangtai/index.vue
index 7cd4c7cd..6928c17c 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/yunxingzhuangtai/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/yunxingzhuangtai/index.vue
@@ -6,7 +6,7 @@
                     <DatePicker ref="datePickerRef"></DatePicker>
                 </el-form-item>
                 <el-form-item label="对比">
-                    <el-select v-model="searchType" clearable placeholder="可选择同比、环比">
+                    <el-select v-model="searchType" clearable placeholder="可选择同比、环比" filterable>
                         <el-option v-for="item in searchTypeOptions" :key="item.value" :label="item.label"
                             :value="item.value" />
                     </el-select>
diff --git a/src/views/pqs/harmonicMonitoring/reportForms/region/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/region/index.vue
index b0b21e4b..6649cf36 100644
--- a/src/views/pqs/harmonicMonitoring/reportForms/region/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/region/index.vue
@@ -44,6 +44,7 @@
                                 value-key="id"
                                 placeholder="请选择电压等级"
                                 style="width: 260px;"
+                                filterable
                             >
                                 <el-option
                                     v-for="item in voltageleveloption"
diff --git a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
index fc1dc124..c1448c9d 100644
--- a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
@@ -19,7 +19,7 @@
                             </el-radio-group>
                         </el-form-item>
                         <el-form-item label="模板策略">
-                            <el-select v-model="Template" @change="changetype" placeholder="请选择模版" value-key="id">
+                            <el-select v-model="Template" @change="changetype" placeholder="请选择模版" value-key="id" filterable>
                                 <el-option
                                     v-for="item in templatePolicy"
                                     :key="item.id"
diff --git a/src/views/pqs/panorama/components/details/point.vue b/src/views/pqs/panorama/components/details/point.vue
index 88620c74..393ab8b2 100644
--- a/src/views/pqs/panorama/components/details/point.vue
+++ b/src/views/pqs/panorama/components/details/point.vue
@@ -1,232 +1,233 @@
-<template>
-    <!-- 监测点详情 -->
-    <el-dialog draggable title="监测点统计" v-model="dialogVisible" width="1400px" :before-close="handleClose">
-        <el-row style="height: 300px" :gutter="20">
-            <el-col :span="12">
-                <div class="title">
-                    <span>趋势分析</span>
-                    <!-- <el-select v-model="time" style="width: 80px; margin-right: 80px" @change="analysis">
-                        <el-option label="年" value="1" />
-                        <el-option label="月" value="3" />
-                    </el-select> -->
-                    <el-radio-group v-model="time" style="margin-right: 50px" @change="analysis" size="small">
-                        <el-radio-button label="1">年</el-radio-button>
-                        <el-radio-button label="3">月</el-radio-button>
-                    </el-radio-group>
-                </div>
-                <MyEChart style="height: 260px" :options="trendEChart" />
-            </el-col>
-            <el-col :span="12">
-                <div class="title">
-                    <span>分布统计</span>
-                    <el-select
-                        v-model="statisticalType"
-                        value-key="id"
-                        style="width: 120px; margin-right: 80px"
-                        @change="statiStics"
-                    >
-                        <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
-                    </el-select>
-                </div>
-                <div class="pie">
-                    <MyEChart style="height: 260px" :options="picEChart" />
-                </div>
-            </el-col>
-        </el-row>
-        <div>
-            <div class="title">
-                <span>区域监测点统计</span>
-            </div>
-            <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="325px" :data="tableData">
-                <vxe-column field="orgName" title="区域" :formatter="formatter" />
-                <vxe-column field="num" title="监测点个数" sortable :formatter="formatter" />
-                <vxe-column field="integrityRate" sortable title="完整率(%)" />
-                <vxe-column field="onLineRate" sortable title="在线率(%)" />
-                <vxe-column field="outOfStandardRate" sortable title="超标监测点占比(%)" />
-            </vxe-table>
-        </div>
-    </el-dialog>
-</template>
-<script setup lang="ts">
-import { ref } from 'vue'
-import MyEChart from '@/components/echarts/MyEchart.vue'
-import { defaultAttribute } from '@/components/table/defaultAttribute'
-import { useDictData } from '@/stores/dictData'
-import { getGridDiagramLineTendency, getGridDiagramLineData, getHalfReport } from '@/api/device-boot/panorama'
-const dictData = useDictData()
-const dialogVisible: any = ref(false)
-
-const Voltage = dictData.getBasicData('Dev_Voltage_Stand')
-const tableData: any = ref([])
-const options = dictData.getBasicData('Statistical_Type', ['Report_Type', 'Power_Network'])
-const time = ref('1')
-const statisticalType = ref(options[0])
-const loadTypeArr = dictData.getBasicData('Interference_Source')
-
-const rowList: any = ref({})
-const trendEChart: any = ref()
-
-const picEChart = ref()
-const open = async (row: any) => {
-    time.value = '1'
-    rowList.value = {
-        deviceInfoParam: {
-            ...row
-        },
-        pageNum: 1,
-        pageSize: 1000,
-        ...row
-    }
-    analysis(1)
-    // 统计
-    statiStics()
-    // 监测点列表
-    getGridDiagramLineData({
-        ...rowList.value,
-        statisticalType: rowList.value.deviceInfoParam.statisticalType
-    }).then((res: any) => {
-        tableData.value = res.data
-    })
-
-    dialogVisible.value = true
-}
-// 分析
-const analysis = (e: any) => {
-    let time = rowList.value.searchBeginTime.slice(0, 4) + `-01-01`
-    // 分析
-    getGridDiagramLineTendency({ ...rowList.value, searchBeginTime: time, type: e }).then(res => {
-        let name = []
-        let data = []
-        let num = 0
-        for (let k in res.data) {
-            name.push(k)
-            // num = num + res.data[k]
-            data.push(res.data[k])
-        }
-
-        trendEChart.value = {
-            title: {
-                text: '在线监测点总数量'
-            },
-            xAxis: {
-                name: '时间',
-                data: name
-            },
-            legend: {
-                show: false
-            },
-            yAxis: {
-                name: '个'
-            },
-
-            options: {
-                dataZoom: null,
-                series: [
-                    {
-                        name: '接入',
-                        type: 'line',
-                        data: data,
-                        smooth: true,
-
-                        label: {
-                            show: true,
-                            position: 'top',
-                            fontSize: 12
-                        }
-                    }
-                ]
-            }
-        }
-    })
-}
-// 统计
-const statiStics = () => {
-    getGridDiagramLineData({ ...rowList.value, statisticalType: statisticalType.value }).then(res => {
-        picEChart.value = {
-            title: {
-                text: ''
-            },
-            xAxis: {
-                data: res.data.map((item: any) => item.orgName)
-            },
-            yAxis: {
-                name: '%',
-                min: 0,
-                max: 100
-            },
-            options: {
-                dataZoom: null,
-                series: [
-                    {
-                        name: '数据完整性',
-                        type: 'bar',
-
-                        data: res.data.map((item: any) => item.integrityRate),
-                        label: {
-                            show: true,
-                            position: 'top',
-                            fontSize: 12
-                        }
-                    },
-                    {
-                        name: '在线率',
-                        type: 'bar',
-                        data: res.data.map((item: any) => item.onLineRate),
-                        label: {
-                            show: true,
-                            position: 'top',
-                            fontSize: 12
-                        }
-                    },
-                    {
-                        name: '超标监测点占比',
-                        type: 'bar',
-                        data: res.data.map((item: any) => item.outOfStandardRate),
-                        label: {
-                            show: true,
-                            position: 'top',
-                            fontSize: 12
-                        }
-                    }
-                ]
-            }
-        }
-    })
-}
-const formatter = (row: any) => {
-    if (row.column.field == 'orgName') {
-        return row.cellValue.match(/[\u4e00-\u9fa5]+/g).join('')
-    } else if (row.column.field == 'num') {
-        return row.row.orgName.match(/\(([^]+)\)/)[1]
-    } else {
-        return row.cellValue
-    }
-}
-const handleClose = () => {
-    tableData.value = []
-    dialogVisible.value = false
-}
-
-defineExpose({ open })
-</script>
-<style lang="scss" scoped>
-:deep(.el-select) {
-    min-width: 80px;
-}
-.title {
-    display: flex;
-    justify-content: space-between;
-    margin: 10px;
-    span {
-        font-weight: 550;
-        font-size: 18px;
-    }
-}
-.pie {
-    display: flex;
-    justify-content: space-around;
-}
-:deep(.el-table thead) {
-    color: #000;
-}
-</style>
+<template>
+    <!-- 监测点详情 -->
+    <el-dialog draggable title="监测点统计" v-model="dialogVisible" width="1400px" :before-close="handleClose">
+        <el-row style="height: 300px" :gutter="20">
+            <el-col :span="12">
+                <div class="title">
+                    <span>趋势分析</span>
+                    <!-- <el-select v-model="time" style="width: 80px; margin-right: 80px" @change="analysis">
+                        <el-option label="年" value="1" />
+                        <el-option label="月" value="3" />
+                    </el-select> -->
+                    <el-radio-group v-model="time" style="margin-right: 50px" @change="analysis" size="small">
+                        <el-radio-button label="1">年</el-radio-button>
+                        <el-radio-button label="3">月</el-radio-button>
+                    </el-radio-group>
+                </div>
+                <MyEChart style="height: 260px" :options="trendEChart" />
+            </el-col>
+            <el-col :span="12">
+                <div class="title">
+                    <span>分布统计</span>
+                    <el-select
+                        v-model="statisticalType"
+                        value-key="id"
+                        style="width: 120px; margin-right: 80px"
+                        @change="statiStics"
+                        filterable
+                    >
+                        <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
+                    </el-select>
+                </div>
+                <div class="pie">
+                    <MyEChart style="height: 260px" :options="picEChart" />
+                </div>
+            </el-col>
+        </el-row>
+        <div>
+            <div class="title">
+                <span>区域监测点统计</span>
+            </div>
+            <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="325px" :data="tableData">
+                <vxe-column field="orgName" title="区域" :formatter="formatter" />
+                <vxe-column field="num" title="监测点个数" sortable :formatter="formatter" />
+                <vxe-column field="integrityRate" sortable title="完整率(%)" />
+                <vxe-column field="onLineRate" sortable title="在线率(%)" />
+                <vxe-column field="outOfStandardRate" sortable title="超标监测点占比(%)" />
+            </vxe-table>
+        </div>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref } from 'vue'
+import MyEChart from '@/components/echarts/MyEchart.vue'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { useDictData } from '@/stores/dictData'
+import { getGridDiagramLineTendency, getGridDiagramLineData, getHalfReport } from '@/api/device-boot/panorama'
+const dictData = useDictData()
+const dialogVisible: any = ref(false)
+
+const Voltage = dictData.getBasicData('Dev_Voltage_Stand')
+const tableData: any = ref([])
+const options = dictData.getBasicData('Statistical_Type', ['Report_Type', 'Power_Network'])
+const time = ref('1')
+const statisticalType = ref(options[0])
+const loadTypeArr = dictData.getBasicData('Interference_Source')
+
+const rowList: any = ref({})
+const trendEChart: any = ref()
+
+const picEChart = ref()
+const open = async (row: any) => {
+    time.value = '1'
+    rowList.value = {
+        deviceInfoParam: {
+            ...row
+        },
+        pageNum: 1,
+        pageSize: 1000,
+        ...row
+    }
+    analysis(1)
+    // 统计
+    statiStics()
+    // 监测点列表
+    getGridDiagramLineData({
+        ...rowList.value,
+        statisticalType: rowList.value.deviceInfoParam.statisticalType
+    }).then((res: any) => {
+        tableData.value = res.data
+    })
+
+    dialogVisible.value = true
+}
+// 分析
+const analysis = (e: any) => {
+    let time = rowList.value.searchBeginTime.slice(0, 4) + `-01-01`
+    // 分析
+    getGridDiagramLineTendency({ ...rowList.value, searchBeginTime: time, type: e }).then(res => {
+        let name = []
+        let data = []
+        let num = 0
+        for (let k in res.data) {
+            name.push(k)
+            // num = num + res.data[k]
+            data.push(res.data[k])
+        }
+
+        trendEChart.value = {
+            title: {
+                text: '在线监测点总数量'
+            },
+            xAxis: {
+                name: '时间',
+                data: name
+            },
+            legend: {
+                show: false
+            },
+            yAxis: {
+                name: '个'
+            },
+
+            options: {
+                dataZoom: null,
+                series: [
+                    {
+                        name: '接入',
+                        type: 'line',
+                        data: data,
+                        smooth: true,
+
+                        label: {
+                            show: true,
+                            position: 'top',
+                            fontSize: 12
+                        }
+                    }
+                ]
+            }
+        }
+    })
+}
+// 统计
+const statiStics = () => {
+    getGridDiagramLineData({ ...rowList.value, statisticalType: statisticalType.value }).then(res => {
+        picEChart.value = {
+            title: {
+                text: ''
+            },
+            xAxis: {
+                data: res.data.map((item: any) => item.orgName)
+            },
+            yAxis: {
+                name: '%',
+                min: 0,
+                max: 100
+            },
+            options: {
+                dataZoom: null,
+                series: [
+                    {
+                        name: '数据完整性',
+                        type: 'bar',
+
+                        data: res.data.map((item: any) => item.integrityRate),
+                        label: {
+                            show: true,
+                            position: 'top',
+                            fontSize: 12
+                        }
+                    },
+                    {
+                        name: '在线率',
+                        type: 'bar',
+                        data: res.data.map((item: any) => item.onLineRate),
+                        label: {
+                            show: true,
+                            position: 'top',
+                            fontSize: 12
+                        }
+                    },
+                    {
+                        name: '超标监测点占比',
+                        type: 'bar',
+                        data: res.data.map((item: any) => item.outOfStandardRate),
+                        label: {
+                            show: true,
+                            position: 'top',
+                            fontSize: 12
+                        }
+                    }
+                ]
+            }
+        }
+    })
+}
+const formatter = (row: any) => {
+    if (row.column.field == 'orgName') {
+        return row.cellValue.match(/[\u4e00-\u9fa5]+/g).join('')
+    } else if (row.column.field == 'num') {
+        return row.row.orgName.match(/\(([^]+)\)/)[1]
+    } else {
+        return row.cellValue
+    }
+}
+const handleClose = () => {
+    tableData.value = []
+    dialogVisible.value = false
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+:deep(.el-select) {
+    min-width: 80px;
+}
+.title {
+    display: flex;
+    justify-content: space-between;
+    margin: 10px;
+    span {
+        font-weight: 550;
+        font-size: 18px;
+    }
+}
+.pie {
+    display: flex;
+    justify-content: space-around;
+}
+:deep(.el-table thead) {
+    color: #000;
+}
+</style>
diff --git a/src/views/pqs/panorama/components/line/history.vue b/src/views/pqs/panorama/components/line/history.vue
index 176f3171..cce66cde 100644
--- a/src/views/pqs/panorama/components/line/history.vue
+++ b/src/views/pqs/panorama/components/line/history.vue
@@ -1,7 +1,7 @@
 <template>
     <DatePicker ref="datePickerRef" style="display: none" theCurrentTime />
     <el-select class="conditions mr20" v-model="formData.conditions" placeholder="请选择指标" style="width: 200px"
-        @change="History">
+        @change="History" filterable>
         <el-option-group v-for="group in indexOptions" :key="group.label" :label="group.label">
             <el-option v-for="item in group.options" :key="item.value" :label="item.label"
                 :value="item.value"></el-option>
diff --git a/src/views/pqs/panorama/components/mapR.vue b/src/views/pqs/panorama/components/mapR.vue
index 02c9418c..aec07ed5 100644
--- a/src/views/pqs/panorama/components/mapR.vue
+++ b/src/views/pqs/panorama/components/mapR.vue
@@ -108,7 +108,7 @@
                             </span>
                         </div>
 
-                        <el-select v-model="harmonicType" style="width: 120px" @change="harmonicChange" size="small">
+                        <el-select v-model="harmonicType" style="width: 120px" @change="harmonicChange" size="small" filterable>
                             <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -155,7 +155,7 @@
                             </div>
                         </div>
 
-                        <el-select v-model="value" style="width: 120px" size="small" @change="transientChange">
+                        <el-select v-model="value" style="width: 120px" size="small" @change="transientChange" filterable>
                             <el-option v-for="item in options1" :key="item.id" :label="item.name" :value="item.id" />
                         </el-select>
                     </div>
diff --git a/src/views/pqs/qualityInspeection/panorama/components/line/history.vue b/src/views/pqs/qualityInspeection/panorama/components/line/history.vue
index c9ad5617..6e388cae 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/line/history.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/line/history.vue
@@ -1,7 +1,7 @@
 <template>
     <DatePicker ref="datePickerRef" style="display: none" theCurrentTime />
     <el-select class="conditions" v-model="formData.conditions" placeholder="请选择指标" style="width: 200px"
-        @change="History">
+        @change="History" filterable>
         <el-option-group v-for="group in indexOptions" :key="group.label" :label="group.label">
             <el-option v-for="item in group.options" :key="item.value" :label="item.label"
                 :value="item.value"></el-option>
diff --git a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue
index 48d81a5b..26753305 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue
@@ -86,7 +86,7 @@
                             </span>
                         </div>
 
-                        <el-select v-model="harmonicType" style="width: 120px" @change="harmonicChange" size="small">
+                        <el-select v-model="harmonicType" style="width: 120px" @change="harmonicChange" size="small" filterable>
                             <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -133,7 +133,7 @@
                             </div>
                         </div>
 
-                        <el-select v-model="value" style="width: 120px" size="small" @change="transientChange">
+                        <el-select v-model="value" style="width: 120px" size="small" @change="transientChange" filterable>
                             <el-option v-for="item in options1" :key="item.id" :label="item.name" :value="item.id" />
                         </el-select>
                     </div>
diff --git a/src/views/pqs/runManage/alarmCleaning/components/alarm.vue b/src/views/pqs/runManage/alarmCleaning/components/alarm.vue
index c63d6e33..189c53bc 100644
--- a/src/views/pqs/runManage/alarmCleaning/components/alarm.vue
+++ b/src/views/pqs/runManage/alarmCleaning/components/alarm.vue
@@ -18,7 +18,7 @@
                     </el-select>
                 </el-form-item> -->
                 <el-form-item label="运行状态">
-                    <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态">
+                    <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态" filterable>
                         <el-option
                             v-for="item in runFlagList"
                             :key="item.id"
@@ -28,7 +28,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="终端厂家">
-                    <el-select v-model="tableStore.table.params.manufacturer" clearable placeholder="请选择终端厂家">
+                    <el-select v-model="tableStore.table.params.manufacturer" clearable placeholder="请选择终端厂家" filterable>
                         <el-option
                             v-for="item in terminaloption"
                             :key="item.id"
diff --git a/src/views/pqs/runManage/alarmCleaning/components/alarmDetails.vue b/src/views/pqs/runManage/alarmCleaning/components/alarmDetails.vue
index b606b51e..238ea0e8 100644
--- a/src/views/pqs/runManage/alarmCleaning/components/alarmDetails.vue
+++ b/src/views/pqs/runManage/alarmCleaning/components/alarmDetails.vue
@@ -31,6 +31,7 @@
                             placeholder="请选择告警天数"
                             style="width: 180px"
                             @change="change"
+                            filterable
                         >
                             <el-option
                                 v-for="item in dateList"
@@ -47,6 +48,7 @@
                             clearable
                             placeholder="请选择指标"
                             style="width: 150px"
+                            
                         >
                             <el-option
                                 v-for="item in targetList"
diff --git a/src/views/pqs/runManage/assessment/components/dictionary/components/cable/form.vue b/src/views/pqs/runManage/assessment/components/dictionary/components/cable/form.vue
index cdbc1a42..c6de6adc 100644
--- a/src/views/pqs/runManage/assessment/components/dictionary/components/cable/form.vue
+++ b/src/views/pqs/runManage/assessment/components/dictionary/components/cable/form.vue
@@ -11,7 +11,7 @@
                 />
             </el-form-item>
             <el-form-item label="线缆类型" prop="linetypeType">
-                <el-select v-model="form.linetypeType" placeholder="请选择线缆类型">
+                <el-select v-model="form.linetypeType" placeholder="请选择线缆类型" filterable>
                     <el-option label="架空线" value="01"></el-option>
                     <el-option label="电缆" value="02"></el-option>
                 </el-select>
diff --git a/src/views/pqs/runManage/assessment/components/dictionary/components/transformer/form.vue b/src/views/pqs/runManage/assessment/components/dictionary/components/transformer/form.vue
index 5586a0da..902512f1 100644
--- a/src/views/pqs/runManage/assessment/components/dictionary/components/transformer/form.vue
+++ b/src/views/pqs/runManage/assessment/components/dictionary/components/transformer/form.vue
@@ -15,7 +15,7 @@
                 <el-input-number v-model.trim="form.transCapa" show-word-limit placeholder="请输入值"></el-input-number>
             </el-form-item>
             <el-form-item label="高压侧电压" prop="transhighScale">
-                <el-select v-model="form.transhighScale" placeholder="请选择高压侧电压">
+                <el-select v-model="form.transhighScale" placeholder="请选择高压侧电压" filterable>
                     <el-option
                         v-for="item in voltageLevelList"
                         :key="item.id"
@@ -25,7 +25,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="低压侧电压" prop="translowScale">
-                <el-select v-model="form.translowScale" placeholder="请选择低压侧电压">
+                <el-select v-model="form.translowScale" placeholder="请选择低压侧电压" filterable>
                     <el-option
                         v-for="item in voltageLevelList"
                         :key="item.id"
diff --git a/src/views/pqs/runManage/assessment/components/uese/form.vue b/src/views/pqs/runManage/assessment/components/uese/form.vue
index 85adaf42..106872f8 100644
--- a/src/views/pqs/runManage/assessment/components/uese/form.vue
+++ b/src/views/pqs/runManage/assessment/components/uese/form.vue
@@ -39,7 +39,7 @@
                             />
                         </el-form-item>
                         <el-form-item label="用户电压等级" prop="userScale">
-                            <el-select v-model="form.userScale" clearable placeholder="请选择电压等级">
+                            <el-select v-model="form.userScale" clearable placeholder="请选择电压等级" filterable>
                                 <el-option
                                     v-for="item in voltageleveloption"
                                     :key="item.id"
@@ -59,13 +59,13 @@
                             ></el-input-number>
                         </el-form-item>
                         <el-form-item label="是否包含电容器" prop="withCapacitor">
-                            <el-select v-model="form.withCapacitor" placeholder="请选择是否包含电容器" clearable>
+                            <el-select v-model="form.withCapacitor" placeholder="请选择是否包含电容器" clearable filterable>
                                 <el-option label="是" value="01" />
                                 <el-option label="否" value="00" />
                             </el-select>
                         </el-form-item>
                         <el-form-item label="用户负荷类型" prop="isWindfarm">
-                            <el-select v-model="form.isWindfarm" clearable placeholder="请选择用户负荷类型">
+                            <el-select v-model="form.isWindfarm" clearable placeholder="请选择用户负荷类型" filterable>
                                 <el-option label="风电场" value="01"></el-option>
                                 <el-option label="光伏" value="02"></el-option>
                                 <el-option label="其他" value="03"></el-option>
@@ -80,13 +80,13 @@
                             ></el-input-number>
                         </el-form-item>
                         <el-form-item label="是否单相负荷" prop="singleLoad">
-                            <el-select v-model="form.singleLoad" clearable placeholder="请选择是否单相负荷">
+                            <el-select v-model="form.singleLoad" clearable placeholder="请选择是否单相负荷" filterable>
                                 <el-option label="是" value="00"></el-option>
                                 <el-option label="否" value="01"></el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="预测评估关联">
-                            <el-select v-model="assessMentId" filterable clearable placeholder="请选择预测评估关联">
+                            <el-select v-model="assessMentId"  clearable placeholder="请选择预测评估关联" filterable>
                                 <el-option
                                     v-for="option in userList.filter(
                                         item =>
@@ -113,10 +113,11 @@
                         <el-form-item label="接入变电站" prop="powerstationId">
                             <el-select
                                 v-model="form.powerstationId"
-                                filterable
+                                
                                 clearable
                                 @change="changePowerstation"
                                 placeholder="请选择接入变电站"
+                                filterable
                             >
                                 <el-option
                                     v-for="item in powerstationList"
@@ -127,7 +128,7 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="变电站电压等级" prop="powerstationScale">
-                            <el-select v-model="form.powerstationScale" disabled clearable placeholder="请选择变电站电压等级">
+                            <el-select v-model="form.powerstationScale" disabled clearable placeholder="请选择变电站电压等级" filterable>
                                 <el-option
                                     v-for="item in voltageleveloption"
                                     :key="item.id"
@@ -137,7 +138,7 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="接入母线" prop="busId">
-                            <el-select v-model="form.busId" clearable @change="changeBus" placeholder="请选择母线">
+                            <el-select v-model="form.busId" clearable @change="changeBus" placeholder="请选择母线" filterable>
                                 <el-option
                                     v-for="item in busList"
                                     :key="item.id"
@@ -147,7 +148,7 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="母线电压等级" prop="busScale">
-                            <el-select v-model="form.busScale" disabled clearable placeholder="请选择母线电压等级">
+                            <el-select v-model="form.busScale" disabled clearable placeholder="请选择母线电压等级" filterable>
                                 <el-option
                                     v-for="item in voltageleveloption"
                                     :key="item.id"
@@ -178,7 +179,7 @@
                             ></el-input-number>
                         </el-form-item>
                         <el-form-item label="PCC点名称" prop="lineId">
-                            <el-select v-model="form.lineId" clearable @change="LineChange" placeholder="请选择PCC点">
+                            <el-select v-model="form.lineId" clearable @change="LineChange" placeholder="请选择PCC点" filterable>
                                 <el-option
                                     v-for="item in pccList"
                                     :key="item.id"
@@ -189,7 +190,7 @@
                         </el-form-item>
 
                         <el-form-item label="导线类型" prop="linetypeId">
-                            <el-select v-model="form.linetypeId" clearable placeholder="请选择导线类型">
+                            <el-select v-model="form.linetypeId" clearable placeholder="请选择导线类型" filterable      >
                                 <el-option
                                     v-for="item in linetypeList"
                                     :key="item.linetypeId"
diff --git a/src/views/pqs/runManage/cleaning/components/abnormal.vue b/src/views/pqs/runManage/cleaning/components/abnormal.vue
index 3b60a83c..bc92147d 100644
--- a/src/views/pqs/runManage/cleaning/components/abnormal.vue
+++ b/src/views/pqs/runManage/cleaning/components/abnormal.vue
@@ -18,7 +18,7 @@
                     </el-select>
                 </el-form-item> -->
                 <el-form-item label="运行状态">
-                    <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态">
+                    <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态" filterable>
                         <el-option
                             v-for="item in runFlagList"
                             :key="item.id"
@@ -28,7 +28,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="终端厂家">
-                    <el-select v-model="tableStore.table.params.manufacturer" clearable placeholder="请选择终端厂家">
+                    <el-select v-model="tableStore.table.params.manufacturer" clearable placeholder="请选择终端厂家" filterable>
                         <el-option
                             v-for="item in terminaloption"
                             :key="item.id"
diff --git a/src/views/pqs/runManage/cleaning/components/anomalyDetails.vue b/src/views/pqs/runManage/cleaning/components/anomalyDetails.vue
index 66d4b80c..4eeda253 100644
--- a/src/views/pqs/runManage/cleaning/components/anomalyDetails.vue
+++ b/src/views/pqs/runManage/cleaning/components/anomalyDetails.vue
@@ -34,6 +34,7 @@
                             placeholder="请选择异常天数"
                             style="width: 180px"
                             @change="change"
+                            filterable
                         >
                             <el-option
                                 v-for="item in dateList"
@@ -46,10 +47,11 @@
                     <el-form-item label="统计指标" v-if="numKey != 0">
                         <el-select
                             v-model="targetKey"
-                            filterable
+                            
                             clearable
                             placeholder="请选择指标"
                             style="width: 150px"
+                            filterable
                         >
                             <el-option
                                 v-for="item in targetList"
diff --git a/src/views/pqs/runManage/runEvaluate/components/regionDetails.vue b/src/views/pqs/runManage/runEvaluate/components/regionDetails.vue
index 7eb43bca..ef12a3a0 100644
--- a/src/views/pqs/runManage/runEvaluate/components/regionDetails.vue
+++ b/src/views/pqs/runManage/runEvaluate/components/regionDetails.vue
@@ -1,110 +1,110 @@
-<template>
-    <el-dialog v-model="dialogVisible" title="区域终端运行评价详情" width="50%" draggable>
-        <el-form :inline="true" :model="formInline">
-            <el-form-item label="所在地市">
-                <el-select v-model="formInline.value" style="width: 240px">
-                    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="运行状态">
-                <el-select v-model="formInline.value1" style="width: 240px">
-                    <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-            </el-form-item>
-            <el-form-item style="position: absolute; right: 0">
-                <el-button type="primary" icon="el-icon-Search">查询</el-button>
-            </el-form-item>
-        </el-form>
-        <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="500px" :data="tableData">
-            <vxe-column field="num" title="终端名称" />
-            <vxe-column field="num1" title="所在地市" />
-            <vxe-column field="num2" title="所属变电站" />
-            <vxe-column field="num3" title="终端型号" />
-            <vxe-column field="num4" title="完整率(%)" />
-            <vxe-column field="num4" title="在线率(%)" />
-            <vxe-column field="num4" title="合格率(%)" />
-            <vxe-column field="num5" title="运行状态">
-                <template #default="{ row }">
-                    <el-tag v-if="row.num5 == 1" effect="dark" type="success">在运</el-tag>
-                    <el-tag v-if="row.num5 == 2" effect="dark" type="error">停运</el-tag>
-                </template>
-            </vxe-column>
-        </vxe-table>
-    </el-dialog>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive } from 'vue'
-import { defaultAttribute } from '@/components/table/defaultAttribute'
-const dialogVisible = ref(false)
-const radio1 = ref('1')
-const tableData = ref([
-    {
-        num: '测试终端1',
-        num1: '张家口',
-        num2: '测试变电站1',
-        num3: 'npqs_571_1',
-        num4: '100',
-        num5: 1
-    },
-    {
-        num: '测试终端2',
-        num1: '张家口',
-        num2: '测试变电站2',
-        num3: 'npqs_571_2',
-        num4: '100',
-        num5: 1
-    },
-    {
-        num: '测试终端3',
-        num1: '张家口',
-        num2: '测试变电站3',
-        num3: 'npqs_571_3',
-        num4: '100',
-        num5: 1
-    }
-])
-const formInline = reactive({
-    value: '',
-    value1: '',
-})
-
-const options = [
-    {
-        value: '1',
-        label: '张家口'
-    },
-    {
-        value: '2',
-        label: '承德'
-    },
-    {
-        value: '3',
-        label: '唐山'
-    },
-    {
-        value: '4',
-        label: '秦皇岛'
-    },
-    {
-        value: '5',
-        label: '廊坊'
-    }
-]
-const options1 = [
-    {
-        value: '1',
-        label: '在运'
-    },
-    {
-        value: '2',
-        label: '停运'
-    },
-   
-]
-const open = () => {
-    dialogVisible.value = true
-}
-defineExpose({ open })
-</script>
-<style lang="scss" scoped></style>
+<template>
+    <el-dialog v-model="dialogVisible" title="区域终端运行评价详情" width="50%" draggable>
+        <el-form :inline="true" :model="formInline">
+            <el-form-item label="所在地市">
+                <el-select v-model="formInline.value" style="width: 240px" filterable>
+                    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="运行状态">
+                <el-select v-model="formInline.value1" style="width: 240px" filterable>
+                    <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item style="position: absolute; right: 0">
+                <el-button type="primary" icon="el-icon-Search">查询</el-button>
+            </el-form-item>
+        </el-form>
+        <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="500px" :data="tableData">
+            <vxe-column field="num" title="终端名称" />
+            <vxe-column field="num1" title="所在地市" />
+            <vxe-column field="num2" title="所属变电站" />
+            <vxe-column field="num3" title="终端型号" />
+            <vxe-column field="num4" title="完整率(%)" />
+            <vxe-column field="num4" title="在线率(%)" />
+            <vxe-column field="num4" title="合格率(%)" />
+            <vxe-column field="num5" title="运行状态">
+                <template #default="{ row }">
+                    <el-tag v-if="row.num5 == 1" effect="dark" type="success">在运</el-tag>
+                    <el-tag v-if="row.num5 == 2" effect="dark" type="error">停运</el-tag>
+                </template>
+            </vxe-column>
+        </vxe-table>
+    </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+const dialogVisible = ref(false)
+const radio1 = ref('1')
+const tableData = ref([
+    {
+        num: '测试终端1',
+        num1: '张家口',
+        num2: '测试变电站1',
+        num3: 'npqs_571_1',
+        num4: '100',
+        num5: 1
+    },
+    {
+        num: '测试终端2',
+        num1: '张家口',
+        num2: '测试变电站2',
+        num3: 'npqs_571_2',
+        num4: '100',
+        num5: 1
+    },
+    {
+        num: '测试终端3',
+        num1: '张家口',
+        num2: '测试变电站3',
+        num3: 'npqs_571_3',
+        num4: '100',
+        num5: 1
+    }
+])
+const formInline = reactive({
+    value: '',
+    value1: '',
+})
+
+const options = [
+    {
+        value: '1',
+        label: '张家口'
+    },
+    {
+        value: '2',
+        label: '承德'
+    },
+    {
+        value: '3',
+        label: '唐山'
+    },
+    {
+        value: '4',
+        label: '秦皇岛'
+    },
+    {
+        value: '5',
+        label: '廊坊'
+    }
+]
+const options1 = [
+    {
+        value: '1',
+        label: '在运'
+    },
+    {
+        value: '2',
+        label: '停运'
+    },
+   
+]
+const open = () => {
+    dialogVisible.value = true
+}
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/views/pqs/runManage/runEvaluate/index.vue b/src/views/pqs/runManage/runEvaluate/index.vue
index 3a91393c..a0f971fe 100644
--- a/src/views/pqs/runManage/runEvaluate/index.vue
+++ b/src/views/pqs/runManage/runEvaluate/index.vue
@@ -8,6 +8,7 @@
                         clearable
                         style="width: 100%"
                         placeholder="请选择电网标识"
+                        filterable
                     >
                         <el-option
                             v-for="item in powerFlagList"
diff --git a/src/views/pqs/runManage/runEvaluate/index_JB.vue b/src/views/pqs/runManage/runEvaluate/index_JB.vue
index 88de38b5..75aa0c72 100644
--- a/src/views/pqs/runManage/runEvaluate/index_JB.vue
+++ b/src/views/pqs/runManage/runEvaluate/index_JB.vue
@@ -3,7 +3,7 @@
         <TableHeader date-picker ref="TableHeaderRef">
             <template v-slot:select>
                 <el-form-item label="运行状态">
-                    <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态">
+                    <el-select v-model="tableStore.table.params.lineRunFlag" clearable placeholder="请选择运行状态" filterable>
                         <el-option v-for="item in runFlagList" :key="item.id" :label="item.name"
                             :value="item.id"></el-option>
                     </el-select>
diff --git a/src/views/pqs/supervise/electricalEnergy/components/NewlyAdd.vue b/src/views/pqs/supervise/electricalEnergy/components/NewlyAdd.vue
index ed2c2389..e15cd61f 100644
--- a/src/views/pqs/supervise/electricalEnergy/components/NewlyAdd.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components/NewlyAdd.vue
@@ -1,533 +1,533 @@
-<template>
-    <el-dialog draggable v-model="add" title="问题新增" width="400px" :before-close="handleClose">
-        <el-divider content-position="left">第一步 基本信息填报</el-divider>
-        <el-form :inline="true" ref="ruleForm" :rules="rules" label-width="auto" class="form-one" :model="addData">
-            <el-form-item label="所属单位">
-                <Area ref="areaRef" v-model="addData.orgNo" disabled />
-            </el-form-item>
-
-            <el-form-item label="问题来源" prop="problemSources">
-                <el-select v-model="addData.problemSources" clearable placeholder="请选择问题来源">
-                    <el-option
-                        v-for="item in problemData"
-                        :key="item.code"
-                        :label="item.name"
-                        :value="item.code"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item label="问题名称" prop="problemName">
-                <el-input v-model="addData.problemName" clearable placeholder="请填写问题名称"></el-input>
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <div>
-                <el-button @click="handleClose">取消</el-button>
-                <el-button type="primary" @click="nextStep">下一步</el-button>
-            </div>
-        </template>
-    </el-dialog>
-    <!-- 新增第二步(在线监测超标问题新增) -->
-    <el-dialog draggable title="在线监测超标问题新增" v-model="onlineAdd" width="1500px" :before-close="handleClose">
-        <el-divider content-position="left">第二步 选择问题测点</el-divider>
-        <el-form :inline="true" class="form">
-            <el-form-item label="告警时间">
-                <DatePicker ref="DateRef" />
-            </el-form-item>
-            <el-form-item label="稳态指标">
-                <el-select v-model="harmonicTypes" multiple collapse-tags placeholder="请选择稳态指标">
-                    <el-option v-for="item in harmonicTypesList" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="越线天数占比(%)">
-                <el-input-number v-model="rate" :min="0" :max="100" />
-            </el-form-item>
-
-            <el-form-item>
-                <el-button type="primary" icon="el-icon-Search" @click="searchOnLine">查询</el-button>
-            </el-form-item>
-        </el-form>
-        <vxe-table v-bind="defaultAttribute" v-loading="isLoading1" height="350" ref="xTable1Ref" :data="onlineAddData">
-            <vxe-column type="radio" width="60"></vxe-column>
-            <vxe-column field="sustationName" title="变电站"></vxe-column>
-            <vxe-column field="barName" title="母线"></vxe-column>
-            <vxe-column field="measurementPointName" title="监测点名称"></vxe-column>
-            <vxe-column field=" " title="监测点编号"></vxe-column>
-            <vxe-column field="loadType" title="监测对象类型"></vxe-column>
-            <vxe-column field="objName" title="监测对象"></vxe-column>
-            <vxe-column field="voltageLevel" title="电压等级"></vxe-column>
-            <vxe-column field="harmonicType" title="告警类型" :formatter="formatter"></vxe-column>
-            <vxe-column field="overLimitrate" title="越线天数占比">
-                <template #default="{ row }">
-                    <el-dropdown>
-                        <span class="el-dropdown-link">
-                            {{ row.overLimitrate.toFixed(3) }}
-                            <el-icon class="el-icon--right">
-                                <arrow-down />
-                            </el-icon>
-                        </span>
-                        <template #dropdown>
-                            <el-dropdown-menu>
-                                <el-dropdown-item v-for="item in row?.dateList">{{ item }}</el-dropdown-item>
-                            </el-dropdown-menu>
-                        </template>
-                    </el-dropdown>
-                </template>
-            </vxe-column>
-        </vxe-table>
-
-        <div style="display: flex; justify-content: center; margin-top: 10px">
-            <el-button type="primary" class="ml20" @click="previouStep">上一步</el-button>
-            <el-button type="primary" class="ml20" @click="OnlineMonitoring">生成问题</el-button>
-            <el-button type="primary" class="ml20" @click="handleClose">取消</el-button>
-        </div>
-    </el-dialog>
-
-    <!-- 新增第二步(普测超标问题新增) -->
-    <el-dialog draggable title="普测超标问题新增" v-model="ordinaryAdd" width="1200px" :before-close="handleClose">
-        <el-divider content-position="left">第二步 选择普测计划及问题类型</el-divider>
-        <el-form :model="ordinaryA" :inline="true" class="form">
-            <el-form-item>
-                <Area v-model="ordinaryA.orgNo"></Area>
-            </el-form-item>
-
-            <el-form-item label="普测结果上传时间">
-                <el-date-picker
-                    v-model="ordinaryA.planStartTime"
-                    type="month"
-                    format="YYYY-MM"
-                    value-format="YYYY-MM-DD"
-                    placeholder="选择月"
-                    @change="queryPlanName"
-                ></el-date-picker>
-            </el-form-item>
-
-            <el-form-item label="普测计划名称">
-                <el-select v-model="ordinaryA.planName" clearable placeholder="请选择">
-                    <el-option
-                        v-for="item in planNameList"
-                        :key="item.planName"
-                        :label="item.planName"
-                        :value="item.planName"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item>
-                <el-button type="primary" icon="el-icon-Search" @click="searchFnExcessive">查询</el-button>
-            </el-form-item>
-        </el-form>
-        <vxe-table
-            v-bind="defaultAttribute"
-            v-loading="isLoading2"
-            height="350"
-            ref="xTable2Ref"
-            :data="ordinaryAddData"
-        >
-            <vxe-column type="radio" width="60"></vxe-column>
-            <vxe-column field="subName" title="变电站名称"></vxe-column>
-            <vxe-column field="voltageLevelName" title="变电站电压等级"></vxe-column>
-        </vxe-table>
-
-        <el-divider content-position="left">第三步 选择问题指标</el-divider>
-        <el-form :model="ordinaryA" :rules="rules" ref="ordinaryARef" :inline="true" class="form">
-            <el-form-item label="稳态指标" prop="steadyState">
-                <el-checkbox-group v-model="ordinaryA.steadyState">
-                    <el-checkbox v-for="(item, ind) in steadyStateList" :key="ind" :label="item.code">
-                        {{ item.name }}
-                    </el-checkbox>
-                </el-checkbox-group>
-            </el-form-item>
-            <br />
-            <el-form-item label="暂态指标" prop="transientIndicators">
-                <el-checkbox-group v-model="ordinaryA.transientIndicators">
-                    <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
-                        {{ item.name }}
-                    </el-checkbox>
-                </el-checkbox-group>
-            </el-form-item>
-        </el-form>
-
-        <div style="display: flex; justify-content: center; margin-top: 10px">
-            <el-button type="primary" class="ml20" @click="previouStep">上一步</el-button>
-            <el-button type="primary" class="ml20" @click="GeneralSurvey">生成问题</el-button>
-            <el-button type="primary" class="ml20" @click="handleClose">取消</el-button>
-        </div>
-    </el-dialog>
-    <!-- 新增第二步(运维异常问题新增) -->
-    <el-dialog draggable title="运维异常问题新增" v-model="operationAdd" width="1200px" :before-close="handleClose">
-        <el-divider content-position="left">第二步 选择普测计划及问题类型</el-divider>
-        <el-form :model="operationAdddata" ref="operationAddRef" :inline="true" :rules="rules">
-            <el-form-item label="异常终端名称:" prop="abnormalDevName">
-                <el-input
-                    v-model="operationAdddata.abnormalDevName"
-                    clearable
-                    placeholder="请填写异常终端名称"
-                ></el-input>
-            </el-form-item>
-
-            <el-form-item label="发现异常时间:" prop="abnormalDevTime">
-                <el-date-picker
-                    v-model="operationAdddata.abnormalDevTime"
-                    type="date"
-                    placeholder="请选择发现异常时间"
-                    value-format="YYYY-MM-DD"
-                ></el-date-picker>
-            </el-form-item>
-            <br />
-            <el-form-item label="终端异常描述:" style="margin-top: 10px" prop="eventDescription">
-                <el-input
-                    type="textarea"
-                    style="width: 400px"
-                    :autosize="{ minRows: 2, maxRows: 4 }"
-                    placeholder="请填写终端异常描述"
-                    v-model="operationAdddata.eventDescription"
-                ></el-input>
-            </el-form-item>
-
-            <el-divider content-position="left">第三步 选择问题指标</el-divider>
-            <el-form-item label="稳态指标:" prop="steadyState">
-                <el-checkbox-group v-model="operationAdddata.steadyState">
-                    <el-checkbox v-for="(item, ind) in steadyStateList" :key="ind" :label="item.code">
-                        {{ item.name }}
-                    </el-checkbox>
-                </el-checkbox-group>
-            </el-form-item>
-            <br />
-            <el-form-item label="暂态指标:" prop="transientIndicators">
-                <el-checkbox-group v-model="operationAdddata.transientIndicators">
-                    <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
-                        {{ item.name }}
-                    </el-checkbox>
-                </el-checkbox-group>
-            </el-form-item>
-        </el-form>
-
-        <div style="display: flex; justify-content: center; margin-top: 10px">
-            <el-button type="primary" class="ml20" @click="previouStep">上一步</el-button>
-            <el-button type="primary" class="ml20" @click="generateAbnormal">生成问题</el-button>
-            <el-button type="primary" class="ml20" @click="handleClose">取消</el-button>
-        </div>
-    </el-dialog>
-
-    <!-- 新增第二步(用户投诉问题新增) -->
-    <el-dialog draggable title="用户投诉问题新增" v-model="userAdd" width="1200px" :before-close="handleClose">
-        <el-divider content-position="left">第二步 选择投诉用户</el-divider>
-        <el-form :model="userAdddata" :inline="true" ref="userAddRef" :rules="rules">
-            <el-form-item label="用户名称:" prop="userName">
-                <el-input v-model="userAdddata.userName" clearable placeholder="请输入用户名称"></el-input>
-            </el-form-item>
-            <el-form-item label="用户编号:" prop="userNo">
-                <el-input v-model="userAdddata.userNo" clearable placeholder="请输入用户编号"></el-input>
-            </el-form-item>
-
-            <el-divider content-position="left">第三步 填写投诉详情</el-divider>
-
-            <el-form-item label="投诉内容:" style="margin-top: 10px" prop="complaintContent">
-                <el-input
-                    type="textarea"
-                    style="width: 400px"
-                    :autosize="{ minRows: 2, maxRows: 4 }"
-                    placeholder="请输入内容"
-                    v-model="userAdddata.complaintContent"
-                ></el-input>
-            </el-form-item>
-            <br />
-            <el-form-item label="投诉时间:" style="margin-top: 10px" prop="complaintTime">
-                <el-date-picker
-                    v-model="userAdddata.complaintTime"
-                    type="date"
-                    placeholder="选择日期"
-                    value-format="YYYY-MM-DD"
-                ></el-date-picker>
-            </el-form-item>
-
-            <el-divider content-position="left">第四步 选择问题指标</el-divider>
-
-            <el-form-item label="稳态指标:" prop="steadyState">
-                <el-checkbox-group v-model="userAdddata.steadyState">
-                    <el-checkbox v-for="(item, ind) in steadyStateList" :key="ind" :label="item.code">
-                        {{ item.name }}
-                    </el-checkbox>
-                </el-checkbox-group>
-            </el-form-item>
-            <br />
-            <el-form-item label="暂态指标:" prop="transientIndicators">
-                <el-checkbox-group v-model="userAdddata.transientIndicators">
-                    <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
-                        {{ item.name }}
-                    </el-checkbox>
-                </el-checkbox-group>
-            </el-form-item>
-        </el-form>
-
-        <div style="display: flex; justify-content: center; margin-top: 10px">
-            <el-button type="primary" class="ml20" @click="previouStep">上一步</el-button>
-            <el-button type="primary" class="ml20" @click="userAddProblem">生成问题</el-button>
-            <el-button type="primary" class="ml20" @click="handleClose">取消</el-button>
-        </div>
-    </el-dialog>
-</template>
-<script setup lang="ts">
-import { ref, reactive, onMounted } from 'vue'
-import { useDictData } from '@/stores/dictData'
-import { defaultAttribute } from '@/components/table/defaultAttribute'
-import Area from '@/components/form/area/index.vue'
-import DatePicker from '@/components/form/datePicker/index.vue'
-import { ArrowDown } from '@element-plus/icons-vue'
-const emit = defineEmits(['handleClose', 'onSubmit'])
-const dictData = useDictData()
-const problemData = dictData.getBasicData('Problem_Sources')
-const alarmList = dictData.getBasicData('alarm_Type')
-const Voltage = dictData.getBasicData('Dev_Voltage')
-const userTypeData = dictData.getBasicData('User_Category')
-import {
-    getRMpPartHarmonicDetail,
-    querySurveyPlanName,
-    querySurveyPlanOnQuestion,
-    addAbnormalIssues,
-    addComplaintIssues,
-    addGeneralSurveyIssues,
-    addExcessiveIssues
-} from '@/api/process-boot/electricitymanagement'
-import { ElMessage } from 'element-plus'
-const steadyStateList = dictData.getBasicData('Steady_Indicator')
-const transientIndicatorsList = dictData.getBasicData('Transient_Indicators')
-
-const add = ref(true)
-const onlineAdd = ref(false)
-const isLoading1 = ref(false)
-const isLoading2 = ref(false)
-const ordinaryAdd = ref(false)
-const userAdd = ref(false)
-const operationAdd = ref(false)
-const ruleForm = ref()
-const DateRef = ref()
-const userAddRef = ref()
-const operationAddRef = ref()
-const ordinaryARef = ref()
-const xTable1Ref = ref()
-const xTable2Ref = ref()
-const harmonicTypes = ref([]) //稳态指标id集合
-const harmonicTypesList = dictData.getBasicData('Indicator_Type')
-const rate = ref(60) //越线天数占比（一个月）
-const addData = ref({
-    orgName: '',
-    problemSources: '',
-    problemName: '',
-    orgNo: dictData.state.area[0].id
-})
-const ordinaryA = ref({
-    orgNo: '',
-    orgName: '',
-    planName: '',
-    planStartTime: '',
-    uploadTime: '',
-    name: '',
-    steadyState: [],
-    transientIndicators: []
-})
-const operationAdddata = ref({
-    abnormalDevName: '',
-    eventDescription: '',
-    abnormalDevTime: '',
-    steadyState: [],
-    transientIndicators: []
-})
-const userA = ref({
-    userType: 'Elec_User',
-    id: ''
-})
-const userAdddata = ref({
-    complaintContent: '',
-    complaintTime: '',
-    steadyState: [],
-    userName: '',
-    userNo: '',
-    transientIndicators: []
-})
-const planNameList: any = ref([])
-const onlineAddData = ref([])
-const ordinaryAddData = ref([])
-const rules = {
-    problemName: [{ required: true, message: '请输入问题名称', trigger: 'blur' }],
-    userName: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
-    userNo: [{ required: true, message: '请输入用户编号', trigger: 'blur' }],
-    complaintContent: [{ required: true, message: '请输入投诉内容', trigger: 'blur' }],
-    complaintTime: [{ required: true, message: '请选择时间', trigger: 'change' }],
-    problemSources: [{ required: true, message: '情选择问题来源', trigger: 'change' }],
-    abnormalDevTime: [{ required: true, message: '请选择时间', trigger: 'change' }],
-    transientIndicators: [{ required: true, message: '请选择暂态指标', trigger: 'change' }],
-    steadyState: [{ required: true, message: '请选择稳态指标', trigger: 'change' }],
-    eventDescription: [{ required: true, message: '请输入终端异常描述', trigger: 'blur' }],
-    abnormalDevName: [{ required: true, message: '请输入问题名称', trigger: 'blur' }]
-}
-
-// 关闭
-const handleClose = () => {
-    emit('handleClose')
-    emit('onSubmit')
-}
-// 下一步
-const nextStep = () => {
-    ruleForm.value.validate((valid: any) => {
-        if (valid) {
-            if (addData.value.problemSources == 'Online') {
-                add.value = false
-
-                onlineAdd.value = true
-                setTimeout(() => {
-                    DateRef.value.setTimeOptions([{ label: '月份', value: 3 }])
-                    searchOnLine()
-                }, 0)
-            } else if (addData.value.problemSources == 'General') {
-                ordinaryA.value.orgNo = dictData.state.area[0].id
-                ordinaryA.value.orgName = dictData.state.area[0].name
-
-                add.value = false
-                ordinaryAdd.value = true
-                ordinaryA.value.planStartTime = window.XEUtils.toDateString(new Date().getTime(), 'yyyy-MM') + '-01'
-
-                queryPlanName()
-                setTimeout(() => {
-                    searchFnExcessive()
-                }, 0)
-            } else if (addData.value.problemSources == 'User_Complaints') {
-                add.value = false
-                userAdd.value = true
-            } else if (addData.value.problemSources == 'Dev_Exception') {
-                add.value = false
-                operationAdd.value = true
-            }
-        }
-    })
-}
-// 上一步
-const previouStep = () => {
-    onlineAdd.value = false
-    ordinaryAdd.value = false
-    userAdd.value = false
-    operationAdd.value = false
-    add.value = true
-}
-
-// 在线监测超标问题新增
-const OnlineMonitoring = () => {
-    if (xTable1Ref.value.getRadioRecord() == null) {
-        return ElMessage.warning('请选择变电站')
-    } else {
-        addExcessiveIssues({
-            warnTarget:xTable1Ref.value.getRadioRecord().harmonicType,
-            ...xTable1Ref.value.getRadioRecord(),
-            ...addData.value
-        }).then((res: any) => {
-            ElMessage.success('新增成功!')
-            emit('handleClose')
-            emit('onSubmit')
-        })
-    }
-}
-// 在线监测告警查询
-const searchOnLine = () => {
-    isLoading1.value = true
-    getRMpPartHarmonicDetail({
-        harmonicTypes: harmonicTypes.value,
-        rate: rate.value * 0.01,
-        startTime: DateRef.value.timeValue[0],
-        endTime: DateRef.value.timeValue[1]
-    }).then(res => {
-        isLoading1.value = false
-        onlineAddData.value = res.data
-    })
-}
-
-// 普通监测超标问题新增
-const queryPlanName = () => {
-    querySurveyPlanName({
-        orgNo: ordinaryA.value.orgNo,
-        planStartTime: ordinaryA.value.planStartTime
-    }).then(res => {
-        planNameList.value = res.data
-    })
-}
-const searchFnExcessive = () => {
-    isLoading2.value = true
-    querySurveyPlanOnQuestion(ordinaryA.value).then(res => {
-        isLoading2.value = false
-        ordinaryAddData.value = res.data
-    })
-}
-// 普测超标生成问题
-const GeneralSurvey = () => {
-    if (xTable2Ref.value.getRadioRecord() == null) {
-        return ElMessage.warning('请选择变电站')
-    } else {
-        ordinaryARef.value.validate((valid: any) => {
-            if (valid) {
-                addGeneralSurveyIssues({
-                    substationId: xTable2Ref.value.getRadioRecord().subId,
-                    ...xTable2Ref.value.getRadioRecord(),
-                    ...ordinaryA.value,
-                    ...addData.value
-                }).then((res: any) => {
-                    ElMessage.success('新增成功!')
-                    emit('handleClose')
-                    emit('onSubmit')
-                })
-            }
-        })
-    }
-}
-const formatter = (row: any) => {
-    if (row.column.field == 'harmonicType') {
-        return harmonicTypesList.filter((item: any) => item.id == row.cellValue)[0]?.name
-    } else if (row.column.field == 'voltageLevel') {
-        return Voltage.filter((item: any) => item.id == row.cellValue)[0]?.name
-    } else if (row.column.field == 'electricityType') {
-        return dictData.getBasicData('Ele_Class').filter((item: any) => item.id == row.cellValue)[0]?.name
-    } else {
-        return row.cellValue
-    }
-}
-// 运维异常问题新增
-const generateAbnormal = () => {
-    operationAddRef.value.validate((valid: any) => {
-        if (valid) {
-            addAbnormalIssues({
-                ...operationAdddata.value,
-                ...addData.value
-            }).then((res: any) => {
-                ElMessage.success('新增成功!')
-                emit('handleClose')
-                emit('onSubmit')
-            })
-        }
-    })
-}
-
-// 用户投诉新增
-const userAddProblem = () => {
-    userAddRef.value.validate((valid: any) => {
-        if (valid) {
-            addComplaintIssues({
-                ...userAdddata.value,
-                ...addData.value
-            }).then((res: any) => {
-                ElMessage.success('新增成功!')
-                emit('handleClose')
-                emit('onSubmit')
-            })
-        }
-    })
-}
-onMounted(() => {})
-</script>
-<style lang="scss" scoped>
-.el-dropdown-link {
-    cursor: pointer;
-    color: var(--el-color-primary) !important;
-    display: flex;
-    align-items: center;
-}
-</style>
+<template>
+    <el-dialog draggable v-model="add" title="问题新增" width="400px" :before-close="handleClose">
+        <el-divider content-position="left">第一步 基本信息填报</el-divider>
+        <el-form :inline="true" ref="ruleForm" :rules="rules" label-width="auto" class="form-one" :model="addData">
+            <el-form-item label="所属单位">
+                <Area ref="areaRef" v-model="addData.orgNo" disabled />
+            </el-form-item>
+
+            <el-form-item label="问题来源" prop="problemSources">
+                <el-select v-model="addData.problemSources" clearable placeholder="请选择问题来源" filterable>
+                    <el-option
+                        v-for="item in problemData"
+                        :key="item.code"
+                        :label="item.name"
+                        :value="item.code"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="问题名称" prop="problemName">
+                <el-input v-model="addData.problemName" clearable placeholder="请填写问题名称"></el-input>
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <div>
+                <el-button @click="handleClose">取消</el-button>
+                <el-button type="primary" @click="nextStep">下一步</el-button>
+            </div>
+        </template>
+    </el-dialog>
+    <!-- 新增第二步(在线监测超标问题新增) -->
+    <el-dialog draggable title="在线监测超标问题新增" v-model="onlineAdd" width="1500px" :before-close="handleClose">
+        <el-divider content-position="left">第二步 选择问题测点</el-divider>
+        <el-form :inline="true" class="form">
+            <el-form-item label="告警时间">
+                <DatePicker ref="DateRef" />
+            </el-form-item>
+            <el-form-item label="稳态指标">
+                <el-select v-model="harmonicTypes" multiple collapse-tags placeholder="请选择稳态指标" filterable>
+                    <el-option v-for="item in harmonicTypesList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="越线天数占比(%)">
+                <el-input-number v-model="rate" :min="0" :max="100" />
+            </el-form-item>
+
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-Search" @click="searchOnLine">查询</el-button>
+            </el-form-item>
+        </el-form>
+        <vxe-table v-bind="defaultAttribute" v-loading="isLoading1" height="350" ref="xTable1Ref" :data="onlineAddData">
+            <vxe-column type="radio" width="60"></vxe-column>
+            <vxe-column field="sustationName" title="变电站"></vxe-column>
+            <vxe-column field="barName" title="母线"></vxe-column>
+            <vxe-column field="measurementPointName" title="监测点名称"></vxe-column>
+            <vxe-column field=" " title="监测点编号"></vxe-column>
+            <vxe-column field="loadType" title="监测对象类型"></vxe-column>
+            <vxe-column field="objName" title="监测对象"></vxe-column>
+            <vxe-column field="voltageLevel" title="电压等级"></vxe-column>
+            <vxe-column field="harmonicType" title="告警类型" :formatter="formatter"></vxe-column>
+            <vxe-column field="overLimitrate" title="越线天数占比">
+                <template #default="{ row }">
+                    <el-dropdown>
+                        <span class="el-dropdown-link">
+                            {{ row.overLimitrate.toFixed(3) }}
+                            <el-icon class="el-icon--right">
+                                <arrow-down />
+                            </el-icon>
+                        </span>
+                        <template #dropdown>
+                            <el-dropdown-menu>
+                                <el-dropdown-item v-for="item in row?.dateList">{{ item }}</el-dropdown-item>
+                            </el-dropdown-menu>
+                        </template>
+                    </el-dropdown>
+                </template>
+            </vxe-column>
+        </vxe-table>
+
+        <div style="display: flex; justify-content: center; margin-top: 10px">
+            <el-button type="primary" class="ml20" @click="previouStep">上一步</el-button>
+            <el-button type="primary" class="ml20" @click="OnlineMonitoring">生成问题</el-button>
+            <el-button type="primary" class="ml20" @click="handleClose">取消</el-button>
+        </div>
+    </el-dialog>
+
+    <!-- 新增第二步(普测超标问题新增) -->
+    <el-dialog draggable title="普测超标问题新增" v-model="ordinaryAdd" width="1200px" :before-close="handleClose">
+        <el-divider content-position="left">第二步 选择普测计划及问题类型</el-divider>
+        <el-form :model="ordinaryA" :inline="true" class="form">
+            <el-form-item>
+                <Area v-model="ordinaryA.orgNo"></Area>
+            </el-form-item>
+
+            <el-form-item label="普测结果上传时间">
+                <el-date-picker
+                    v-model="ordinaryA.planStartTime"
+                    type="month"
+                    format="YYYY-MM"
+                    value-format="YYYY-MM-DD"
+                    placeholder="选择月"
+                    @change="queryPlanName"
+                ></el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="普测计划名称">
+                <el-select v-model="ordinaryA.planName" clearable placeholder="请选择" filterable>
+                    <el-option
+                        v-for="item in planNameList"
+                        :key="item.planName"
+                        :label="item.planName"
+                        :value="item.planName"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-Search" @click="searchFnExcessive">查询</el-button>
+            </el-form-item>
+        </el-form>
+        <vxe-table
+            v-bind="defaultAttribute"
+            v-loading="isLoading2"
+            height="350"
+            ref="xTable2Ref"
+            :data="ordinaryAddData"
+        >
+            <vxe-column type="radio" width="60"></vxe-column>
+            <vxe-column field="subName" title="变电站名称"></vxe-column>
+            <vxe-column field="voltageLevelName" title="变电站电压等级"></vxe-column>
+        </vxe-table>
+
+        <el-divider content-position="left">第三步 选择问题指标</el-divider>
+        <el-form :model="ordinaryA" :rules="rules" ref="ordinaryARef" :inline="true" class="form">
+            <el-form-item label="稳态指标" prop="steadyState">
+                <el-checkbox-group v-model="ordinaryA.steadyState">
+                    <el-checkbox v-for="(item, ind) in steadyStateList" :key="ind" :label="item.code">
+                        {{ item.name }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+            <br />
+            <el-form-item label="暂态指标" prop="transientIndicators">
+                <el-checkbox-group v-model="ordinaryA.transientIndicators">
+                    <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
+                        {{ item.name }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+        </el-form>
+
+        <div style="display: flex; justify-content: center; margin-top: 10px">
+            <el-button type="primary" class="ml20" @click="previouStep">上一步</el-button>
+            <el-button type="primary" class="ml20" @click="GeneralSurvey">生成问题</el-button>
+            <el-button type="primary" class="ml20" @click="handleClose">取消</el-button>
+        </div>
+    </el-dialog>
+    <!-- 新增第二步(运维异常问题新增) -->
+    <el-dialog draggable title="运维异常问题新增" v-model="operationAdd" width="1200px" :before-close="handleClose">
+        <el-divider content-position="left">第二步 选择普测计划及问题类型</el-divider>
+        <el-form :model="operationAdddata" ref="operationAddRef" :inline="true" :rules="rules">
+            <el-form-item label="异常终端名称:" prop="abnormalDevName">
+                <el-input
+                    v-model="operationAdddata.abnormalDevName"
+                    clearable
+                    placeholder="请填写异常终端名称"
+                ></el-input>
+            </el-form-item>
+
+            <el-form-item label="发现异常时间:" prop="abnormalDevTime">
+                <el-date-picker
+                    v-model="operationAdddata.abnormalDevTime"
+                    type="date"
+                    placeholder="请选择发现异常时间"
+                    value-format="YYYY-MM-DD"
+                ></el-date-picker>
+            </el-form-item>
+            <br />
+            <el-form-item label="终端异常描述:" style="margin-top: 10px" prop="eventDescription">
+                <el-input
+                    type="textarea"
+                    style="width: 400px"
+                    :autosize="{ minRows: 2, maxRows: 4 }"
+                    placeholder="请填写终端异常描述"
+                    v-model="operationAdddata.eventDescription"
+                ></el-input>
+            </el-form-item>
+
+            <el-divider content-position="left">第三步 选择问题指标</el-divider>
+            <el-form-item label="稳态指标:" prop="steadyState">
+                <el-checkbox-group v-model="operationAdddata.steadyState">
+                    <el-checkbox v-for="(item, ind) in steadyStateList" :key="ind" :label="item.code">
+                        {{ item.name }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+            <br />
+            <el-form-item label="暂态指标:" prop="transientIndicators">
+                <el-checkbox-group v-model="operationAdddata.transientIndicators">
+                    <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
+                        {{ item.name }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+        </el-form>
+
+        <div style="display: flex; justify-content: center; margin-top: 10px">
+            <el-button type="primary" class="ml20" @click="previouStep">上一步</el-button>
+            <el-button type="primary" class="ml20" @click="generateAbnormal">生成问题</el-button>
+            <el-button type="primary" class="ml20" @click="handleClose">取消</el-button>
+        </div>
+    </el-dialog>
+
+    <!-- 新增第二步(用户投诉问题新增) -->
+    <el-dialog draggable title="用户投诉问题新增" v-model="userAdd" width="1200px" :before-close="handleClose">
+        <el-divider content-position="left">第二步 选择投诉用户</el-divider>
+        <el-form :model="userAdddata" :inline="true" ref="userAddRef" :rules="rules">
+            <el-form-item label="用户名称:" prop="userName">
+                <el-input v-model="userAdddata.userName" clearable placeholder="请输入用户名称"></el-input>
+            </el-form-item>
+            <el-form-item label="用户编号:" prop="userNo">
+                <el-input v-model="userAdddata.userNo" clearable placeholder="请输入用户编号"></el-input>
+            </el-form-item>
+
+            <el-divider content-position="left">第三步 填写投诉详情</el-divider>
+
+            <el-form-item label="投诉内容:" style="margin-top: 10px" prop="complaintContent">
+                <el-input
+                    type="textarea"
+                    style="width: 400px"
+                    :autosize="{ minRows: 2, maxRows: 4 }"
+                    placeholder="请输入内容"
+                    v-model="userAdddata.complaintContent"
+                ></el-input>
+            </el-form-item>
+            <br />
+            <el-form-item label="投诉时间:" style="margin-top: 10px" prop="complaintTime">
+                <el-date-picker
+                    v-model="userAdddata.complaintTime"
+                    type="date"
+                    placeholder="选择日期"
+                    value-format="YYYY-MM-DD"
+                ></el-date-picker>
+            </el-form-item>
+
+            <el-divider content-position="left">第四步 选择问题指标</el-divider>
+
+            <el-form-item label="稳态指标:" prop="steadyState">
+                <el-checkbox-group v-model="userAdddata.steadyState">
+                    <el-checkbox v-for="(item, ind) in steadyStateList" :key="ind" :label="item.code">
+                        {{ item.name }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+            <br />
+            <el-form-item label="暂态指标:" prop="transientIndicators">
+                <el-checkbox-group v-model="userAdddata.transientIndicators">
+                    <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
+                        {{ item.name }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+        </el-form>
+
+        <div style="display: flex; justify-content: center; margin-top: 10px">
+            <el-button type="primary" class="ml20" @click="previouStep">上一步</el-button>
+            <el-button type="primary" class="ml20" @click="userAddProblem">生成问题</el-button>
+            <el-button type="primary" class="ml20" @click="handleClose">取消</el-button>
+        </div>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref, reactive, onMounted } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import Area from '@/components/form/area/index.vue'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import { ArrowDown } from '@element-plus/icons-vue'
+const emit = defineEmits(['handleClose', 'onSubmit'])
+const dictData = useDictData()
+const problemData = dictData.getBasicData('Problem_Sources')
+const alarmList = dictData.getBasicData('alarm_Type')
+const Voltage = dictData.getBasicData('Dev_Voltage')
+const userTypeData = dictData.getBasicData('User_Category')
+import {
+    getRMpPartHarmonicDetail,
+    querySurveyPlanName,
+    querySurveyPlanOnQuestion,
+    addAbnormalIssues,
+    addComplaintIssues,
+    addGeneralSurveyIssues,
+    addExcessiveIssues
+} from '@/api/process-boot/electricitymanagement'
+import { ElMessage } from 'element-plus'
+const steadyStateList = dictData.getBasicData('Steady_Indicator')
+const transientIndicatorsList = dictData.getBasicData('Transient_Indicators')
+
+const add = ref(true)
+const onlineAdd = ref(false)
+const isLoading1 = ref(false)
+const isLoading2 = ref(false)
+const ordinaryAdd = ref(false)
+const userAdd = ref(false)
+const operationAdd = ref(false)
+const ruleForm = ref()
+const DateRef = ref()
+const userAddRef = ref()
+const operationAddRef = ref()
+const ordinaryARef = ref()
+const xTable1Ref = ref()
+const xTable2Ref = ref()
+const harmonicTypes = ref([]) //稳态指标id集合
+const harmonicTypesList = dictData.getBasicData('Indicator_Type')
+const rate = ref(60) //越线天数占比（一个月）
+const addData = ref({
+    orgName: '',
+    problemSources: '',
+    problemName: '',
+    orgNo: dictData.state.area[0].id
+})
+const ordinaryA = ref({
+    orgNo: '',
+    orgName: '',
+    planName: '',
+    planStartTime: '',
+    uploadTime: '',
+    name: '',
+    steadyState: [],
+    transientIndicators: []
+})
+const operationAdddata = ref({
+    abnormalDevName: '',
+    eventDescription: '',
+    abnormalDevTime: '',
+    steadyState: [],
+    transientIndicators: []
+})
+const userA = ref({
+    userType: 'Elec_User',
+    id: ''
+})
+const userAdddata = ref({
+    complaintContent: '',
+    complaintTime: '',
+    steadyState: [],
+    userName: '',
+    userNo: '',
+    transientIndicators: []
+})
+const planNameList: any = ref([])
+const onlineAddData = ref([])
+const ordinaryAddData = ref([])
+const rules = {
+    problemName: [{ required: true, message: '请输入问题名称', trigger: 'blur' }],
+    userName: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
+    userNo: [{ required: true, message: '请输入用户编号', trigger: 'blur' }],
+    complaintContent: [{ required: true, message: '请输入投诉内容', trigger: 'blur' }],
+    complaintTime: [{ required: true, message: '请选择时间', trigger: 'change' }],
+    problemSources: [{ required: true, message: '情选择问题来源', trigger: 'change' }],
+    abnormalDevTime: [{ required: true, message: '请选择时间', trigger: 'change' }],
+    transientIndicators: [{ required: true, message: '请选择暂态指标', trigger: 'change' }],
+    steadyState: [{ required: true, message: '请选择稳态指标', trigger: 'change' }],
+    eventDescription: [{ required: true, message: '请输入终端异常描述', trigger: 'blur' }],
+    abnormalDevName: [{ required: true, message: '请输入问题名称', trigger: 'blur' }]
+}
+
+// 关闭
+const handleClose = () => {
+    emit('handleClose')
+    emit('onSubmit')
+}
+// 下一步
+const nextStep = () => {
+    ruleForm.value.validate((valid: any) => {
+        if (valid) {
+            if (addData.value.problemSources == 'Online') {
+                add.value = false
+
+                onlineAdd.value = true
+                setTimeout(() => {
+                    DateRef.value.setTimeOptions([{ label: '月份', value: 3 }])
+                    searchOnLine()
+                }, 0)
+            } else if (addData.value.problemSources == 'General') {
+                ordinaryA.value.orgNo = dictData.state.area[0].id
+                ordinaryA.value.orgName = dictData.state.area[0].name
+
+                add.value = false
+                ordinaryAdd.value = true
+                ordinaryA.value.planStartTime = window.XEUtils.toDateString(new Date().getTime(), 'yyyy-MM') + '-01'
+
+                queryPlanName()
+                setTimeout(() => {
+                    searchFnExcessive()
+                }, 0)
+            } else if (addData.value.problemSources == 'User_Complaints') {
+                add.value = false
+                userAdd.value = true
+            } else if (addData.value.problemSources == 'Dev_Exception') {
+                add.value = false
+                operationAdd.value = true
+            }
+        }
+    })
+}
+// 上一步
+const previouStep = () => {
+    onlineAdd.value = false
+    ordinaryAdd.value = false
+    userAdd.value = false
+    operationAdd.value = false
+    add.value = true
+}
+
+// 在线监测超标问题新增
+const OnlineMonitoring = () => {
+    if (xTable1Ref.value.getRadioRecord() == null) {
+        return ElMessage.warning('请选择变电站')
+    } else {
+        addExcessiveIssues({
+            warnTarget:xTable1Ref.value.getRadioRecord().harmonicType,
+            ...xTable1Ref.value.getRadioRecord(),
+            ...addData.value
+        }).then((res: any) => {
+            ElMessage.success('新增成功!')
+            emit('handleClose')
+            emit('onSubmit')
+        })
+    }
+}
+// 在线监测告警查询
+const searchOnLine = () => {
+    isLoading1.value = true
+    getRMpPartHarmonicDetail({
+        harmonicTypes: harmonicTypes.value,
+        rate: rate.value * 0.01,
+        startTime: DateRef.value.timeValue[0],
+        endTime: DateRef.value.timeValue[1]
+    }).then(res => {
+        isLoading1.value = false
+        onlineAddData.value = res.data
+    })
+}
+
+// 普通监测超标问题新增
+const queryPlanName = () => {
+    querySurveyPlanName({
+        orgNo: ordinaryA.value.orgNo,
+        planStartTime: ordinaryA.value.planStartTime
+    }).then(res => {
+        planNameList.value = res.data
+    })
+}
+const searchFnExcessive = () => {
+    isLoading2.value = true
+    querySurveyPlanOnQuestion(ordinaryA.value).then(res => {
+        isLoading2.value = false
+        ordinaryAddData.value = res.data
+    })
+}
+// 普测超标生成问题
+const GeneralSurvey = () => {
+    if (xTable2Ref.value.getRadioRecord() == null) {
+        return ElMessage.warning('请选择变电站')
+    } else {
+        ordinaryARef.value.validate((valid: any) => {
+            if (valid) {
+                addGeneralSurveyIssues({
+                    substationId: xTable2Ref.value.getRadioRecord().subId,
+                    ...xTable2Ref.value.getRadioRecord(),
+                    ...ordinaryA.value,
+                    ...addData.value
+                }).then((res: any) => {
+                    ElMessage.success('新增成功!')
+                    emit('handleClose')
+                    emit('onSubmit')
+                })
+            }
+        })
+    }
+}
+const formatter = (row: any) => {
+    if (row.column.field == 'harmonicType') {
+        return harmonicTypesList.filter((item: any) => item.id == row.cellValue)[0]?.name
+    } else if (row.column.field == 'voltageLevel') {
+        return Voltage.filter((item: any) => item.id == row.cellValue)[0]?.name
+    } else if (row.column.field == 'electricityType') {
+        return dictData.getBasicData('Ele_Class').filter((item: any) => item.id == row.cellValue)[0]?.name
+    } else {
+        return row.cellValue
+    }
+}
+// 运维异常问题新增
+const generateAbnormal = () => {
+    operationAddRef.value.validate((valid: any) => {
+        if (valid) {
+            addAbnormalIssues({
+                ...operationAdddata.value,
+                ...addData.value
+            }).then((res: any) => {
+                ElMessage.success('新增成功!')
+                emit('handleClose')
+                emit('onSubmit')
+            })
+        }
+    })
+}
+
+// 用户投诉新增
+const userAddProblem = () => {
+    userAddRef.value.validate((valid: any) => {
+        if (valid) {
+            addComplaintIssues({
+                ...userAdddata.value,
+                ...addData.value
+            }).then((res: any) => {
+                ElMessage.success('新增成功!')
+                emit('handleClose')
+                emit('onSubmit')
+            })
+        }
+    })
+}
+onMounted(() => {})
+</script>
+<style lang="scss" scoped>
+.el-dropdown-link {
+    cursor: pointer;
+    color: var(--el-color-primary) !important;
+    display: flex;
+    align-items: center;
+}
+</style>
diff --git a/src/views/pqs/supervise/electricalEnergy/components/audit.vue b/src/views/pqs/supervise/electricalEnergy/components/audit.vue
index 5f431755..b01c2920 100644
--- a/src/views/pqs/supervise/electricalEnergy/components/audit.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components/audit.vue
@@ -3,17 +3,17 @@
         <TableHeader area datePicker ref="TableHeaderRef" showCustomColumn>
             <template #select>
                 <el-form-item label="问题来源">
-                    <el-select v-model="tableStore.table.params.problemSources" clearable placeholder="请选择问题来源">
+                    <el-select v-model="tableStore.table.params.problemSources" clearable placeholder="请选择问题来源" filterable>
                         <el-option
-                            v-for="item in problemData"
-                            :key="item.code"
+                                v-for="item in problemData"
+                                :key="item.code"
                             :label="item.name"
                             :value="item.code"
                         ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="填报进度">
-                    <el-select v-model="tableStore.table.params.reportProcess" clearable placeholder="请选择填报进度">
+                    <el-select v-model="tableStore.table.params.reportProcess" clearable placeholder="请选择填报进度" filterable>
                         <el-option
                             v-for="item in fillingProgress"
                             :key="item.id"
diff --git a/src/views/pqs/supervise/electricalEnergy/components/detail.vue b/src/views/pqs/supervise/electricalEnergy/components/detail.vue
index 30b9e903..9b8a4925 100644
--- a/src/views/pqs/supervise/electricalEnergy/components/detail.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components/detail.vue
@@ -1,224 +1,224 @@
-<template>
-    <el-dialog draggable title="详情" v-model="dialogVisible" width="1400px" :before-close="handleClose">
-        <el-tabs v-model="activeName" type="card">
-            <el-tab-pane label="指标" name="1">
-                <el-divider content-position="left" style="font-size: 18px">问题基本信息</el-divider>
-                <el-form :model="addData" :inline="true" disabled label-width="100px">
-                    <el-form-item label="所属单位:">
-                        <el-input v-model="addData.orgName" placeholder="请填写"></el-input>
-                    </el-form-item>
-
-                    <el-form-item label="问题名称:">
-                        <el-input v-model="addData.problemName" placeholder="请填写"></el-input>
-                    </el-form-item>
-
-                    <el-form-item label="问题编号:">
-                        <el-input v-model="addData.powerQualityProblemNo" placeholder="请填写"></el-input>
-                    </el-form-item>
-                    <el-form-item label="问题来源:">
-                        <el-select v-model="addData.problemSources">
-                            <el-option
-                                v-for="item in problemData"
-                                :key="item.code"
-                                :label="item.name"
-                                :value="item.code"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-form>
-                <!-- 在线监测超标问题 -->
-                <el-form :inline="true" label-width="100px" disabled v-if="problemSources == '在线监测告警'">
-                    <el-form-item label="变电站:">
-                        <el-input v-model="addData.sustationName"></el-input>
-                    </el-form-item>
-                    <el-form-item label="母线:">
-                        <el-input v-model="addData.barName"></el-input>
-                    </el-form-item>
-                    <el-form-item label="监测点名称:">
-                        <el-input v-model="addData.measurementPointName"></el-input>
-                    </el-form-item>
-                    <el-form-item label="监测点编号:">
-                        <el-input v-model="addData.measurementPointId"></el-input>
-                    </el-form-item>
-                    <el-form-item label="监测对象类型:">
-                        <el-input v-model="addData.loadType"></el-input>
-                    </el-form-item>
-                    <el-form-item label="监测对象:">
-                        <el-input v-model="addData.objName"></el-input>
-                    </el-form-item>
-                    <el-form-item label="电压等级:">
-                        <el-input v-model="addData.voltageLevel"></el-input>
-                    </el-form-item>
-                </el-form>
-                <!-- 普测超标 -->
-                <el-form :inline="true" label-width="100px" disabled v-if="problemSources == '普测超标'">
-                    <el-form-item label="普测计划名称:">
-                        <el-input v-model="addData.planName" placeholder="请填写"></el-input>
-                    </el-form-item>
-                    <el-form-item label="所属变电站:">
-                        <el-input v-model="addData.substationName" placeholder="请填写"></el-input>
-                    </el-form-item>
-
-                    <el-form-item label="母线名称:">
-                        <el-input v-model="addData.busBarName" placeholder="请填写"></el-input>
-                    </el-form-item>
-
-                    <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">
-                        问题指标
-                    </el-divider>
-
-                    <el-form-item label="稳态指标:">
-                        <el-checkbox-group v-model="addData.steadyIndicator">
-                            <el-checkbox v-for="(item, ind) in steadyIndicatorList" :key="ind" :label="item.code">
-                                {{ item.name }}
-                            </el-checkbox>
-                        </el-checkbox-group>
-                    </el-form-item>
-
-                    <el-form-item label="暂态指标:">
-                        <el-checkbox-group v-model="addData.transientIndicators">
-                            <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
-                                {{ item.name }}
-                            </el-checkbox>
-                        </el-checkbox-group>
-                    </el-form-item>
-                </el-form>
-                <!-- 用户投诉 -->
-                <el-form :inline="true" label-width="100px" disabled v-if="problemSources == '用户投诉'">
-                    <el-form-item label="用户投诉名称:">
-                        <el-input v-model="addData.userName" placeholder="请填写"></el-input>
-                    </el-form-item>
-                    <el-form-item label="投诉用户编号:">
-                        <el-input v-model="addData.userNo" placeholder="请填写"></el-input>
-                    </el-form-item>
-
-                    <el-form-item label="投诉时间:">
-                        <el-input v-model="addData.complaintTime" placeholder="请填写"></el-input>
-                    </el-form-item>
-
-                    <el-form-item label="投诉内容:">
-                        <el-input
-                            type="textarea"
-                            :autosize="{ minRows: 2, maxRows: 4 }"
-                            style="width: 400px"
-                            placeholder="请输入内容"
-                            v-model="addData.complaintContent"
-                        ></el-input>
-                    </el-form-item>
-
-                    <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">
-                        问题指标
-                    </el-divider>
-
-                    <el-form-item label="稳态指标:">
-                        <el-checkbox-group v-model="addData.steadyIndicator">
-                            <el-checkbox v-for="(item, ind) in steadyIndicatorList" :key="ind" :label="item.code">
-                                {{ item.name }}
-                            </el-checkbox>
-                        </el-checkbox-group>
-                    </el-form-item>
-
-                    <el-form-item label="暂态指标:">
-                        <el-checkbox-group v-model="addData.transientIndicators">
-                            <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
-                                {{ item.name }}
-                            </el-checkbox>
-                        </el-checkbox-group>
-                    </el-form-item>
-                </el-form>
-
-                <!-- 终端异常 -->
-                <el-form :inline="true" label-width="auto" disabled v-if="problemSources == '终端异常'">
-                    <el-form-item label="异常终端名称:">
-                        <el-input v-model="addData.abnormalDevName" placeholder="请填写"></el-input>
-                    </el-form-item>
-                    <el-form-item label="发现异常时间:">
-                        <el-input v-model="addData.abnormalDevTime" placeholder="请填写"></el-input>
-                    </el-form-item>
-                    <br />
-                    <el-form-item label="终端异常描述:">
-                        <el-input
-                            type="textarea"
-                            style="width: 400px"
-                            :autosize="{ minRows: 2, maxRows: 4 }"
-                            v-model="addData.eventDescription"
-                        ></el-input>
-                    </el-form-item>
-                    <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">
-                        问题指标
-                    </el-divider>
-
-                    <el-form-item label="稳态指标:">
-                        <el-checkbox-group v-model="addData.steadyIndicator">
-                            <el-checkbox v-for="(item, ind) in steadyIndicatorList" :key="ind" :label="item.code">
-                                {{ item.name }}
-                            </el-checkbox>
-                        </el-checkbox-group>
-                    </el-form-item>
-                    <br />
-                    <el-form-item label="暂态指标:">
-                        <el-checkbox-group v-model="addData.transientIndicators">
-                            <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
-                                {{ item.name }}
-                            </el-checkbox>
-                        </el-checkbox-group>
-                    </el-form-item>
-                </el-form>
-            </el-tab-pane>
-            <el-tab-pane label="流程" name="2">
-                <Filling v-if="dialogVisible" :isDisabled="true" :audit="true" ref="FillingRef" />
-            </el-tab-pane>
-        </el-tabs>
-    </el-dialog>
-</template>
-<script setup lang="ts">
-import { ref } from 'vue'
-import {
-    getAbnormalDetail,
-    getComplaintDetail,
-    getGeneralSurveyDetail,
-    getExcessiveDetail
-} from '@/api/process-boot/electricitymanagement'
-import { useDictData } from '@/stores/dictData'
-import Filling from './filling.vue'
-
-const dictData = useDictData()
-const addData: any = ref({})
-const FillingRef = ref()
-const activeName = ref(`1`)
-const dialogVisible: any = ref(false)
-const problemSources = ref('')
-const problemData = dictData.getBasicData('Problem_Sources')
-const steadyIndicatorList = dictData.getBasicData('Steady_Indicator')
-const transientIndicatorsList = dictData.getBasicData('Transient_Indicators')
-const open = async (row: any) => {
-    dialogVisible.value = true
-    let res: any = {}
-    problemSources.value = row.problemSources
-    if (row.problemSources == '终端异常') {
-        res = await getAbnormalDetail(row.powerQualityProblemNo)
-    } else if (row.problemSources == '在线监测告警') {
-        res = await getExcessiveDetail(row.powerQualityProblemNo)
-    } else if (row.problemSources == '用户投诉') {
-        res = await getComplaintDetail(row.powerQualityProblemNo)
-    } else if (row.problemSources == '普测超标') {
-        res = await getGeneralSurveyDetail(row.powerQualityProblemNo)
-    }
-
-    setTimeout(() => {
-        addData.value = res.data
-        FillingRef.value.open(row)
-    }, 0)
-}
-
-// 取消
-const handleClose = () => {
-    dialogVisible.value = false
-}
-defineExpose({ open })
-</script>
-<style lang="scss" scoped>
-:deep(.el-tabs__content) {
-    height: 100% !important;
-}
-</style>
+<template>
+    <el-dialog draggable title="详情" v-model="dialogVisible" width="1400px" :before-close="handleClose">
+        <el-tabs v-model="activeName" type="card">
+            <el-tab-pane label="指标" name="1">
+                <el-divider content-position="left" style="font-size: 18px">问题基本信息</el-divider>
+                <el-form :model="addData" :inline="true" disabled label-width="100px">
+                    <el-form-item label="所属单位:">
+                        <el-input v-model="addData.orgName" placeholder="请填写"></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="问题名称:">
+                        <el-input v-model="addData.problemName" placeholder="请填写"></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="问题编号:">
+                        <el-input v-model="addData.powerQualityProblemNo" placeholder="请填写"></el-input>
+                    </el-form-item>
+                    <el-form-item label="问题来源:">
+                        <el-select v-model="addData.problemSources" filterable>
+                            <el-option
+                                v-for="item in problemData"
+                                :key="item.code"
+                                :label="item.name"
+                                :value="item.code"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+                <!-- 在线监测超标问题 -->
+                <el-form :inline="true" label-width="100px" disabled v-if="problemSources == '在线监测告警'">
+                    <el-form-item label="变电站:">
+                        <el-input v-model="addData.sustationName"></el-input>
+                    </el-form-item>
+                    <el-form-item label="母线:">
+                        <el-input v-model="addData.barName"></el-input>
+                    </el-form-item>
+                    <el-form-item label="监测点名称:">
+                        <el-input v-model="addData.measurementPointName"></el-input>
+                    </el-form-item>
+                    <el-form-item label="监测点编号:">
+                        <el-input v-model="addData.measurementPointId"></el-input>
+                    </el-form-item>
+                    <el-form-item label="监测对象类型:">
+                        <el-input v-model="addData.loadType"></el-input>
+                    </el-form-item>
+                    <el-form-item label="监测对象:">
+                        <el-input v-model="addData.objName"></el-input>
+                    </el-form-item>
+                    <el-form-item label="电压等级:">
+                        <el-input v-model="addData.voltageLevel"></el-input>
+                    </el-form-item>
+                </el-form>
+                <!-- 普测超标 -->
+                <el-form :inline="true" label-width="100px" disabled v-if="problemSources == '普测超标'">
+                    <el-form-item label="普测计划名称:">
+                        <el-input v-model="addData.planName" placeholder="请填写"></el-input>
+                    </el-form-item>
+                    <el-form-item label="所属变电站:">
+                        <el-input v-model="addData.substationName" placeholder="请填写"></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="母线名称:">
+                        <el-input v-model="addData.busBarName" placeholder="请填写"></el-input>
+                    </el-form-item>
+
+                    <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">
+                        问题指标
+                    </el-divider>
+
+                    <el-form-item label="稳态指标:">
+                        <el-checkbox-group v-model="addData.steadyIndicator">
+                            <el-checkbox v-for="(item, ind) in steadyIndicatorList" :key="ind" :label="item.code">
+                                {{ item.name }}
+                            </el-checkbox>
+                        </el-checkbox-group>
+                    </el-form-item>
+
+                    <el-form-item label="暂态指标:">
+                        <el-checkbox-group v-model="addData.transientIndicators">
+                            <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
+                                {{ item.name }}
+                            </el-checkbox>
+                        </el-checkbox-group>
+                    </el-form-item>
+                </el-form>
+                <!-- 用户投诉 -->
+                <el-form :inline="true" label-width="100px" disabled v-if="problemSources == '用户投诉'">
+                    <el-form-item label="用户投诉名称:">
+                        <el-input v-model="addData.userName" placeholder="请填写"></el-input>
+                    </el-form-item>
+                    <el-form-item label="投诉用户编号:">
+                        <el-input v-model="addData.userNo" placeholder="请填写"></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="投诉时间:">
+                        <el-input v-model="addData.complaintTime" placeholder="请填写"></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="投诉内容:">
+                        <el-input
+                            type="textarea"
+                            :autosize="{ minRows: 2, maxRows: 4 }"
+                            style="width: 400px"
+                            placeholder="请输入内容"
+                            v-model="addData.complaintContent"
+                        ></el-input>
+                    </el-form-item>
+
+                    <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">
+                        问题指标
+                    </el-divider>
+
+                    <el-form-item label="稳态指标:">
+                        <el-checkbox-group v-model="addData.steadyIndicator">
+                            <el-checkbox v-for="(item, ind) in steadyIndicatorList" :key="ind" :label="item.code">
+                                {{ item.name }}
+                            </el-checkbox>
+                        </el-checkbox-group>
+                    </el-form-item>
+
+                    <el-form-item label="暂态指标:">
+                        <el-checkbox-group v-model="addData.transientIndicators">
+                            <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
+                                {{ item.name }}
+                            </el-checkbox>
+                        </el-checkbox-group>
+                    </el-form-item>
+                </el-form>
+
+                <!-- 终端异常 -->
+                <el-form :inline="true" label-width="auto" disabled v-if="problemSources == '终端异常'">
+                    <el-form-item label="异常终端名称:">
+                        <el-input v-model="addData.abnormalDevName" placeholder="请填写"></el-input>
+                    </el-form-item>
+                    <el-form-item label="发现异常时间:">
+                        <el-input v-model="addData.abnormalDevTime" placeholder="请填写"></el-input>
+                    </el-form-item>
+                    <br />
+                    <el-form-item label="终端异常描述:">
+                        <el-input
+                            type="textarea"
+                            style="width: 400px"
+                            :autosize="{ minRows: 2, maxRows: 4 }"
+                            v-model="addData.eventDescription"
+                        ></el-input>
+                    </el-form-item>
+                    <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">
+                        问题指标
+                    </el-divider>
+
+                    <el-form-item label="稳态指标:">
+                        <el-checkbox-group v-model="addData.steadyIndicator">
+                            <el-checkbox v-for="(item, ind) in steadyIndicatorList" :key="ind" :label="item.code">
+                                {{ item.name }}
+                            </el-checkbox>
+                        </el-checkbox-group>
+                    </el-form-item>
+                    <br />
+                    <el-form-item label="暂态指标:">
+                        <el-checkbox-group v-model="addData.transientIndicators">
+                            <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
+                                {{ item.name }}
+                            </el-checkbox>
+                        </el-checkbox-group>
+                    </el-form-item>
+                </el-form>
+            </el-tab-pane>
+            <el-tab-pane label="流程" name="2">
+                <Filling v-if="dialogVisible" :isDisabled="true" :audit="true" ref="FillingRef" />
+            </el-tab-pane>
+        </el-tabs>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref } from 'vue'
+import {
+    getAbnormalDetail,
+    getComplaintDetail,
+    getGeneralSurveyDetail,
+    getExcessiveDetail
+} from '@/api/process-boot/electricitymanagement'
+import { useDictData } from '@/stores/dictData'
+import Filling from './filling.vue'
+
+const dictData = useDictData()
+const addData: any = ref({})
+const FillingRef = ref()
+const activeName = ref(`1`)
+const dialogVisible: any = ref(false)
+const problemSources = ref('')
+const problemData = dictData.getBasicData('Problem_Sources')
+const steadyIndicatorList = dictData.getBasicData('Steady_Indicator')
+const transientIndicatorsList = dictData.getBasicData('Transient_Indicators')
+const open = async (row: any) => {
+    dialogVisible.value = true
+    let res: any = {}
+    problemSources.value = row.problemSources
+    if (row.problemSources == '终端异常') {
+        res = await getAbnormalDetail(row.powerQualityProblemNo)
+    } else if (row.problemSources == '在线监测告警') {
+        res = await getExcessiveDetail(row.powerQualityProblemNo)
+    } else if (row.problemSources == '用户投诉') {
+        res = await getComplaintDetail(row.powerQualityProblemNo)
+    } else if (row.problemSources == '普测超标') {
+        res = await getGeneralSurveyDetail(row.powerQualityProblemNo)
+    }
+
+    setTimeout(() => {
+        addData.value = res.data
+        FillingRef.value.open(row)
+    }, 0)
+}
+
+// 取消
+const handleClose = () => {
+    dialogVisible.value = false
+}
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+:deep(.el-tabs__content) {
+    height: 100% !important;
+}
+</style>
diff --git a/src/views/pqs/supervise/electricalEnergy/components/filling.vue b/src/views/pqs/supervise/electricalEnergy/components/filling.vue
index e1dca2dc..44c42b9c 100644
--- a/src/views/pqs/supervise/electricalEnergy/components/filling.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components/filling.vue
@@ -1,294 +1,294 @@
-<template>
-    <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">问题基本信息</el-divider>
-    <el-form :inline="true" label-width="auto">
-        <el-form-item label="所属单位:">
-            <el-input v-model="addData.orgName" clearable placeholder="请填写" disabled></el-input>
-        </el-form-item>
-
-        <el-form-item label="问题来源:">
-            <el-select disabled v-model="addData.problemSources" placeholder="请选择">
-                <el-option
-                    v-for="item in problemData"
-                    :key="item.code"
-                    :label="item.name"
-                    :value="item.code"
-                ></el-option>
-            </el-select>
-        </el-form-item>
-
-        <el-form-item label="问题名称:">
-            <el-input v-model="addData.problemName" clearable placeholder="请填写" disabled></el-input>
-        </el-form-item>
-
-        <el-form-item label="问题编号:">
-            <el-input v-model="addData.powerQualityProblemNo" disabled clearable placeholder="请填写"></el-input>
-        </el-form-item>
-    </el-form>
-
-    <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">填报流程</el-divider>
-
-    <el-tabs v-model="activeName" type="border-card">
-        <el-tab-pane label="原因分析" name="0">
-            <process1
-                :addData="addData"
-                :List="List"
-                :disabled="disabled"
-                ref="process0Ref"
-                @handleClose="handleClose"
-            />
-        </el-tab-pane>
-        <el-tab-pane label="计划整改措施" name="1">
-            <process2
-                :addData="addData"
-                :List="List"
-                :disabled="disabled"
-                ref="process1Ref"
-                @handleClose="handleClose"
-            />
-        </el-tab-pane>
-        <el-tab-pane label="实际采取措施" name="2">
-            <process3
-                :addData="addData"
-                :List="List"
-                :disabled="disabled"
-                ref="process2Ref"
-                @handleClose="handleClose"
-            />
-        </el-tab-pane>
-        <el-tab-pane label="成效分析" name="3">
-            <process4
-                :addData="addData"
-                :List="List"
-                :disabled="disabled"
-                ref="process3Ref"
-                @handleClose="handleClose"
-            />
-        </el-tab-pane>
-    </el-tabs>
-
-    <!-- 原因分析 0 -->
-    <!-- <process1
-        v-if="control == 0"
-        :addData="addData"
-        :List="List"
-        :disabled="disabled"
-        ref="process0Ref"
-        @handleClose="handleClose"
-    /> -->
-    <!-- 计划整改措施 1-->
-    <!-- <process2
-        v-if="control == 1"
-        :addData="addData"
-        :List="List"
-        :disabled="disabled"
-        ref="process1Ref"
-        @handleClose="handleClose"
-    /> -->
-    <!-- 实际采取措施 2 -->
-    <!-- <process3
-        v-if="control == 2"
-        :addData="addData"
-        :List="List"
-        :disabled="disabled"
-        ref="process2Ref"
-        @handleClose="handleClose"
-    /> -->
-    <!-- 成效分析  3 -->
-    <!-- <process4
-        v-if="control == 3"
-        :addData="addData"
-        :List="List"
-        :disabled="disabled"
-        ref="process3Ref"
-        @handleClose="handleClose"
-    /> -->
-
-    <!-- 填报 -->
-    <div style="display: flex; justify-content: center; margin-top: 10px" v-show="!disabled">
-        <el-button type="primary" @click="Submit">提交审核</el-button>
-        <el-button @click="handleClose">取消</el-button>
-    </div>
-    <!-- 审核 -->
-    <el-form
-        label-width="100px"
-        :model="form"
-        ref="ruleFormRef"
-        :rules="rules"
-        v-if="disabled && audit && flag && control == active"
-    >
-        <el-form-item prop="checkComment" label="审核意见:">
-            <el-input
-                type="textarea"
-                style="width: 400px"
-                :autosize="{ minRows: 2, maxRows: 4 }"
-                placeholder="请输入内容"
-                v-model="form.checkComment"
-            ></el-input>
-        </el-form-item>
-    </el-form>
-    <div
-        style="display: flex; justify-content: center; margin-top: 10px"
-        v-if="disabled && audit && flag && control == active"
-    >
-        <el-button type="primary" @click="adopt(1)">通过</el-button>
-        <el-button type="primary" @click="adopt(0)">不通过</el-button>
-        <el-button @click="handleClose">取消</el-button>
-    </div>
-</template>
-<script setup lang="ts">
-import { ref, onMounted } from 'vue'
-import { useDictData } from '@/stores/dictData'
-import process1 from './process1.vue'
-import process2 from './process2.vue'
-import process3 from './process3.vue'
-import process4 from './process4.vue'
-import { ElMessage } from 'element-plus'
-import {
-    getAbnormalDetail,
-    getComplaintDetail,
-    getGeneralSurveyDetail,
-    getExcessiveDetail,
-    checkPowerQuality
-} from '@/api/process-boot/electricitymanagement'
-const emit = defineEmits(['beforeClose'])
-const dictData = useDictData()
-const addData: any = ref({})
-const List: any = ref({})
-const active = ref(4)
-const control = ref()
-const ruleFormRef = ref()
-const activeName = ref('0')
-const process0Ref = ref()
-const process1Ref = ref()
-const process2Ref = ref()
-const process3Ref = ref()
-const form = ref({
-    checkComment: ''
-})
-const disabled = ref(false)
-const prop = defineProps({
-    isDisabled: {
-        type: Boolean,
-        default: false
-    },
-    audit: {
-        type: Boolean,
-        default: false
-    },
-    flag: {
-        type: Boolean,
-        default: false
-    }
-})
-
-const problemData = dictData.getBasicData('Problem_Sources')
-const open = async (row: any) => {
-    addData.value = row
-    let res: any = {}
-    if (row.problemSources == '终端异常') {
-        res = await getAbnormalDetail(row.powerQualityProblemNo)
-    } else if (row.problemSources == '在线监测告警') {
-        res = await getExcessiveDetail(row.powerQualityProblemNo)
-    } else if (row.problemSources == '用户投诉') {
-        res = await getComplaintDetail(row.powerQualityProblemNo)
-    } else if (row.problemSources == '普测超标') {
-        res = await getGeneralSurveyDetail(row.powerQualityProblemNo)
-    }
-
-    setTimeout(() => {
-        List.value = res.data
-        if (res.data.filePathYyfx == null) {
-            active.value = 0
-        } else if (res.data.filePathJhzg == null) {
-            active.value = 1
-            if (row.reportProcessStatus == 'Fail') {
-                active.value = 0
-            }
-        } else if (res.data.filePathSjcq == null) {
-            active.value = 2
-            if (row.reportProcessStatus == 'Fail') {
-                active.value = 1
-            }
-        } else if (res.data.filePathZlxg == null) {
-            active.value = 3
-            if (row.reportProcessStatus == 'Fail') {
-                active.value = 2
-            }
-        }
-
-        // 审核判断
-        if (prop.audit) {
-            active.value == 0 ? 0 : (active.value = active.value - 1)
-        }
-
-        control.value = active.value == 4 ? 3 : active.value
-    }, 0)
-}
-const rules = {
-    checkComment: [{ required: true, message: '请输入审核意见', trigger: 'blur' }]
-}
-
-const step = (e: number) => {
-    if (active.value >= e) {
-        control.value = e
-        if (active.value == e && !prop.isDisabled) {
-            disabled.value = false
-        } else {
-            disabled.value = true
-        }
-    }
-}
-onMounted(() => {
-    if (prop.isDisabled) {
-        disabled.value = prop.isDisabled
-    }
-})
-// 提交
-const Submit = () => {
-    if (control.value == 0) {
-        process0Ref.value.submit(0)
-    } else if (control.value == 1) {
-        process1Ref.value.submit(1)
-    } else if (control.value == 2) {
-        process2Ref.value.submit(2)
-    } else if (control.value == 3) {
-        process3Ref.value.submit(3)
-    }
-}
-// 取消
-const handleClose = () => {
-    form.value.checkComment = ''
-    emit('beforeClose')
-}
-
-// 审核
-const adopt = (type: number) => {
-    ruleFormRef.value.validate((valid: any) => {
-        if (valid) {
-            const adminInfo = window.localStorage.getItem('adminInfo')
-            const adminName = adminInfo ? JSON.parse(adminInfo).name : ''
-
-            checkPowerQuality({
-                checkComment: form.value.checkComment,
-                checkPerson: adminName,
-                checkResult: type,
-                powerQualityProblemNo: addData.value.powerQualityProblemNo,
-                reportProcess: addData.value.reportProcess
-            }).then((res: any) => {
-                ElMessage.success(res.message)
-                handleClose()
-            })
-        }
-    })
-}
-
-defineExpose({ open })
-</script>
-<style lang="scss" scoped>
-:deep(.el-upload-list__item) {
-    width: 400px;
-}
-:deep(.el-tabs__content) {
-    height: auto !important;
-}
-</style>
+<template>
+    <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">问题基本信息</el-divider>
+    <el-form :inline="true" label-width="auto">
+        <el-form-item label="所属单位:">
+            <el-input v-model="addData.orgName" clearable placeholder="请填写" disabled></el-input>
+        </el-form-item>
+
+        <el-form-item label="问题来源:">
+            <el-select disabled v-model="addData.problemSources" placeholder="请选择" filterable>
+                <el-option
+                    v-for="item in problemData"
+                    :key="item.code"
+                    :label="item.name"
+                    :value="item.code"
+                ></el-option>
+            </el-select>
+        </el-form-item>
+
+        <el-form-item label="问题名称:">
+            <el-input v-model="addData.problemName" clearable placeholder="请填写" disabled></el-input>
+        </el-form-item>
+
+        <el-form-item label="问题编号:">
+            <el-input v-model="addData.powerQualityProblemNo" disabled clearable placeholder="请填写"></el-input>
+        </el-form-item>
+    </el-form>
+
+    <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">填报流程</el-divider>
+
+    <el-tabs v-model="activeName" type="border-card">
+        <el-tab-pane label="原因分析" name="0">
+            <process1
+                :addData="addData"
+                :List="List"
+                :disabled="disabled"
+                ref="process0Ref"
+                @handleClose="handleClose"
+            />
+        </el-tab-pane>
+        <el-tab-pane label="计划整改措施" name="1">
+            <process2
+                :addData="addData"
+                :List="List"
+                :disabled="disabled"
+                ref="process1Ref"
+                @handleClose="handleClose"
+            />
+        </el-tab-pane>
+        <el-tab-pane label="实际采取措施" name="2">
+            <process3
+                :addData="addData"
+                :List="List"
+                :disabled="disabled"
+                ref="process2Ref"
+                @handleClose="handleClose"
+            />
+        </el-tab-pane>
+        <el-tab-pane label="成效分析" name="3">
+            <process4
+                :addData="addData"
+                :List="List"
+                :disabled="disabled"
+                ref="process3Ref"
+                @handleClose="handleClose"
+            />
+        </el-tab-pane>
+    </el-tabs>
+
+    <!-- 原因分析 0 -->
+    <!-- <process1
+        v-if="control == 0"
+        :addData="addData"
+        :List="List"
+        :disabled="disabled"
+        ref="process0Ref"
+        @handleClose="handleClose"
+    /> -->
+    <!-- 计划整改措施 1-->
+    <!-- <process2
+        v-if="control == 1"
+        :addData="addData"
+        :List="List"
+        :disabled="disabled"
+        ref="process1Ref"
+        @handleClose="handleClose"
+    /> -->
+    <!-- 实际采取措施 2 -->
+    <!-- <process3
+        v-if="control == 2"
+        :addData="addData"
+        :List="List"
+        :disabled="disabled"
+        ref="process2Ref"
+        @handleClose="handleClose"
+    /> -->
+    <!-- 成效分析  3 -->
+    <!-- <process4
+        v-if="control == 3"
+        :addData="addData"
+        :List="List"
+        :disabled="disabled"
+        ref="process3Ref"
+        @handleClose="handleClose"
+    /> -->
+
+    <!-- 填报 -->
+    <div style="display: flex; justify-content: center; margin-top: 10px" v-show="!disabled">
+        <el-button type="primary" @click="Submit">提交审核</el-button>
+        <el-button @click="handleClose">取消</el-button>
+    </div>
+    <!-- 审核 -->
+    <el-form
+        label-width="100px"
+        :model="form"
+        ref="ruleFormRef"
+        :rules="rules"
+        v-if="disabled && audit && flag && control == active"
+    >
+        <el-form-item prop="checkComment" label="审核意见:">
+            <el-input
+                type="textarea"
+                style="width: 400px"
+                :autosize="{ minRows: 2, maxRows: 4 }"
+                placeholder="请输入内容"
+                v-model="form.checkComment"
+            ></el-input>
+        </el-form-item>
+    </el-form>
+    <div
+        style="display: flex; justify-content: center; margin-top: 10px"
+        v-if="disabled && audit && flag && control == active"
+    >
+        <el-button type="primary" @click="adopt(1)">通过</el-button>
+        <el-button type="primary" @click="adopt(0)">不通过</el-button>
+        <el-button @click="handleClose">取消</el-button>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import process1 from './process1.vue'
+import process2 from './process2.vue'
+import process3 from './process3.vue'
+import process4 from './process4.vue'
+import { ElMessage } from 'element-plus'
+import {
+    getAbnormalDetail,
+    getComplaintDetail,
+    getGeneralSurveyDetail,
+    getExcessiveDetail,
+    checkPowerQuality
+} from '@/api/process-boot/electricitymanagement'
+const emit = defineEmits(['beforeClose'])
+const dictData = useDictData()
+const addData: any = ref({})
+const List: any = ref({})
+const active = ref(4)
+const control = ref()
+const ruleFormRef = ref()
+const activeName = ref('0')
+const process0Ref = ref()
+const process1Ref = ref()
+const process2Ref = ref()
+const process3Ref = ref()
+const form = ref({
+    checkComment: ''
+})
+const disabled = ref(false)
+const prop = defineProps({
+    isDisabled: {
+        type: Boolean,
+        default: false
+    },
+    audit: {
+        type: Boolean,
+        default: false
+    },
+    flag: {
+        type: Boolean,
+        default: false
+    }
+})
+
+const problemData = dictData.getBasicData('Problem_Sources')
+const open = async (row: any) => {
+    addData.value = row
+    let res: any = {}
+    if (row.problemSources == '终端异常') {
+        res = await getAbnormalDetail(row.powerQualityProblemNo)
+    } else if (row.problemSources == '在线监测告警') {
+        res = await getExcessiveDetail(row.powerQualityProblemNo)
+    } else if (row.problemSources == '用户投诉') {
+        res = await getComplaintDetail(row.powerQualityProblemNo)
+    } else if (row.problemSources == '普测超标') {
+        res = await getGeneralSurveyDetail(row.powerQualityProblemNo)
+    }
+
+    setTimeout(() => {
+        List.value = res.data
+        if (res.data.filePathYyfx == null) {
+            active.value = 0
+        } else if (res.data.filePathJhzg == null) {
+            active.value = 1
+            if (row.reportProcessStatus == 'Fail') {
+                active.value = 0
+            }
+        } else if (res.data.filePathSjcq == null) {
+            active.value = 2
+            if (row.reportProcessStatus == 'Fail') {
+                active.value = 1
+            }
+        } else if (res.data.filePathZlxg == null) {
+            active.value = 3
+            if (row.reportProcessStatus == 'Fail') {
+                active.value = 2
+            }
+        }
+
+        // 审核判断
+        if (prop.audit) {
+            active.value == 0 ? 0 : (active.value = active.value - 1)
+        }
+
+        control.value = active.value == 4 ? 3 : active.value
+    }, 0)
+}
+const rules = {
+    checkComment: [{ required: true, message: '请输入审核意见', trigger: 'blur' }]
+}
+
+const step = (e: number) => {
+    if (active.value >= e) {
+        control.value = e
+        if (active.value == e && !prop.isDisabled) {
+            disabled.value = false
+        } else {
+            disabled.value = true
+        }
+    }
+}
+onMounted(() => {
+    if (prop.isDisabled) {
+        disabled.value = prop.isDisabled
+    }
+})
+// 提交
+const Submit = () => {
+    if (control.value == 0) {
+        process0Ref.value.submit(0)
+    } else if (control.value == 1) {
+        process1Ref.value.submit(1)
+    } else if (control.value == 2) {
+        process2Ref.value.submit(2)
+    } else if (control.value == 3) {
+        process3Ref.value.submit(3)
+    }
+}
+// 取消
+const handleClose = () => {
+    form.value.checkComment = ''
+    emit('beforeClose')
+}
+
+// 审核
+const adopt = (type: number) => {
+    ruleFormRef.value.validate((valid: any) => {
+        if (valid) {
+            const adminInfo = window.localStorage.getItem('adminInfo')
+            const adminName = adminInfo ? JSON.parse(adminInfo).name : ''
+
+            checkPowerQuality({
+                checkComment: form.value.checkComment,
+                checkPerson: adminName,
+                checkResult: type,
+                powerQualityProblemNo: addData.value.powerQualityProblemNo,
+                reportProcess: addData.value.reportProcess
+            }).then((res: any) => {
+                ElMessage.success(res.message)
+                handleClose()
+            })
+        }
+    })
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+:deep(.el-tabs__content) {
+    height: auto !important;
+}
+</style>
diff --git a/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue b/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue
index 0bd23937..c7003724 100644
--- a/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue
@@ -2,7 +2,7 @@
     <TableHeader area datePicker ref="TableHeaderRef" showCustomColumn>
         <template #select>
             <el-form-item label="问题来源" >
-                <el-select v-model="tableStore.table.params.problemSources" clearable placeholder="请选择问题来源">
+                <el-select v-model="tableStore.table.params.problemSources" clearable placeholder="请选择问题来源" filterable>
                     <el-option
                         v-for="item in problemData"
                         :key="item.code"
@@ -12,7 +12,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="填报进度">
-                <el-select v-model="tableStore.table.params.reportProcess" clearable placeholder="请选择填报进度">
+                <el-select v-model="tableStore.table.params.reportProcess" clearable placeholder="请选择填报进度" filterable>
                     <el-option
                         v-for="item in fillingProgress"
                         :key="item.code"
@@ -22,7 +22,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="状态">
-                <el-select v-model="tableStore.table.params.reportProcessStatus" clearable placeholder="请选择状态">
+                <el-select v-model="tableStore.table.params.reportProcessStatus" clearable placeholder="请选择状态" filterable>
                     <el-option
                         v-for="item in auditStatus"
                         :key="item.code"
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue b/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
index ae4d1d2a..c1ad0a55 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
@@ -5,7 +5,7 @@
     <TableHeader area nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showExport showCustomColumn>
         <template v-slot:select>
             <el-form-item label="是否解决">
-                <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
+                <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决" filterable>
                     <el-option
                         v-for="item in dealStateList"
                         :key="item.value"
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue b/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue
index 2cd09f97..0cded19a 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/form/complaintsForm.vue
@@ -47,7 +47,7 @@
                         ></el-input>
                     </el-form-item> -->
                     <el-form-item for="-" label="监测点:" prop="monitorNumber">
-                        <el-select v-model="form.monitorNumber" clearable filterable style="width: 100%" placeholder="请选择监测点">
+                        <el-select v-model="form.monitorNumber" clearable filterable style="width: 100%" placeholder="请选择监测点" >
                             <el-option v-for="item in minitorList" :key="item.id" :label="item.name"
                                 :value="item.id"></el-option>
                         </el-select>
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/form/testQuestionsForm.vue b/src/views/pqs/supervise/electricalEnergy/components1/form/testQuestionsForm.vue
index 122e068c..a2c454a8 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/form/testQuestionsForm.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/form/testQuestionsForm.vue
@@ -1,131 +1,131 @@
-<template>
-    <el-dialog draggable v-model="dialogVisible" :title="title" style="width: 1100px" :before-close="handleClose">
-        <el-form :model="ordinaryA" :inline="true" class="form">
-            <el-form-item>
-                <Area v-model="ordinaryA.orgNo"></Area>
-            </el-form-item>
-
-            <el-form-item label="普测结果上传时间">
-                <el-date-picker
-                    v-model="ordinaryA.planStartTime"
-                    type="month"
-                    format="YYYY-MM"
-                    value-format="YYYY-MM-DD"
-                    placeholder="选择月"
-                    @change="queryPlanName"
-                ></el-date-picker>
-            </el-form-item>
-
-            <el-form-item label="普测计划名称">
-                <el-select v-model="ordinaryA.planName" clearable placeholder="请选择">
-                    <el-option
-                        v-for="item in planNameList"
-                        :key="item.planName"
-                        :label="item.planName"
-                        :value="item.planName"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item>
-                <el-button type="primary" icon="el-icon-Search" @click="searchFnExcessive">查询</el-button>
-            </el-form-item>
-        </el-form>
-        <vxe-table v-bind="defaultAttribute" height="350" ref="xTable2Ref" :data="ordinaryAddData">
-            <vxe-column type="radio" width="60"></vxe-column>
-            <vxe-column field="subName" title="变电站名称"></vxe-column>
-            <vxe-column field="voltageLevelName" title="变电站电压等级"></vxe-column>
-        </vxe-table>
-
-        <el-form :model="ordinaryA" :rules="rules" ref="ordinaryARef" label-width="auto" :inline="true" class="form">
-            <el-form-item label="稳态指标" prop="steadyState">
-                <el-checkbox-group v-model="ordinaryA.steadyState">
-                    <el-checkbox v-for="(item, ind) in steadyStateList" :key="ind" :label="item.code">
-                        {{ item.name }}
-                    </el-checkbox>
-                </el-checkbox-group>
-            </el-form-item>
-            <br />
-            <el-form-item label="暂态指标" prop="transientIndicators">
-                <el-checkbox-group v-model="ordinaryA.transientIndicators">
-                    <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
-                        {{ item.name }}
-                    </el-checkbox>
-                </el-checkbox-group>
-            </el-form-item>
-            <br />
-            <el-form-item label="上传附件">
-                <el-upload
-                    ref="upload"
-                    action=""
-                    :auto-upload="false"
-                    :show-file-list="false"
-                    :limit="1"
-                    :on-change="beforeUpload"
-                >
-                    <el-button icon="el-icon-Upload" type="primary" class="mr10">上传</el-button>
-                </el-upload>
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="handleClose">取消</el-button>
-                <el-button type="primary" @click="submit">确认</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-<script setup lang="ts">
-import { ref } from 'vue'
-import { useDictData } from '@/stores/dictData'
-const emit = defineEmits(['onsubmit'])
-const dictData = useDictData()
-const dialogVisible = ref(false)
-const title: any = ref('')
-const steadyStateList = dictData.getBasicData('Steady_Indicator')
-const transientIndicatorsList = dictData.getBasicData('Transient_Indicators')
-
-const ordinaryA = ref({
-    orgNo: '',
-    orgName: '',
-    planName: '',
-    planStartTime: '',
-    uploadTime: '',
-    name: '',
-    steadyState: [],
-    transientIndicators: []
-})
-const defaultAttribute = ref([])
-const rules = {
-    problemName: [{ required: true, message: '请输入问题名称', trigger: 'blur' }],
-    userName: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
-    userNo: [{ required: true, message: '请输入用户编号', trigger: 'blur' }],
-    complaintContent: [{ required: true, message: '请输入投诉内容', trigger: 'blur' }],
-    complaintTime: [{ required: true, message: '请选择时间', trigger: 'change' }],
-    problemSources: [{ required: true, message: '情选择问题来源', trigger: 'change' }],
-    abnormalDevTime: [{ required: true, message: '请选择时间', trigger: 'change' }],
-    transientIndicators: [{ required: true, message: '请选择暂态指标', trigger: 'change' }],
-    steadyState: [{ required: true, message: '请选择稳态指标', trigger: 'change' }],
-    eventDescription: [{ required: true, message: '请输入终端异常描述', trigger: 'blur' }],
-    abnormalDevName: [{ required: true, message: '请输入问题名称', trigger: 'blur' }]
-}
-const submit = () => {
-    handleClose()
-}
-
-const open = (row: any) => {
-    dialogVisible.value = true
-    title.value = row.text
-}
-
-const handleClose = () => {
-    dialogVisible.value = false
-}
-const beforeUpload = () => {}
-defineExpose({ open })
-</script>
-<style lang="scss" scoped>
-:deep(.el-upload-list__item) {
-    width: 400px;
-}
-</style>
+<template>
+    <el-dialog draggable v-model="dialogVisible" :title="title" style="width: 1100px" :before-close="handleClose">
+        <el-form :model="ordinaryA" :inline="true" class="form">
+            <el-form-item>
+                <Area v-model="ordinaryA.orgNo"></Area>
+            </el-form-item>
+
+            <el-form-item label="普测结果上传时间">
+                <el-date-picker
+                    v-model="ordinaryA.planStartTime"
+                    type="month"
+                    format="YYYY-MM"
+                    value-format="YYYY-MM-DD"
+                    placeholder="选择月"
+                    @change="queryPlanName"
+                ></el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="普测计划名称">
+                <el-select v-model="ordinaryA.planName" clearable placeholder="请选择" filterable>
+                    <el-option
+                        v-for="item in planNameList"
+                        :key="item.planName"
+                        :label="item.planName"
+                        :value="item.planName"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-Search" @click="searchFnExcessive">查询</el-button>
+            </el-form-item>
+        </el-form>
+        <vxe-table v-bind="defaultAttribute" height="350" ref="xTable2Ref" :data="ordinaryAddData">
+            <vxe-column type="radio" width="60"></vxe-column>
+            <vxe-column field="subName" title="变电站名称"></vxe-column>
+            <vxe-column field="voltageLevelName" title="变电站电压等级"></vxe-column>
+        </vxe-table>
+
+        <el-form :model="ordinaryA" :rules="rules" ref="ordinaryARef" label-width="auto" :inline="true" class="form">
+            <el-form-item label="稳态指标" prop="steadyState">
+                <el-checkbox-group v-model="ordinaryA.steadyState">
+                    <el-checkbox v-for="(item, ind) in steadyStateList" :key="ind" :label="item.code">
+                        {{ item.name }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+            <br />
+            <el-form-item label="暂态指标" prop="transientIndicators">
+                <el-checkbox-group v-model="ordinaryA.transientIndicators">
+                    <el-checkbox v-for="(item, ind) in transientIndicatorsList" :key="ind" :label="item.code">
+                        {{ item.name }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+            <br />
+            <el-form-item label="上传附件">
+                <el-upload
+                    ref="upload"
+                    action=""
+                    :auto-upload="false"
+                    :show-file-list="false"
+                    :limit="1"
+                    :on-change="beforeUpload"
+                >
+                    <el-button icon="el-icon-Upload" type="primary" class="mr10">上传</el-button>
+                </el-upload>
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="handleClose">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useDictData } from '@/stores/dictData'
+const emit = defineEmits(['onsubmit'])
+const dictData = useDictData()
+const dialogVisible = ref(false)
+const title: any = ref('')
+const steadyStateList = dictData.getBasicData('Steady_Indicator')
+const transientIndicatorsList = dictData.getBasicData('Transient_Indicators')
+
+const ordinaryA = ref({
+    orgNo: '',
+    orgName: '',
+    planName: '',
+    planStartTime: '',
+    uploadTime: '',
+    name: '',
+    steadyState: [],
+    transientIndicators: []
+})
+const defaultAttribute = ref([])
+const rules = {
+    problemName: [{ required: true, message: '请输入问题名称', trigger: 'blur' }],
+    userName: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
+    userNo: [{ required: true, message: '请输入用户编号', trigger: 'blur' }],
+    complaintContent: [{ required: true, message: '请输入投诉内容', trigger: 'blur' }],
+    complaintTime: [{ required: true, message: '请选择时间', trigger: 'change' }],
+    problemSources: [{ required: true, message: '情选择问题来源', trigger: 'change' }],
+    abnormalDevTime: [{ required: true, message: '请选择时间', trigger: 'change' }],
+    transientIndicators: [{ required: true, message: '请选择暂态指标', trigger: 'change' }],
+    steadyState: [{ required: true, message: '请选择稳态指标', trigger: 'change' }],
+    eventDescription: [{ required: true, message: '请输入终端异常描述', trigger: 'blur' }],
+    abnormalDevName: [{ required: true, message: '请输入问题名称', trigger: 'blur' }]
+}
+const submit = () => {
+    handleClose()
+}
+
+const open = (row: any) => {
+    dialogVisible.value = true
+    title.value = row.text
+}
+
+const handleClose = () => {
+    dialogVisible.value = false
+}
+const beforeUpload = () => {}
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+</style>
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/online.vue b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
index b02a9734..55366d6b 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/online.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
@@ -16,7 +16,7 @@
                 />
             </el-form-item>
             <el-form-item label="监测点性质">
-                <el-select v-model="tableStore.table.params.lineType" clearable placeholder="请选择监测点性质">
+                <el-select v-model="tableStore.table.params.lineType" clearable placeholder="请选择监测点性质" filterable>
                     <el-option label="电网侧" value="0" />
                     <el-option label="非电网侧" value="1" />
                 </el-select>
@@ -26,6 +26,7 @@
                     v-model="tableStore.table.params.dataType"
                     @change="changeDataType"
                     placeholder="请选择监测点性质"
+                    filterable
                 >
                     <el-option label="超标数据" value="1" />
                     <el-option label="异常数据" value="2" />
@@ -40,6 +41,7 @@
                     collapse-tags
                     collapse-tags-tooltip
                     placeholder="请选择超标指标"
+                    filterable
                 >
                     <el-option v-for="item in exceeded" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue b/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue
index e7dc8f9a..26f2ca71 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue
@@ -13,7 +13,7 @@
                 ></el-input>
             </el-form-item>
             <el-form-item label="是否解决">
-                <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
+                <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决" filterable>
                     <el-option
                         v-for="item in dealStateList"
                         :key="item.value"
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue b/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
index 1bce8eeb..253b82e2 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
@@ -4,7 +4,7 @@
         <TableHeader area nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showExport showCustomColumn>
             <template #select>
                 <el-form-item label="流程状态">
-                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态" filterable>
                         <el-option
                             v-for="item in statusSelect"
                             :key="item.id"
@@ -14,7 +14,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="是否解决">
-                    <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
+                    <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决" filterable>
                         <el-option
                             v-for="item in dealStateList"
                             :key="item.value"
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/outcome.vue b/src/views/pqs/supervise/harmonicSurvey/components/outcome.vue
index c0aa83d5..bdf84d6a 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/outcome.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/outcome.vue
@@ -3,7 +3,7 @@
         <TableHeader area datePicker ref="TableHeaderRef" showCustomColumn>
             <template #select>
                 <el-form-item label="是否上传">
-                    <el-select v-model="tableStore.table.params.isFileUpload" placeholder="请选择是否上传">
+                    <el-select v-model="tableStore.table.params.isFileUpload" placeholder="请选择是否上传" filterable>
                         <el-option label="未上传" value="0" />
                         <el-option label="已上传" value="1" />
                     </el-select>
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue b/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue
index 316d6eda..40abd81f 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue
@@ -22,7 +22,7 @@
                 ></el-input>
             </el-form-item>
             <el-form-item label="监督类型:" prop="supvType">
-                <el-select v-model="form.supvType" placeholder="请选择监督类型" style="width: 100%" @change="++key">
+                <el-select v-model="form.supvType" placeholder="请选择监督类型" style="width: 100%" @change="++key" filterable>
                     <el-option
                         v-for="item in supvTypeOptionList"
                         :key="item.id"
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
index b919bd91..4dd9a948 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
@@ -2,7 +2,7 @@
     <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showExport showCustomColumn>
         <template #select>
             <el-form-item label="监督类型">
-                <el-select v-model="tableStore.table.params.supvType" clearable placeholder="请选择监督类型">
+                <el-select v-model="tableStore.table.params.supvType" clearable placeholder="请选择监督类型" filterable>
                     <el-option
                         v-for="item in supvTypeOptionList"
                         :key="item.id"
@@ -12,7 +12,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态" filterable>
                     <el-option
                         v-for="item in statusSelect"
                         :key="item.id"
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
index f0166959..1740123c 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
@@ -2,7 +2,7 @@
     <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showExport showCustomColumn>
         <template v-slot:select>
             <el-form-item label="监督类型">
-                <el-select v-model="tableStore.table.params.supvType" clearable placeholder="请选择监督类型">
+                <el-select v-model="tableStore.table.params.supvType" clearable placeholder="请选择监督类型" filterable>
                     <el-option
                         v-for="item in supvTypeOptionList"
                         :key="item.id"
@@ -12,7 +12,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态" filterable>
                     <el-option
                         v-for="item in statusSelect"
                         :key="item.id"
diff --git a/src/views/pqs/supervise/interfere/components/network/audit.vue b/src/views/pqs/supervise/interfere/components/network/audit.vue
index 7def779a..78fa34a0 100644
--- a/src/views/pqs/supervise/interfere/components/network/audit.vue
+++ b/src/views/pqs/supervise/interfere/components/network/audit.vue
@@ -1,180 +1,180 @@
-<template>
-    <!-- 上传 -->
-    <el-dialog draggable :title="title" v-model="uploadConclusions" width="800px" :before-close="cancel">
-        <el-divider content-position="left">基本信息</el-divider>
-        <el-form
-            :inline="true"
-            ref="formRef"
-            :model="addForm"
-            label-width="120px"
-            :rules="rules"
-            :disabled="title == '未建档干扰源用户详情'"
-        >
-            <el-form-item label="所属单位:">
-                <Area v-model="addForm.orgNo" disabled />
-            </el-form-item>
-            <el-form-item label="干扰源用户名称:" prop="userName">
-                <el-input v-model="addForm.userName" clearable placeholder="请输入关键字" disabled></el-input>
-            </el-form-item>
-            <el-form-item label="干扰源类型:">
-                <el-select v-model="addForm.loadType" clearable collapse-tags placeholder="请选择" disabled>
-                    <el-option
-                        v-for="item in interferenceType"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="建档时间:">
-                <el-input v-model="addForm.recordTime" clearable placeholder="请输入关键字" disabled></el-input>
-            </el-form-item>
-
-            <el-divider content-position="left" style="font-weight: bolder; font-size: 18px">报告在线查看</el-divider>
-            <el-form-item class="item" label="报告:">
-                <el-button type="primary" link @click="download">
-                    {{ addForm.ifilePathName }}
-                </el-button>
-            </el-form-item>
-            <el-divider content-position="left" style="font-weight: bolder; font-size: 18px">
-                入网评估结论填报
-            </el-divider>
-            <el-form-item label="是否超标:" style="margin-top: 10px" prop="iIsOverLimit">
-                <el-radio v-model="addForm.iIsOverLimit" :label="1" disabled>是</el-radio>
-                <el-radio v-model="addForm.iIsOverLimit" :label="0" disabled>否</el-radio>
-            </el-form-item>
-            <br />
-            <el-form-item label="超标指标:" style="margin-top: 10px" prop="IOverLimitTarget">
-                <el-checkbox-group v-model="addForm.IOverLimitTarget" disabled>
-                    <el-checkbox v-for="(item, ind) in exceeded" :label="item.id">
-                        {{ item.name }}
-                    </el-checkbox>
-                </el-checkbox-group>
-            </el-form-item>
-            <br />
-            <el-form-item label="计划采取措施:" style="margin-top: 10px" prop="IPlanStep">
-                <el-select v-model="addForm.IPlanStep" placeholder="请选择" disabled>
-                    <el-option
-                        v-for="item in takeMeasures"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <br />
-            <el-form-item label="入网详情:" style="margin-top: 10px" prop="IDescription">
-                <el-input
-                    disabled
-                    v-model="addForm.IDescription"
-                    :autosize="{ minRows: 2, maxRows: 4 }"
-                    placeholder="请输入入网详情"
-                    type="textarea"
-                    style="width: 500px"
-                ></el-input>
-            </el-form-item>
-            <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">审核意见</el-divider>
-            <el-form-item prop="checkComment">
-                <el-input
-                    type="textarea"
-                    style="width: 400px"
-                    placeholder="请输入审核意见"
-                    :autosize="{ minRows: 2, maxRows: 4 }"
-                    v-model="addForm.checkComment"
-                ></el-input>
-            </el-form-item>
-        </el-form>
-        <div style="display: flex; justify-content: center; margin-top: 30px" v-if="title != '未建档干扰源用户详情'">
-            <el-button type="primary" class="ml20" @click="submit(1)">通过</el-button>
-            <el-button type="primary" class="ml20" @click="submit(0)">不通过</el-button>
-            <el-button type="primary" class="ml20" @click="cancel">取消</el-button>
-        </div>
-    </el-dialog>
-</template>
-<script setup lang="ts">
-import { ref, reactive } from 'vue'
-import { useDictData } from '@/stores/dictData'
-import Area from '@/components/form/area/index.vue'
-import { UploadInstance, UploadProps, UploadRawFile, ElMessage, ElMessageBox } from 'element-plus'
-import { genFileId } from 'element-plus'
-import { checkLoadTypeUserI, getLoadTypeUserById } from '@/api/process-boot/interference'
-const dictData = useDictData()
-
-const exceeded = dictData.getBasicData('Steady_Statis')
-const takeMeasures = dictData.getBasicData('Plan_Take')
-const interferenceType = dictData.getBasicData('Interference_Source')
-
-const emit = defineEmits(['onSubmit'])
-const uploadConclusions = ref(false)
-
-const addForm: any = ref({})
-
-const title = ref('')
-const rules = {
-    checkComment: [{ required: true, message: '请输入入网详情', trigger: 'blur' }]
-}
-const formRef = ref()
-
-const submit = (flag: any) => {
-    formRef.value?.validate((valid: any) => {
-        if (valid) {
-            checkLoadTypeUserI({
-                checkComment: addForm.value.checkComment,
-                checkPerson: dictData.state.area[0].id,
-                checkResult: flag,
-                id: addForm.value.id
-            }).then((res: any) => {
-                ElMessage.success('操作成功')
-                cancel()
-                emit('onSubmit')
-            })
-        }
-    })
-}
-// 下载
-const download = async () => {
-    // window.open(addForm.value.ifile)
-    let response = await fetch(addForm.value.ifile)
-    let blob = await response.blob()
-    let a = document.createElement('a')
-    a.href = window.URL.createObjectURL(blob)
-    a.download = addForm.value.ifilePathName
-    a.click()
-    a.remove()
-}
-
-// 重置
-const cancel = () => {
-    addForm.value.checkComment = ''
-    uploadConclusions.value = false
-}
-
-const open = (text: string, row: any) => {
-    title.value = text
-    addForm.value = {}
-    getLoadTypeUserById({ id: row.id }).then((res: any) => {
-        addForm.value = {
-            id: res.data.id,
-            orgNo: res.data.orgNo,
-            loadType: res.data.loadType,
-            userName: res.data.userName,
-            recordTime: res.data.recordTime,
-            iIsOverLimit: res.data.iisOverLimit ? res.data.iisOverLimit : 0,
-            IDescription: res.data.idescription ? res.data.idescription : '',
-            IPlanStep: res.data.iplanStep ? res.data.iplanStep : '',
-            IOverLimitTarget: res.data.ioverLimitTarget ? res.data.ioverLimitTarget.split(',') : [],
-            ifilePathName: res.data.ifilePathName ? res.data.ifilePathName : '',
-            ifile: res.data.ifile
-        }
-    })
-
-    uploadConclusions.value = true
-}
-
-defineExpose({ open })
-</script>
-<style lang="scss" scoped>
-:deep(.el-upload-list__item) {
-    width: 400px;
-}
-</style>
+<template>
+    <!-- 上传 -->
+    <el-dialog draggable :title="title" v-model="uploadConclusions" width="800px" :before-close="cancel">
+        <el-divider content-position="left">基本信息</el-divider>
+        <el-form
+            :inline="true"
+            ref="formRef"
+            :model="addForm"
+            label-width="120px"
+            :rules="rules"
+            :disabled="title == '未建档干扰源用户详情'"
+        >
+            <el-form-item label="所属单位:">
+                <Area v-model="addForm.orgNo" disabled />
+            </el-form-item>
+            <el-form-item label="干扰源用户名称:" prop="userName">
+                <el-input v-model="addForm.userName" clearable placeholder="请输入关键字" disabled></el-input>
+            </el-form-item>
+            <el-form-item label="干扰源类型:">
+                <el-select v-model="addForm.loadType" clearable collapse-tags placeholder="请选择" disabled filterable>
+                    <el-option
+                        v-for="item in interferenceType"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="建档时间:">
+                <el-input v-model="addForm.recordTime" clearable placeholder="请输入关键字" disabled></el-input>
+            </el-form-item>
+
+            <el-divider content-position="left" style="font-weight: bolder; font-size: 18px">报告在线查看</el-divider>
+            <el-form-item class="item" label="报告:">
+                <el-button type="primary" link @click="download">
+                    {{ addForm.ifilePathName }}
+                </el-button>
+            </el-form-item>
+            <el-divider content-position="left" style="font-weight: bolder; font-size: 18px">
+                入网评估结论填报
+            </el-divider>
+            <el-form-item label="是否超标:" style="margin-top: 10px" prop="iIsOverLimit">
+                <el-radio v-model="addForm.iIsOverLimit" :label="1" disabled>是</el-radio>
+                <el-radio v-model="addForm.iIsOverLimit" :label="0" disabled>否</el-radio>
+            </el-form-item>
+            <br />
+            <el-form-item label="超标指标:" style="margin-top: 10px" prop="IOverLimitTarget">
+                <el-checkbox-group v-model="addForm.IOverLimitTarget" disabled>
+                    <el-checkbox v-for="(item, ind) in exceeded" :label="item.id">
+                        {{ item.name }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+            <br />
+            <el-form-item label="计划采取措施:" style="margin-top: 10px" prop="IPlanStep">
+                <el-select v-model="addForm.IPlanStep" placeholder="请选择" disabled filterable>
+                    <el-option
+                        v-for="item in takeMeasures"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <br />
+            <el-form-item label="入网详情:" style="margin-top: 10px" prop="IDescription">
+                <el-input
+                    disabled
+                    v-model="addForm.IDescription"
+                    :autosize="{ minRows: 2, maxRows: 4 }"
+                    placeholder="请输入入网详情"
+                    type="textarea"
+                    style="width: 500px"
+                ></el-input>
+            </el-form-item>
+            <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">审核意见</el-divider>
+            <el-form-item prop="checkComment">
+                <el-input
+                    type="textarea"
+                    style="width: 400px"
+                    placeholder="请输入审核意见"
+                    :autosize="{ minRows: 2, maxRows: 4 }"
+                    v-model="addForm.checkComment"
+                ></el-input>
+            </el-form-item>
+        </el-form>
+        <div style="display: flex; justify-content: center; margin-top: 30px" v-if="title != '未建档干扰源用户详情'">
+            <el-button type="primary" class="ml20" @click="submit(1)">通过</el-button>
+            <el-button type="primary" class="ml20" @click="submit(0)">不通过</el-button>
+            <el-button type="primary" class="ml20" @click="cancel">取消</el-button>
+        </div>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import Area from '@/components/form/area/index.vue'
+import { UploadInstance, UploadProps, UploadRawFile, ElMessage, ElMessageBox } from 'element-plus'
+import { genFileId } from 'element-plus'
+import { checkLoadTypeUserI, getLoadTypeUserById } from '@/api/process-boot/interference'
+const dictData = useDictData()
+
+const exceeded = dictData.getBasicData('Steady_Statis')
+const takeMeasures = dictData.getBasicData('Plan_Take')
+const interferenceType = dictData.getBasicData('Interference_Source')
+
+const emit = defineEmits(['onSubmit'])
+const uploadConclusions = ref(false)
+
+const addForm: any = ref({})
+
+const title = ref('')
+const rules = {
+    checkComment: [{ required: true, message: '请输入入网详情', trigger: 'blur' }]
+}
+const formRef = ref()
+
+const submit = (flag: any) => {
+    formRef.value?.validate((valid: any) => {
+        if (valid) {
+            checkLoadTypeUserI({
+                checkComment: addForm.value.checkComment,
+                checkPerson: dictData.state.area[0].id,
+                checkResult: flag,
+                id: addForm.value.id
+            }).then((res: any) => {
+                ElMessage.success('操作成功')
+                cancel()
+                emit('onSubmit')
+            })
+        }
+    })
+}
+// 下载
+const download = async () => {
+    // window.open(addForm.value.ifile)
+    let response = await fetch(addForm.value.ifile)
+    let blob = await response.blob()
+    let a = document.createElement('a')
+    a.href = window.URL.createObjectURL(blob)
+    a.download = addForm.value.ifilePathName
+    a.click()
+    a.remove()
+}
+
+// 重置
+const cancel = () => {
+    addForm.value.checkComment = ''
+    uploadConclusions.value = false
+}
+
+const open = (text: string, row: any) => {
+    title.value = text
+    addForm.value = {}
+    getLoadTypeUserById({ id: row.id }).then((res: any) => {
+        addForm.value = {
+            id: res.data.id,
+            orgNo: res.data.orgNo,
+            loadType: res.data.loadType,
+            userName: res.data.userName,
+            recordTime: res.data.recordTime,
+            iIsOverLimit: res.data.iisOverLimit ? res.data.iisOverLimit : 0,
+            IDescription: res.data.idescription ? res.data.idescription : '',
+            IPlanStep: res.data.iplanStep ? res.data.iplanStep : '',
+            IOverLimitTarget: res.data.ioverLimitTarget ? res.data.ioverLimitTarget.split(',') : [],
+            ifilePathName: res.data.ifilePathName ? res.data.ifilePathName : '',
+            ifile: res.data.ifile
+        }
+    })
+
+    uploadConclusions.value = true
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+</style>
diff --git a/src/views/pqs/supervise/interfere/components/network/index.vue b/src/views/pqs/supervise/interfere/components/network/index.vue
index 6cc0bd5f..26b99b96 100644
--- a/src/views/pqs/supervise/interfere/components/network/index.vue
+++ b/src/views/pqs/supervise/interfere/components/network/index.vue
@@ -2,7 +2,7 @@
     <TableHeader area ref="TableHeaderRef" showCustomColumn>
         <template #select>
             <el-form-item label="干扰源类型">
-                <el-select v-model="tableStore.table.params.loadType" clearable placeholder="请选择干扰源类型">
+                <el-select v-model="tableStore.table.params.loadType" clearable placeholder="请选择干扰源类型" filterable>
                     <el-option
                         v-for="item in interferenceType"
                         :key="item.id"
diff --git a/src/views/pqs/supervise/interfere/components/normal.vue b/src/views/pqs/supervise/interfere/components/normal.vue
index 9cb28e28..0f49fbfd 100644
--- a/src/views/pqs/supervise/interfere/components/normal.vue
+++ b/src/views/pqs/supervise/interfere/components/normal.vue
@@ -4,7 +4,7 @@
             <TableHeader area ref="TableHeaderRef" showCustomColumn>
                 <template #select>
                     <el-form-item label="干扰源类型">
-                        <el-select v-model="tableStore.table.params.loadType" clearable placeholder="请选择干扰源类型">
+                        <el-select v-model="tableStore.table.params.loadType" clearable placeholder="请选择干扰源类型" filterable>
                             <el-option
                                 v-for="item in interferenceType"
                                 :key="item.id"
@@ -33,6 +33,7 @@
                             v-model="tableStore.table.params.aisFileUpload"
                             clearable
                             placeholder="请选择是否已上传实测"
+                            filterable
                         >
                             <el-option label="否" value="0" />
                             <el-option label="是" value="1" />
diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue
index e0b9ef6d..ed6ff2b1 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue
@@ -20,7 +20,7 @@
         >
             <el-divider content-position="left">干扰源用户基本信息</el-divider>
             <el-form-item label="用户性质：" prop="userType">
-                <el-select v-model="form.userType" placeholder="请选择用户性质" :disabled="openType == 'detail'">
+                <el-select v-model="form.userType" placeholder="请选择用户性质" :disabled="openType == 'detail'" filterable>
                     <el-option
                         v-for="(item, index) in userTypeList"
                         :label="item.label"
@@ -30,7 +30,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="所在地市：" prop="city">
-                <el-select v-model="form.city" clearable placeholder="请选择所在地市" :disabled="openType == 'detail'">
+                <el-select v-model="form.city" clearable placeholder="请选择所在地市" :disabled="openType == 'detail'" filterable>
                     <el-option
                         v-for="item in areaOptionList"
                         :key="item.id"
@@ -56,7 +56,7 @@
                 />
             </el-form-item>
             <el-form-item label="用户状态：" prop="userStatus">
-                <el-select v-model="form.userStatus" placeholder="请选择用户状态" :disabled="openType == 'detail'">
+                <el-select v-model="form.userStatus" placeholder="请选择用户状态" :disabled="openType == 'detail'" filterable>
                     <el-option
                         v-for="(item, index) in userStateList"
                         :label="item.label"
@@ -80,6 +80,7 @@
                     placeholder="请选择电压等级"
                     node-key="id"
                     :disabled="openType == 'detail'"
+                    filterable
                 >
                     <el-option
                         v-for="(item, index) in voltageLevelList"
@@ -97,7 +98,7 @@
                 <el-select
                     v-model="form.evaluationDept"
                     placeholder="请选择预测评估单位"
-                    :disabled="openType == 'detail'"
+                    :disabled="openType == 'detail'" filterable
                 >
                     <el-option
                         v-for="(item, index) in evaluationDeptList"
diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
index ebd339a6..fd26d4e6 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
@@ -6,7 +6,7 @@
           <el-input v-model='tableStore.table.params.projectName' placeholder='请输入项目名称' maxlength="32" show-word-limit clearable></el-input>
         </el-form-item>
         <el-form-item label='所在地市'>
-          <el-select v-model='tableStore.table.params.city' clearable placeholder='请选择所在地市'>
+          <el-select v-model='tableStore.table.params.city' clearable placeholder='请选择所在地市' filterable>
             <el-option
                 v-for='item in areaOptionList'
                 :key='item.id'
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/add.vue b/src/views/pqs/supervise/interfere/components/undocumented/add.vue
index fc8ab7ce..9d3b1f77 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/add.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/add.vue
@@ -1,84 +1,84 @@
-<template>
-    <!-- 新增 -->
-    <el-dialog draggable title="未建档干扰用户新增" v-model="userAdd" width="500px" :before-close="cancel">
-        <el-divider content-position="left" style="font-weight: bolder; font-size: 18px">基本信息</el-divider>
-        <el-form :inline="true" ref="formRef" :model="addData" label-width="auto" class="form-one" :rules="rules">
-            <el-form-item label="区域:">
-                <Area ref="areaRef" v-model="addData.orgNo" />
-            </el-form-item>
-            <el-form-item label="干扰源类型:" prop="loadType">
-                <el-select v-model="addData.loadType" clearable collapse-tags placeholder="请选择">
-                    <el-option
-                        v-for="item in interferenceType"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item label="干扰源用户名称:" prop="userName">
-                <el-input v-model="addData.userName" clearable placeholder="请输入关键字"></el-input>
-            </el-form-item>
-
-            <el-form-item label="建档时间:" prop="recordTime">
-                <el-date-picker
-                    value-format="YYYY-MM-DD hh:mm:ss"
-                    v-model="addData.recordTime"
-                    type="datetime"
-                    placeholder="选择日期时间"
-                ></el-date-picker>
-            </el-form-item>
-        </el-form>
-        <div style="display: flex; justify-content: center; margin-top: 30px">
-            <el-button type="primary" class="ml20" @click="config">确定</el-button>
-            <el-button type="primary" class="ml20" @click="cancel">取消</el-button>
-        </div>
-    </el-dialog>
-</template>
-<script setup lang="ts">
-import { ref, reactive } from 'vue'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage } from 'element-plus'
-import Area from '@/components/form/area/index.vue'
-import { addLoadTypeUser } from '@/api/process-boot/interference'
-const dictData = useDictData()
-const userAdd = ref(false)
-const interferenceType = dictData.getBasicData('Interference_Source')
-const emit = defineEmits(['onSubmit'])
-const rules = reactive({
-    loadType: [{ required: true, message: '请选择干扰源类型', trigger: 'change' }],
-    userName: [{ required: true, message: '请输入干扰源用户名称', trigger: 'blur' }],
-    recordTime: [{ required: true, message: '请选择建档时间', trigger: 'change' }]
-})
-const addData = ref({
-    orgNo: dictData.state.area[0].id,
-    loadType: '',
-    userName: '',
-    recordTime: ''
-})
-const formRef = ref()
-// 新增
-const config = () => {
-    formRef.value.validate((valid: any) => {
-        if (valid) {
-            addLoadTypeUser(addData.value).then((res: any) => {
-                ElMessage.success('新增成功!')
-                emit('onSubmit')
-                cancel()
-            })
-        }
-    })
-}
-// 重置
-const cancel = () => {
-    formRef.value.resetFields()
-    userAdd.value = false
-}
-const open = () => {
-    userAdd.value = true
-}
-
-defineExpose({ open })
-</script>
-<style lang="scss" scoped></style>
+<template>
+    <!-- 新增 -->
+    <el-dialog draggable title="未建档干扰用户新增" v-model="userAdd" width="500px" :before-close="cancel">
+        <el-divider content-position="left" style="font-weight: bolder; font-size: 18px">基本信息</el-divider>
+        <el-form :inline="true" ref="formRef" :model="addData" label-width="auto" class="form-one" :rules="rules">
+            <el-form-item label="区域:">
+                <Area ref="areaRef" v-model="addData.orgNo" />
+            </el-form-item>
+            <el-form-item label="干扰源类型:" prop="loadType">
+                <el-select v-model="addData.loadType" clearable collapse-tags placeholder="请选择" filterable>
+                    <el-option
+                        v-for="item in interferenceType"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="干扰源用户名称:" prop="userName">
+                <el-input v-model="addData.userName" clearable placeholder="请输入关键字"></el-input>
+            </el-form-item>
+
+            <el-form-item label="建档时间:" prop="recordTime">
+                <el-date-picker
+                    value-format="YYYY-MM-DD hh:mm:ss"
+                    v-model="addData.recordTime"
+                    type="datetime"
+                    placeholder="选择日期时间"
+                ></el-date-picker>
+            </el-form-item>
+        </el-form>
+        <div style="display: flex; justify-content: center; margin-top: 30px">
+            <el-button type="primary" class="ml20" @click="config">确定</el-button>
+            <el-button type="primary" class="ml20" @click="cancel">取消</el-button>
+        </div>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import { ElMessage } from 'element-plus'
+import Area from '@/components/form/area/index.vue'
+import { addLoadTypeUser } from '@/api/process-boot/interference'
+const dictData = useDictData()
+const userAdd = ref(false)
+const interferenceType = dictData.getBasicData('Interference_Source')
+const emit = defineEmits(['onSubmit'])
+const rules = reactive({
+    loadType: [{ required: true, message: '请选择干扰源类型', trigger: 'change' }],
+    userName: [{ required: true, message: '请输入干扰源用户名称', trigger: 'blur' }],
+    recordTime: [{ required: true, message: '请选择建档时间', trigger: 'change' }]
+})
+const addData = ref({
+    orgNo: dictData.state.area[0].id,
+    loadType: '',
+    userName: '',
+    recordTime: ''
+})
+const formRef = ref()
+// 新增
+const config = () => {
+    formRef.value.validate((valid: any) => {
+        if (valid) {
+            addLoadTypeUser(addData.value).then((res: any) => {
+                ElMessage.success('新增成功!')
+                emit('onSubmit')
+                cancel()
+            })
+        }
+    })
+}
+// 重置
+const cancel = () => {
+    formRef.value.resetFields()
+    userAdd.value = false
+}
+const open = () => {
+    userAdd.value = true
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
index 4ad31519..1ca9106b 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
@@ -21,13 +21,13 @@
             </el-form-item>
             <el-form-item for="-" label="用户性质：" prop="userType">
                 <!-- :disabled="resendId != '' && title != '编辑'" -->
-                <el-select v-model="form.userType" placeholder="请选择用户性质"  :disabled="resendId !== '' && title !== '用户档案录入'">
+                <el-select v-model="form.userType" placeholder="请选择用户性质"  :disabled="resendId !== '' && title !== '用户档案录入'" filterable>
                     <el-option v-for="(item, index) in userTypeList" :label="item.label" :value="item.value"
                         :key="index" />
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="所在地市：" prop="city">
-                <el-select v-model="form.city" clearable placeholder="请选择所在地市">
+                <el-select v-model="form.city" clearable placeholder="请选择所在地市" filterable>
                     <el-option v-for="item in areaOptionList" :key="item.id" :label="item.name"
                         :value="item.name"></el-option>
                 </el-select>
@@ -39,7 +39,7 @@
                 <el-input v-model="form.projectName" autocomplete="off" placeholder="请输入项目名称" maxlength="32" show-word-limit clearable/>
             </el-form-item>
             <el-form-item for="-" label="用户状态：" prop="userStatus">
-                <el-select v-model="form.userStatus" placeholder="请选择用户状态">
+                <el-select v-model="form.userStatus" placeholder="请选择用户状态" filterable>
                     <el-option v-for="(item, index) in userStateList" :label="item.label" :value="item.value"
                         :disabled="item.disabled" :key="index" />
                 </el-select>
@@ -62,13 +62,13 @@
                     v-model="form.nonlinearDeviceType" :data="nonlinearDeviceTypeList" :render-after-expand="false" />
             </el-form-item>
             <el-form-item for="-" label="电压等级：" prop="voltageLevel">
-                <el-select v-model="form.voltageLevel" placeholder="请选择电压等级" node-key="id">
+                <el-select v-model="form.voltageLevel" placeholder="请选择电压等级" node-key="id" filterable>
                     <el-option v-for="(item, index) in voltageLevelList" :label="item.name" :value="item.id"
                         :key="index" />
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="预测评估单位：" prop="evaluationDept">
-                <el-select v-model="form.evaluationDept" allow-create filterable placeholder="请选择预测评估单位">
+                <el-select v-model="form.evaluationDept" allow-create  placeholder="请选择预测评估单位" filterable>
                     <el-option v-for="(item, index) in evaluationDeptList" :label="item.name" :value="item.name"
                         :key="index" />
                 </el-select>
@@ -86,13 +86,13 @@
                 </el-radio-group>
             </el-form-item>
             <el-form-item label="关联终端" prop="devId" v-if="props.openType != 'create'">
-                <el-select v-model="form.devId" filterable placeholder="请选择关联终端" @change="changeDevId">
+                <el-select v-model="form.devId" filterable placeholder="请选择关联终端" @change="changeDevId" >
                     <el-option v-for="(item, index) in devIdList" :label="item.devName" :value="item.devId"
                         :key="index" />
                 </el-select>
             </el-form-item>
             <el-form-item label="关联监测点" prop="lineId" v-if="props.openType != 'create'">
-                <el-select v-model="form.lineId" placeholder="请选择关联监测点">
+                <el-select v-model="form.lineId" placeholder="请选择关联监测点" filterable>
                     <el-option v-for="(item, index) in lineIdList" :label="item.lineName" :value="item.lineId"
                         :key="index" />
                 </el-select>
@@ -100,7 +100,7 @@
 
             <el-form-item for="-" v-if="form.userType != '0' && form.userType != '1'" label="评估类型："
                 prop="evaluationType">
-                <el-select v-model="form.evaluationType" placeholder="请选择评估类型">
+                <el-select v-model="form.evaluationType" placeholder="请选择评估类型" filterable>
                     <el-option v-for="(item, index) in evaluationTypeList" :key="index" :label="item.name"
                         :value="item.id" />
                 </el-select>
@@ -145,7 +145,7 @@
                 </el-input>
             </el-form-item>
             <el-form-item for="-" v-if="form.userType == '6'" label="行业：" prop="industry">
-                <el-select v-model="form.industry" placeholder="请选择行业">
+                <el-select v-model="form.industry" placeholder="请选择行业" filterable>
                     <el-option v-for="(item, index) in industryList" :label="item.name" :value="item.id" :key="index" />
                 </el-select>
             </el-form-item>
@@ -157,7 +157,7 @@
             </el-form-item>
             <el-form-item for="-" v-if="form.userType == '6'" label="敏感电能质量指标：" prop="energyQualityIndex">
                 <el-select v-model="form.energyQualityIndex" multiple collapse-tags collapse-tags-tooltip
-                    placeholder="请选择敏感电能质量指标">
+                    placeholder="请选择敏感电能质量指标" filterable>
                     <el-option v-for="(item, index) in energyQualityIndexList" :label="item.name" :value="item.id"
                         :key="index" />
                 </el-select>
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/audit.vue b/src/views/pqs/supervise/interfere/components/undocumented/audit.vue
index dd30d1cf..5ab26efe 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/audit.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/audit.vue
@@ -14,7 +14,7 @@
                 <Area v-model="addForm.orgNo" disabled />
             </el-form-item>
             <el-form-item label="干扰源类型:">
-                <el-select v-model="addForm.loadType" clearable collapse-tags placeholder="请选择" disabled>
+                <el-select v-model="addForm.loadType" clearable collapse-tags placeholder="请选择" disabled filterable>
                     <el-option
                         v-for="item in interferenceType"
                         :key="item.id"
@@ -72,7 +72,7 @@
             </el-form-item>
             <br v-if="show" />
             <el-form-item label="计划采取措施:" style="margin-top: 10px" prop="IPlanStep" v-if="show">
-                <el-select v-model="addForm.IPlanStep" placeholder="请选择">
+                <el-select v-model="addForm.IPlanStep" placeholder="请选择" filterable>
                     <el-option
                         v-for="item in takeMeasures"
                         :key="item.id"
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
index bbb80dd8..ddb349e7 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
@@ -5,7 +5,7 @@
                 <el-input v-model="tableStore.table.params.projectName" placeholder="请输入项目名称" maxlength="32" show-word-limit clearable></el-input>
             </el-form-item>
             <el-form-item label="所在地市">
-                <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
+                <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市" filterable>
                     <el-option
                         v-for="item in areaOptionList"
                         :key="item.id"
@@ -16,7 +16,7 @@
             </el-form-item>
 
             <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态" filterable>
                     <el-option
                         v-for="item in statusSelect"
                         :key="item.id"
diff --git a/src/views/pqs/supervise/plan/components/addForm.vue b/src/views/pqs/supervise/plan/components/addForm.vue
index f712fd7f..491dc995 100644
--- a/src/views/pqs/supervise/plan/components/addForm.vue
+++ b/src/views/pqs/supervise/plan/components/addForm.vue
@@ -1,699 +1,701 @@
-<template>
-    <el-dialog
-        v-model="dialogFormVisible"
-        :title="title"
-        width="65%"
-        :append-to-body="true"
-        :before-close="close"
-        :close-on-click-modal="false"
-        :lazy="true"
-        draggable
-        custom-class="fixed-dialog"
-    >
-        <el-form
-            :model="form"
-            :validate-on-rule-change="false"
-            :scroll-to-error="true"
-            :rules="rules"
-            ref="ruleFormRef"
-            label-width="auto"
-            class="form-two"
-        >
-            <el-form-item for="-" label="计划名称：" prop="workPlanName">
-                <el-input v-model="form.workPlanName" autocomplete="off" placeholder="请输入计划名称" />
-            </el-form-item>
-            <el-form-item for="-" label="监督单位：" prop="supvOrgId">
-                <Area ref="areaRef" v-model="form.supvOrgId" />
-            </el-form-item>
-            <el-form-item for="-" label="计划编制单位：" prop="planOrgId">
-                <Area ref="areaRef" v-model="form.planOrgId" />
-            </el-form-item>
-            <el-form-item for="-" label="监督类型：" prop="supvType">
-                <el-select v-model="form.supvType" clearable style="width: 100%" placeholder="请选择监督类型">
-                    <el-option
-                        v-for="item in supvTypeList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item for="-" label="监督阶段：" prop="supvStage">
-                <el-select v-model="form.supvStage" clearable style="width: 100%" placeholder="请选择监督阶段">
-                    <el-option
-                        v-for="item in supvStageList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item for="-" label="计划监督时间：" prop="planSupvDate">
-                <el-date-picker
-                    style="width: 100%"
-                    v-model="form.planSupvDate"
-                    type="datetime"
-                    format="YYYY-MM-DD hh:mm:ss"
-                    value-format="YYYY-MM-DD hh:mm:ss"
-                    placeholder="请选择计划监督时间"
-                />
-            </el-form-item>
-            <el-form-item for="-" label="监督对象类型：" prop="supvObjType">
-                <el-select v-model="form.supvObjType" clearable style="width: 100%" placeholder="请选择监督对象类型">
-                    <el-option
-                        v-for="item in supvObjTypeList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item for="-" label="监督对象名称：" prop="supvObjName">
-                <el-input v-model="form.supvObjName" autocomplete="off" placeholder="请输入监督对象名称" />
-            </el-form-item>
-            <el-form-item for="-" label="监督对象电压等级：" prop="objVoltageLevel">
-                <el-select
-                    v-model="form.objVoltageLevel"
-                    clearable
-                    style="width: 100%"
-                    placeholder="请选择监督对象电压等级"
-                >
-                    <el-option
-                        v-for="item in voltageLevelList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item for="-" label="监督对象属性：" prop="objType">
-                <el-select v-model="form.objType" clearable style="width: 100%" placeholder="请选择监督对象属性">
-                    <el-option
-                        v-for="item in objTypeList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item for="-" label="监督对象属性名称：" prop="objTypeName">
-                <el-input v-model="form.objTypeName" autocomplete="off" placeholder="请输入监督对象属性名称" />
-            </el-form-item>
-            <el-form-item for="-" label="监督对象协议容量：" prop="objCapacity">
-                <el-input
-                    oninput="value=value.replace(/[^0-9.]/g,'')"
-                    v-model="form.objCapacity"
-                    autocomplete="off"
-                    placeholder="请输入监督对象监督对象协议容量"
-                >
-                    <template #append>MVA</template>
-                </el-input>
-            </el-form-item>
-            <el-form-item for="-" label="监督对象关联电站：" prop="substationName">
-                <el-input v-model="form.substationName" autocomplete="off" placeholder="请输入监督对象关联电站" />
-            </el-form-item>
-            <el-form-item for="-" label="监督对象关联电站电压等级：" prop="substationVoltageLevel">
-                <el-select
-                    v-model="form.substationVoltageLevel"
-                    clearable
-                    style="width: 100%"
-                    placeholder="请选择监督对象关联电站电压等级"
-                >
-                    <el-option
-                        v-for="item in voltageLevelList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item for="-" label="实施状态：" prop="effectStatus">
-                <el-select v-model="form.effectStatus" clearable style="width: 100%" placeholder="请选择实施状态">
-                    <el-option
-                        v-for="item in effectStatusList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item for="-" label="实施人员：">
-                <el-select v-model="form.effectUserId" clearable style="width: 100%" placeholder="请选择实施人员">
-                    <el-option
-                        v-for="item in effectUserIdList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item for="-" label="开始实施时间：">
-                <el-date-picker
-                    style="width: 100%"
-                    v-model="form.effectStartTime"
-                    type="datetime"
-                    format="YYYY-MM-DD hh:mm:ss"
-                    value-format="YYYY-MM-DD hh:mm:ss"
-                    placeholder="请选择开始实施时间"
-                />
-            </el-form-item>
-            <el-form-item for="-" label="结束实施时间：">
-                <el-date-picker
-                    style="width: 100%"
-                    v-model="form.effectEndTime"
-                    type="datetime"
-                    format="YYYY-MM-DD hh:mm:ss"
-                    value-format="YYYY-MM-DD hh:mm:ss"
-                    placeholder="请选择结束实施时间"
-                />
-            </el-form-item>
-            <el-form-item for="-" label="报告出具时间：">
-                <el-date-picker
-                    style="width: 100%"
-                    v-model="form.reportIssueTime"
-                    type="datetime"
-                    format="YYYY-MM-DD hh:mm:ss"
-                    value-format="YYYY-MM-DD hh:mm:ss"
-                    placeholder="请选择报告出具时间"
-                />
-            </el-form-item>
-            <el-form-item for="-" label="电能质量问题发生时间：">
-                <el-date-picker
-                    style="width: 100%"
-                    v-model="form.problemOcTime"
-                    type="datetime"
-                    format="YYYY-MM-DD hh:mm:ss"
-                    value-format="YYYY-MM-DD hh:mm:ss"
-                    placeholder="请选择电能质量问题发生时间"
-                />
-            </el-form-item>
-            <el-form-item for="-" label="计划状态：">
-                <el-select v-model="form.planStatus" clearable style="width: 100%" placeholder="请选择计划状态">
-                    <el-option
-                        v-for="item in planStatusList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item for="-" label="其他要求：" style="width: 100%">
-                <el-input
-                    type="textarea"
-                    v-model="form.otherRemark"
-                    autocomplete="off"
-                    placeholder="请输入其他要求"
-                    style="width: 100%"
-                />
-            </el-form-item>
-            <el-form-item
-                for="-"
-                v-if="false"
-                label="盖章报告："
-                class="uploadFile"
-                prop="informationSecurityTestReport"
-            >
-                <el-upload
-                    v-model:file-list="form.informationSecurityTestReport"
-                    ref="uploadRef"
-                    action=""
-                    :accept="acceptType"
-                    :limit="1"
-                    :on-exceed="handleExceed"
-                    :on-change="choose"
-                    :auto-upload="false"
-                    :on-progress="uploadFileName('informationSecurityTestReport')"
-                >
-                    <template #trigger>
-                        <el-button type="primary">上传文件</el-button>
-                    </template>
-                </el-upload>
-            </el-form-item>
-            <el-form-item
-                for="-"
-                v-if="false"
-                label="佐证材料："
-                class="uploadFile"
-                prop="acceptanceInspectionReportSingle"
-            >
-                <el-upload
-                    v-model:file-list="form.acceptanceInspectionReportSingle"
-                    ref="uploadRef"
-                    action=""
-                    :accept="acceptType"
-                    :limit="1"
-                    :on-exceed="handleExceed"
-                    :on-change="choose"
-                    :auto-upload="false"
-                    :on-progress="uploadFileName('acceptanceInspectionReportSingle')"
-                >
-                    <template #trigger>
-                        <el-button type="primary">上传文件</el-button>
-                    </template>
-                </el-upload>
-            </el-form-item>
-            <el-form-item
-                for="-"
-                v-if="false"
-                label="计划变更材料："
-                class="uploadFile"
-                prop="acceptanceInspectionReport"
-            >
-                <el-upload
-                    v-model:file-list="form.acceptanceInspectionReport"
-                    ref="uploadRef"
-                    action=""
-                    :accept="acceptType"
-                    :limit="1"
-                    :on-exceed="handleExceed"
-                    :on-change="choose"
-                    :auto-upload="false"
-                    :on-progress="uploadFileName('acceptanceInspectionReport')"
-                >
-                    <template #trigger>
-                        <el-button type="primary">上传文件</el-button>
-                    </template>
-                </el-upload>
-            </el-form-item>
-            <el-form-item
-                for="-"
-                v-if="false"
-                label="告预警单材料："
-                class="uploadFile"
-                prop="typeExperimentReport"
-                :show-message="false"
-            >
-                <el-upload
-                    v-model:file-list="form.typeExperimentReport"
-                    ref="uploadRef"
-                    action=""
-                    :accept="acceptType"
-                    :limit="1"
-                    :on-exceed="handleExceed"
-                    :on-change="choose"
-                    :auto-upload="false"
-                    :on-progress="uploadFileName('typeExperimentReport')"
-                >
-                    <template #trigger>
-                        <el-button type="primary">上传文件</el-button>
-                    </template>
-                </el-upload>
-            </el-form-item>
-            <el-form-item
-                for="-"
-                v-if="false"
-                label="告预警单反馈材料："
-                class="uploadFile"
-                prop="factoryInspectionReport"
-            >
-                <el-upload
-                    v-model:file-list="form.factoryInspectionReport"
-                    ref="uploadRef"
-                    action=""
-                    :accept="acceptType"
-                    :limit="1"
-                    :on-exceed="handleExceed"
-                    :on-change="choose"
-                    :auto-upload="false"
-                    :on-progress="uploadFileName('factoryInspectionReport')"
-                >
-                    <template #trigger>
-                        <el-button type="primary">上传文件</el-button>
-                    </template>
-                </el-upload>
-            </el-form-item>
-            <el-form-item
-                for="-"
-                v-if="false"
-                label="评估报告："
-                class="uploadFile"
-                prop="performanceTestReport"
-                :show-message="false"
-            >
-                <el-upload
-                    v-model:file-list="form.performanceTestReport"
-                    ref="uploadRef"
-                    action=""
-                    :accept="acceptType"
-                    :limit="1"
-                    :on-exceed="handleExceed"
-                    :on-change="choose"
-                    :auto-upload="false"
-                    :on-progress="uploadFileName('performanceTestReport')"
-                >
-                    <template #trigger>
-                        <el-button type="primary">上传文件</el-button>
-                    </template>
-                </el-upload>
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="close()">取消</el-button>
-                <el-button type="primary" @click="confirmForm()">确定</el-button>
-            </div>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, onMounted, defineExpose, defineEmits, watch } from 'vue'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { genFileId, ElMessage } from 'element-plus'
-import { useDictData } from '@/stores/dictData'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { uploadFile } from '@/api/system-boot/file'
-import {
-    addPlanFormData,
-    getUserByDeptId,
-    getPlanDetailsById,
-    updatePlanFormData
-} from '@/api/supervision-boot/plan/index'
-import Area from '@/components/form/area/index.vue'
-const emits = defineEmits(['onSubmit'])
-const dictData = useDictData()
-const dialogFormVisible = ref(false)
-const form: any = ref({})
-const title = ref('')
-const ruleFormRef = ref(null)
-// .xls,.xlsx
-const acceptType = ''
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-//字典获取监督类型
-const supvTypeList = dictData.getBasicData('supv_type')
-//字典获取监督阶段
-const supvStageList = dictData.getBasicData('supv_stage')
-//字典获取监督对象类型
-const supvObjTypeList = dictData.getBasicData('supv_obj_type')
-//字典获取实施状态
-const effectStatusList = dictData.getBasicData('effect_status')
-//字典获取计划状态
-const planStatusList = dictData.getBasicData('plan_status')
-//字典获取电压等级
-const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
-//监督对象属性
-const objTypeList = [
-    {
-        id: '1',
-        name: '在运站'
-    },
-    {
-        id: '2',
-        name: '新（改、扩）建站'
-    }
-]
-const effectUserIdList: any = ref([])
-//根据当前登陆用户的部门id查询实施人员
-const getEffectUserList = () => {
-    getUserByDeptId({ deptId: adminInfo.$state.deptId }).then(res => {
-        effectUserIdList.value = res.data
-    })
-}
-getEffectUserList()
-const resetForm = () => {
-    form.value = {
-        workPlanName: '', //计划名称
-        supvOrgId: '', //监督单位
-        planOrgId: '', //计划编制单位
-        supvType: supvTypeList[0].id, //监督类型
-        supvStage: supvStageList[0]?.id, //监督阶段
-        planSupvDate: '', //计划监督时间
-        supvObjType: supvObjTypeList[0]?.id, //监督对象类型
-        supvObjName: '', //监督对象名称
-        objVoltageLevel: voltageLevelList[0].id, //	监督对象电压等级
-        objType: objTypeList[0].id, //监督对象属性
-        objTypeName: '', //监督对象属性名称
-        objCapacity: '0', //监督对象协议容量
-        substationName: '', //监督对象关联电站
-        substationVoltageLevel: voltageLevelList[0].id, //	监督对象关联电站电压等级
-        effectStatus: effectStatusList[0].id, //实施状态
-        effectStartTime: '', //开始实施时间
-        effectEndTime: '', //结束实施时间
-        reportIssueTime: '', //报告出具时间
-        problemOcTime: '', //电能质量问题发生时间
-        effectUserId: effectUserIdList.value[0]?.id, //实施人员
-        planStatus: planStatusList[0].id, //计划状态
-        otherRemark: '', //其他要求
-        planUserId: '' //计划编制人,挡墙登陆用户
-        // sealReport: '', //盖章报告
-        // evidenceMaterials:'', //佐证材料
-        // planChangeMaterials: '', //计划变更材料
-        // alarmMaterials:'', //告预警单材料
-        // alarmFeedbackMaterials: '', //告预警单反馈材料
-        // assessReport:'' //评估报告
-    }
-}
-//初始化数据
-resetForm()
-//定义校验规则
-const rules = ref({
-    //基础信息
-    workPlanName: [
-        {
-            required: true,
-            message: '请输入计划名称',
-            trigger: 'blur'
-        }
-    ],
-    supvOrgId: [
-        {
-            required: true,
-            message: '请选择监督单位',
-            trigger: 'change'
-        }
-    ],
-    planOrgId: [
-        {
-            required: true,
-            message: '请选择计划编制单位',
-            trigger: 'change'
-        }
-    ],
-    supvType: [
-        {
-            required: true,
-            message: '请选择监督类型',
-            trigger: 'change'
-        }
-    ],
-    supvStage: [
-        {
-            required: true,
-            message: '请选择监督阶段',
-            trigger: 'change'
-        }
-    ],
-    planSupvDate: [
-        {
-            required: true,
-            message: '请选择计划监督时间',
-            trigger: 'change'
-        }
-    ],
-    supvObjType: [
-        {
-            required: true,
-            message: '请选择监督对象类型',
-            trigger: 'change'
-        }
-    ],
-    supvObjName: [
-        {
-            required: true,
-            message: '请输入监督对象名称',
-            trigger: 'blur'
-        }
-    ],
-    objVoltageLevel: [
-        {
-            required: true,
-            message: '请选择监督对象电压等级',
-            trigger: 'change'
-        }
-    ],
-    objType: [
-        {
-            required: true,
-            message: '请选择监督对象属性',
-            trigger: 'change'
-        }
-    ],
-    objTypeName: [
-        {
-            required: false,
-            message: '请输入监督对象属性名称',
-            trigger: 'blur'
-        }
-    ],
-    objCapacity: [
-        {
-            required: true,
-            message: '请输入监督对象监督对象协议容量',
-            trigger: 'blur'
-        }
-    ],
-    substationName: [
-        {
-            required: true,
-            message: '请输入监督对象关联电站',
-            trigger: 'blur'
-        }
-    ],
-    substationVoltageLevel: [
-        {
-            required: true,
-            message: '请选择监督对象关联电站电压等级',
-            trigger: 'change'
-        }
-    ],
-    effectStatus: [
-        {
-            required: true,
-            message: '请选择实施状态',
-            trigger: 'change'
-        }
-    ]
-})
-watch(
-    () => form.value,
-    (val, oldVal) => {},
-    {
-        deep: true,
-        immediate: true
-    }
-)
-const resendId = ref('')
-const open = (row: any) => {
-    title.value = row.title
-    dialogFormVisible.value = true
-    if (row.row) {
-        resendId.value = row.row.planId
-        getPlanDetailsById({ id: row.row.planId }).then(res => {
-            form.value = res.data
-        })
-    } else {
-        resendId.value = ''
-    }
-}
-const close = () => {
-    //重置表单内容
-    //取消表单校验状态
-    ruleFormRef.value && ruleFormRef.value.resetFields()
-    dialogFormVisible.value = false
-    emits('onSubmit')
-    resetForm()
-}
-onMounted(() => {
-    console.log()
-})
-// 上传报告
-const uploadRef = ref()
-const handleExceed: UploadProps['onExceed'] = files => {
-    uploadRef.value!.clearFiles()
-    const file = files[0] as UploadRawFile
-    file.uid = genFileId()
-    uploadRef.value!.handleStart(file)
-}
-let uploadName = ref('')
-//上传报告改变
-const uploadFileName = val => {
-    uploadName.value = val
-}
-// 盖章报告
-const sealReport = ref('')
-// 佐证材料
-const evidenceMaterials = ref('')
-// 计划变更材料
-const planChangeMaterials = ref('')
-//告预警单材料
-const alarmMaterials = ref('')
-//告预警单反馈材料
-const alarmFeedbackMaterials = ref('')
-//评估报告
-const assessReport = ref('')
-const choose = (e: any) => {
-    uploadFile(e.raw, '/supervision/').then(res => {
-        //盖章报告
-        if (uploadName.value == 'sealReport') {
-            sealReport.value = res.data.name
-        }
-        //佐证材料
-        else if (uploadName.value == 'evidenceMaterials') {
-            evidenceMaterials.value = res.data.name
-        }
-        //计划变更材料
-        else if (uploadName.value == 'planChangeMaterials') {
-            planChangeMaterials.value = res.data.name
-        }
-        //告预警单材料
-        else if (uploadName.value == 'alarmMaterials') {
-            alarmMaterials.value = res.data.name
-        }
-        //告预警单反馈材料
-        else if (uploadName.value == 'alarmFeedbackMaterials') {
-            alarmFeedbackMaterials.value = res.data.name
-        }
-        //评估报告
-        else if (uploadName.value == 'assessReport') {
-            assessReport.value = res.data.name
-        }
-    })
-}
-//设置监督类型时间选择范围不能<今天
-const disabledDate = time => {
-    return time.getTime() < Date.now() - 8.64e7 // 8.64e7 毫秒数代表一天
-}
-//提交
-const confirmForm = () => {
-    // 提交终端信息
-    ruleFormRef.value.validate(valid => {
-        if (valid) {
-            form.value.planUserId = adminInfo.$state.id
-            let confirmFormData = JSON.parse(JSON.stringify(form.value))
-            //提交终端信息
-            // confirmFormData = {
-            //     ...confirmFormData,
-            //     sealReport: sealReport?.value, //盖章报告
-            //     evidenceMaterials: evidenceMaterials.value, //佐证材料
-            //     planChangeMaterials: planChangeMaterials.value, //计划变更材料
-            //     alarmMaterials: alarmMaterials.value, //告预警单材料
-            //     alarmFeedbackMaterials: alarmFeedbackMaterials.value, //告预警单反馈材料
-            //     assessReport: assessReport.value //评估报告
-            // }
-            if (title.value == '技术监督计划') {
-                addPlanFormData(confirmFormData).then(res => {
-                    if (res.code == 'A0000') {
-                        ElMessage({
-                            message: '新建技术监督计划成功',
-                            type: 'success'
-                        })
-                        ruleFormRef.value.resetFields()
-                        resetForm()
-                        close()
-                    }
-                })
-            } else {
-                console.log(confirmFormData)
-                confirmFormData.id = resendId.value
-                confirmFormData.planSupvDate = confirmFormData.planSupvDate.replace('T', ' ')
-                updatePlanFormData(confirmFormData).then(res => {
-                    if (res.code == 'A0000') {
-                        ElMessage({
-                            message: '重新发起成功',
-                            type: 'success'
-                        })
-                        ruleFormRef.value.resetFields()
-                        resetForm()
-                        close()
-                    }
-                })
-            }
-        } else {
-            console.log('表单验证失败')
-            return false
-        }
-    })
-}
-defineExpose({ open })
-</script>
-<style lang="scss" scoped></style>
+<template>
+    <el-dialog
+        v-model="dialogFormVisible"
+        :title="title"
+        width="65%"
+        :append-to-body="true"
+        :before-close="close"
+        :close-on-click-modal="false"
+        :lazy="true"
+        draggable
+        custom-class="fixed-dialog"
+    >
+        <el-form
+            :model="form"
+            :validate-on-rule-change="false"
+            :scroll-to-error="true"
+            :rules="rules"
+            ref="ruleFormRef"
+            label-width="auto"
+            class="form-two"
+        >
+            <el-form-item for="-" label="计划名称：" prop="workPlanName">
+                <el-input v-model="form.workPlanName" autocomplete="off" placeholder="请输入计划名称" />
+            </el-form-item>
+            <el-form-item for="-" label="监督单位：" prop="supvOrgId">
+                <Area ref="areaRef" v-model="form.supvOrgId" />
+            </el-form-item>
+            <el-form-item for="-" label="计划编制单位：" prop="planOrgId">
+                <Area ref="areaRef" v-model="form.planOrgId" />
+            </el-form-item>
+            <el-form-item for="-" label="监督类型：" prop="supvType">
+                <el-select v-model="form.supvType" clearable style="width: 100%" placeholder="请选择监督类型" filterable>
+                    <el-option
+                        v-for="item in supvTypeList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item for="-" label="监督阶段：" prop="supvStage">
+                <el-select v-model="form.supvStage" clearable style="width: 100%" placeholder="请选择监督阶段" filterable>
+                    <el-option
+                        v-for="item in supvStageList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item for="-" label="计划监督时间：" prop="planSupvDate">
+                <el-date-picker
+                    style="width: 100%"
+                    v-model="form.planSupvDate"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm:ss"
+                    value-format="YYYY-MM-DD hh:mm:ss"
+                    placeholder="请选择计划监督时间"
+                />
+            </el-form-item>
+            <el-form-item for="-" label="监督对象类型：" prop="supvObjType">
+                <el-select v-model="form.supvObjType" clearable style="width: 100%" placeholder="请选择监督对象类型" filterable>
+                    <el-option
+                        v-for="item in supvObjTypeList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item for="-" label="监督对象名称：" prop="supvObjName">
+                <el-input v-model="form.supvObjName" autocomplete="off" placeholder="请输入监督对象名称" />
+            </el-form-item>
+            <el-form-item for="-" label="监督对象电压等级：" prop="objVoltageLevel">
+                <el-select
+                    v-model="form.objVoltageLevel"
+                    clearable
+                    style="width: 100%"
+                    placeholder="请选择监督对象电压等级"
+                    filterable
+                >
+                    <el-option
+                        v-for="item in voltageLevelList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item for="-" label="监督对象属性：" prop="objType">
+                <el-select v-model="form.objType" clearable style="width: 100%" placeholder="请选择监督对象属性" filterable>
+                    <el-option
+                        v-for="item in objTypeList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item for="-" label="监督对象属性名称：" prop="objTypeName">
+                <el-input v-model="form.objTypeName" autocomplete="off" placeholder="请输入监督对象属性名称" />
+            </el-form-item>
+            <el-form-item for="-" label="监督对象协议容量：" prop="objCapacity">
+                <el-input
+                    oninput="value=value.replace(/[^0-9.]/g,'')"
+                    v-model="form.objCapacity"
+                    autocomplete="off"
+                    placeholder="请输入监督对象监督对象协议容量"
+                >
+                    <template #append>MVA</template>
+                </el-input>
+            </el-form-item>
+            <el-form-item for="-" label="监督对象关联电站：" prop="substationName">
+                <el-input v-model="form.substationName" autocomplete="off" placeholder="请输入监督对象关联电站" />
+            </el-form-item>
+            <el-form-item for="-" label="监督对象关联电站电压等级：" prop="substationVoltageLevel">
+                <el-select
+                    v-model="form.substationVoltageLevel"
+                    clearable
+                    style="width: 100%"
+                    placeholder="请选择监督对象关联电站电压等级"
+                    filterable
+                >
+                    <el-option
+                        v-for="item in voltageLevelList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item for="-" label="实施状态：" prop="effectStatus">
+                <el-select v-model="form.effectStatus" clearable style="width: 100%" placeholder="请选择实施状态" filterable>
+                    <el-option
+                        v-for="item in effectStatusList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item for="-" label="实施人员：">
+                <el-select v-model="form.effectUserId" clearable style="width: 100%" placeholder="请选择实施人员" filterable>
+                    <el-option
+                        v-for="item in effectUserIdList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item for="-" label="开始实施时间：">
+                <el-date-picker
+                    style="width: 100%"
+                    v-model="form.effectStartTime"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm:ss"
+                    value-format="YYYY-MM-DD hh:mm:ss"
+                    placeholder="请选择开始实施时间"
+                />
+            </el-form-item>
+            <el-form-item for="-" label="结束实施时间：">
+                <el-date-picker
+                    style="width: 100%"
+                    v-model="form.effectEndTime"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm:ss"
+                    value-format="YYYY-MM-DD hh:mm:ss"
+                    placeholder="请选择结束实施时间"
+                />
+            </el-form-item>
+            <el-form-item for="-" label="报告出具时间：">
+                <el-date-picker
+                    style="width: 100%"
+                    v-model="form.reportIssueTime"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm:ss"
+                    value-format="YYYY-MM-DD hh:mm:ss"
+                    placeholder="请选择报告出具时间"
+                />
+            </el-form-item>
+            <el-form-item for="-" label="电能质量问题发生时间：">
+                <el-date-picker
+                    style="width: 100%"
+                    v-model="form.problemOcTime"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm:ss"
+                    value-format="YYYY-MM-DD hh:mm:ss"
+                    placeholder="请选择电能质量问题发生时间"
+                />
+            </el-form-item>
+            <el-form-item for="-" label="计划状态：">
+                <el-select v-model="form.planStatus" clearable style="width: 100%" placeholder="请选择计划状态" filterable  >
+                    <el-option
+                        v-for="item in planStatusList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item for="-" label="其他要求：" style="width: 100%">
+                <el-input
+                    type="textarea"
+                    v-model="form.otherRemark"
+                    autocomplete="off"
+                    placeholder="请输入其他要求"
+                    style="width: 100%"
+                />
+            </el-form-item>
+            <el-form-item
+                for="-"
+                v-if="false"
+                label="盖章报告："
+                class="uploadFile"
+                prop="informationSecurityTestReport"
+            >
+                <el-upload
+                    v-model:file-list="form.informationSecurityTestReport"
+                    ref="uploadRef"
+                    action=""
+                    :accept="acceptType"
+                    :limit="1"
+                    :on-exceed="handleExceed"
+                    :on-change="choose"
+                    :auto-upload="false"
+                    :on-progress="uploadFileName('informationSecurityTestReport')"
+                >
+                    <template #trigger>
+                        <el-button type="primary">上传文件</el-button>
+                    </template>
+                </el-upload>
+            </el-form-item>
+            <el-form-item
+                for="-"
+                v-if="false"
+                label="佐证材料："
+                class="uploadFile"
+                prop="acceptanceInspectionReportSingle"
+            >
+                <el-upload
+                    v-model:file-list="form.acceptanceInspectionReportSingle"
+                    ref="uploadRef"
+                    action=""
+                    :accept="acceptType"
+                    :limit="1"
+                    :on-exceed="handleExceed"
+                    :on-change="choose"
+                    :auto-upload="false"
+                    :on-progress="uploadFileName('acceptanceInspectionReportSingle')"
+                >
+                    <template #trigger>
+                        <el-button type="primary">上传文件</el-button>
+                    </template>
+                </el-upload>
+            </el-form-item>
+            <el-form-item
+                for="-"
+                v-if="false"
+                label="计划变更材料："
+                class="uploadFile"
+                prop="acceptanceInspectionReport"
+            >
+                <el-upload
+                    v-model:file-list="form.acceptanceInspectionReport"
+                    ref="uploadRef"
+                    action=""
+                    :accept="acceptType"
+                    :limit="1"
+                    :on-exceed="handleExceed"
+                    :on-change="choose"
+                    :auto-upload="false"
+                    :on-progress="uploadFileName('acceptanceInspectionReport')"
+                >
+                    <template #trigger>
+                        <el-button type="primary">上传文件</el-button>
+                    </template>
+                </el-upload>
+            </el-form-item>
+            <el-form-item
+                for="-"
+                v-if="false"
+                label="告预警单材料："
+                class="uploadFile"
+                prop="typeExperimentReport"
+                :show-message="false"
+            >
+                <el-upload
+                    v-model:file-list="form.typeExperimentReport"
+                    ref="uploadRef"
+                    action=""
+                    :accept="acceptType"
+                    :limit="1"
+                    :on-exceed="handleExceed"
+                    :on-change="choose"
+                    :auto-upload="false"
+                    :on-progress="uploadFileName('typeExperimentReport')"
+                >
+                    <template #trigger>
+                        <el-button type="primary">上传文件</el-button>
+                    </template>
+                </el-upload>
+            </el-form-item>
+            <el-form-item
+                for="-"
+                v-if="false"
+                label="告预警单反馈材料："
+                class="uploadFile"
+                prop="factoryInspectionReport"
+            >
+                <el-upload
+                    v-model:file-list="form.factoryInspectionReport"
+                    ref="uploadRef"
+                    action=""
+                    :accept="acceptType"
+                    :limit="1"
+                    :on-exceed="handleExceed"
+                    :on-change="choose"
+                    :auto-upload="false"
+                    :on-progress="uploadFileName('factoryInspectionReport')"
+                >
+                    <template #trigger>
+                        <el-button type="primary">上传文件</el-button>
+                    </template>
+                </el-upload>
+            </el-form-item>
+            <el-form-item
+                for="-"
+                v-if="false"
+                label="评估报告："
+                class="uploadFile"
+                prop="performanceTestReport"
+                :show-message="false"
+            >
+                <el-upload
+                    v-model:file-list="form.performanceTestReport"
+                    ref="uploadRef"
+                    action=""
+                    :accept="acceptType"
+                    :limit="1"
+                    :on-exceed="handleExceed"
+                    :on-change="choose"
+                    :auto-upload="false"
+                    :on-progress="uploadFileName('performanceTestReport')"
+                >
+                    <template #trigger>
+                        <el-button type="primary">上传文件</el-button>
+                    </template>
+                </el-upload>
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button @click="close()">取消</el-button>
+                <el-button type="primary" @click="confirmForm()">确定</el-button>
+            </div>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted, defineExpose, defineEmits, watch } from 'vue'
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { genFileId, ElMessage } from 'element-plus'
+import { useDictData } from '@/stores/dictData'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { uploadFile } from '@/api/system-boot/file'
+import {
+    addPlanFormData,
+    getUserByDeptId,
+    getPlanDetailsById,
+    updatePlanFormData
+} from '@/api/supervision-boot/plan/index'
+import Area from '@/components/form/area/index.vue'
+const emits = defineEmits(['onSubmit'])
+const dictData = useDictData()
+const dialogFormVisible = ref(false)
+const form: any = ref({})
+const title = ref('')
+const ruleFormRef = ref(null)
+// .xls,.xlsx
+const acceptType = ''
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+//字典获取监督类型
+const supvTypeList = dictData.getBasicData('supv_type')
+//字典获取监督阶段
+const supvStageList = dictData.getBasicData('supv_stage')
+//字典获取监督对象类型
+const supvObjTypeList = dictData.getBasicData('supv_obj_type')
+//字典获取实施状态
+const effectStatusList = dictData.getBasicData('effect_status')
+//字典获取计划状态
+const planStatusList = dictData.getBasicData('plan_status')
+//字典获取电压等级
+const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
+//监督对象属性
+const objTypeList = [
+    {
+        id: '1',
+        name: '在运站'
+    },
+    {
+        id: '2',
+        name: '新（改、扩）建站'
+    }
+]
+const effectUserIdList: any = ref([])
+//根据当前登陆用户的部门id查询实施人员
+const getEffectUserList = () => {
+    getUserByDeptId({ deptId: adminInfo.$state.deptId }).then(res => {
+        effectUserIdList.value = res.data
+    })
+}
+getEffectUserList()
+const resetForm = () => {
+    form.value = {
+        workPlanName: '', //计划名称
+        supvOrgId: '', //监督单位
+        planOrgId: '', //计划编制单位
+        supvType: supvTypeList[0].id, //监督类型
+        supvStage: supvStageList[0]?.id, //监督阶段
+        planSupvDate: '', //计划监督时间
+        supvObjType: supvObjTypeList[0]?.id, //监督对象类型
+        supvObjName: '', //监督对象名称
+        objVoltageLevel: voltageLevelList[0].id, //	监督对象电压等级
+        objType: objTypeList[0].id, //监督对象属性
+        objTypeName: '', //监督对象属性名称
+        objCapacity: '0', //监督对象协议容量
+        substationName: '', //监督对象关联电站
+        substationVoltageLevel: voltageLevelList[0].id, //	监督对象关联电站电压等级
+        effectStatus: effectStatusList[0].id, //实施状态
+        effectStartTime: '', //开始实施时间
+        effectEndTime: '', //结束实施时间
+        reportIssueTime: '', //报告出具时间
+        problemOcTime: '', //电能质量问题发生时间
+        effectUserId: effectUserIdList.value[0]?.id, //实施人员
+        planStatus: planStatusList[0].id, //计划状态
+        otherRemark: '', //其他要求
+        planUserId: '' //计划编制人,挡墙登陆用户
+        // sealReport: '', //盖章报告
+        // evidenceMaterials:'', //佐证材料
+        // planChangeMaterials: '', //计划变更材料
+        // alarmMaterials:'', //告预警单材料
+        // alarmFeedbackMaterials: '', //告预警单反馈材料
+        // assessReport:'' //评估报告
+    }
+}
+//初始化数据
+resetForm()
+//定义校验规则
+const rules = ref({
+    //基础信息
+    workPlanName: [
+        {
+            required: true,
+            message: '请输入计划名称',
+            trigger: 'blur'
+        }
+    ],
+    supvOrgId: [
+        {
+            required: true,
+            message: '请选择监督单位',
+            trigger: 'change'
+        }
+    ],
+    planOrgId: [
+        {
+            required: true,
+            message: '请选择计划编制单位',
+            trigger: 'change'
+        }
+    ],
+    supvType: [
+        {
+            required: true,
+            message: '请选择监督类型',
+            trigger: 'change'
+        }
+    ],
+    supvStage: [
+        {
+            required: true,
+            message: '请选择监督阶段',
+            trigger: 'change'
+        }
+    ],
+    planSupvDate: [
+        {
+            required: true,
+            message: '请选择计划监督时间',
+            trigger: 'change'
+        }
+    ],
+    supvObjType: [
+        {
+            required: true,
+            message: '请选择监督对象类型',
+            trigger: 'change'
+        }
+    ],
+    supvObjName: [
+        {
+            required: true,
+            message: '请输入监督对象名称',
+            trigger: 'blur'
+        }
+    ],
+    objVoltageLevel: [
+        {
+            required: true,
+            message: '请选择监督对象电压等级',
+            trigger: 'change'
+        }
+    ],
+    objType: [
+        {
+            required: true,
+            message: '请选择监督对象属性',
+            trigger: 'change'
+        }
+    ],
+    objTypeName: [
+        {
+            required: false,
+            message: '请输入监督对象属性名称',
+            trigger: 'blur'
+        }
+    ],
+    objCapacity: [
+        {
+            required: true,
+            message: '请输入监督对象监督对象协议容量',
+            trigger: 'blur'
+        }
+    ],
+    substationName: [
+        {
+            required: true,
+            message: '请输入监督对象关联电站',
+            trigger: 'blur'
+        }
+    ],
+    substationVoltageLevel: [
+        {
+            required: true,
+            message: '请选择监督对象关联电站电压等级',
+            trigger: 'change'
+        }
+    ],
+    effectStatus: [
+        {
+            required: true,
+            message: '请选择实施状态',
+            trigger: 'change'
+        }
+    ]
+})
+watch(
+    () => form.value,
+    (val, oldVal) => {},
+    {
+        deep: true,
+        immediate: true
+    }
+)
+const resendId = ref('')
+const open = (row: any) => {
+    title.value = row.title
+    dialogFormVisible.value = true
+    if (row.row) {
+        resendId.value = row.row.planId
+        getPlanDetailsById({ id: row.row.planId }).then(res => {
+            form.value = res.data
+        })
+    } else {
+        resendId.value = ''
+    }
+}
+const close = () => {
+    //重置表单内容
+    //取消表单校验状态
+    ruleFormRef.value && ruleFormRef.value.resetFields()
+    dialogFormVisible.value = false
+    emits('onSubmit')
+    resetForm()
+}
+onMounted(() => {
+    console.log()
+})
+// 上传报告
+const uploadRef = ref()
+const handleExceed: UploadProps['onExceed'] = files => {
+    uploadRef.value!.clearFiles()
+    const file = files[0] as UploadRawFile
+    file.uid = genFileId()
+    uploadRef.value!.handleStart(file)
+}
+let uploadName = ref('')
+//上传报告改变
+const uploadFileName = val => {
+    uploadName.value = val
+}
+// 盖章报告
+const sealReport = ref('')
+// 佐证材料
+const evidenceMaterials = ref('')
+// 计划变更材料
+const planChangeMaterials = ref('')
+//告预警单材料
+const alarmMaterials = ref('')
+//告预警单反馈材料
+const alarmFeedbackMaterials = ref('')
+//评估报告
+const assessReport = ref('')
+const choose = (e: any) => {
+    uploadFile(e.raw, '/supervision/').then(res => {
+        //盖章报告
+        if (uploadName.value == 'sealReport') {
+            sealReport.value = res.data.name
+        }
+        //佐证材料
+        else if (uploadName.value == 'evidenceMaterials') {
+            evidenceMaterials.value = res.data.name
+        }
+        //计划变更材料
+        else if (uploadName.value == 'planChangeMaterials') {
+            planChangeMaterials.value = res.data.name
+        }
+        //告预警单材料
+        else if (uploadName.value == 'alarmMaterials') {
+            alarmMaterials.value = res.data.name
+        }
+        //告预警单反馈材料
+        else if (uploadName.value == 'alarmFeedbackMaterials') {
+            alarmFeedbackMaterials.value = res.data.name
+        }
+        //评估报告
+        else if (uploadName.value == 'assessReport') {
+            assessReport.value = res.data.name
+        }
+    })
+}
+//设置监督类型时间选择范围不能<今天
+const disabledDate = time => {
+    return time.getTime() < Date.now() - 8.64e7 // 8.64e7 毫秒数代表一天
+}
+//提交
+const confirmForm = () => {
+    // 提交终端信息
+    ruleFormRef.value.validate(valid => {
+        if (valid) {
+            form.value.planUserId = adminInfo.$state.id
+            let confirmFormData = JSON.parse(JSON.stringify(form.value))
+            //提交终端信息
+            // confirmFormData = {
+            //     ...confirmFormData,
+            //     sealReport: sealReport?.value, //盖章报告
+            //     evidenceMaterials: evidenceMaterials.value, //佐证材料
+            //     planChangeMaterials: planChangeMaterials.value, //计划变更材料
+            //     alarmMaterials: alarmMaterials.value, //告预警单材料
+            //     alarmFeedbackMaterials: alarmFeedbackMaterials.value, //告预警单反馈材料
+            //     assessReport: assessReport.value //评估报告
+            // }
+            if (title.value == '技术监督计划') {
+                addPlanFormData(confirmFormData).then(res => {
+                    if (res.code == 'A0000') {
+                        ElMessage({
+                            message: '新建技术监督计划成功',
+                            type: 'success'
+                        })
+                        ruleFormRef.value.resetFields()
+                        resetForm()
+                        close()
+                    }
+                })
+            } else {
+                console.log(confirmFormData)
+                confirmFormData.id = resendId.value
+                confirmFormData.planSupvDate = confirmFormData.planSupvDate.replace('T', ' ')
+                updatePlanFormData(confirmFormData).then(res => {
+                    if (res.code == 'A0000') {
+                        ElMessage({
+                            message: '重新发起成功',
+                            type: 'success'
+                        })
+                        ruleFormRef.value.resetFields()
+                        resetForm()
+                        close()
+                    }
+                })
+            }
+        } else {
+            console.log('表单验证失败')
+            return false
+        }
+    })
+}
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue b/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue
index c84f11cc..0f507d1a 100644
--- a/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue
+++ b/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue
@@ -1,415 +1,417 @@
-<template>
-    <el-dialog
-        v-model="dialogFormVisible"
-        :title="title"
-        width="60%"
-        :append-to-body="true"
-        :before-close="close"
-        :close-on-click-modal="false"
-        :lazy="true"
-        draggable
-        custom-class="fixed-dialog"
-    >
-        <el-form
-            :model="form"
-            :validate-on-rule-change="false"
-            :scroll-to-error="true"
-            :rules="rules"
-            ref="ruleFormRef"
-            :disabled="openType != 'add'"
-            label-width="auto"
-            class="form-two"
-        >
-            <el-form-item for="-" label="责任单位：" prop="dutyOrgId">
-                <Area ref="areaRef" v-model="form.dutyOrgId" />
-            </el-form-item>
-            <el-form-item for="-" label="监测点类型：" prop="monitorType">
-                <el-select v-model="form.monitorType" clearable style="width: 100%" placeholder="请选择监测点类型">
-                    <el-option
-                        v-for="item in monitorTypeList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item for="-" label="是否发布预警：" prop="ifReleaseWarning">
-                <el-select
-                    v-model="form.ifReleaseWarning"
-                    clearable
-                    style="width: 100%"
-                    placeholder="请选择是否发布预警"
-                >
-                    <el-option label="是" value="1"></el-option>
-                    <el-option label="否" value="0"></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item for="-" label="计划整改时间：" prop="planRectificationTime">
-                <el-date-picker
-                    style="width: 100%"
-                    v-model="form.planRectificationTime"
-                    type="datetime"
-                    format="YYYY-MM-DD hh:mm:ss"
-                    value-format="YYYY-MM-DD hh:mm:ss"
-                    placeholder="请选择计划整改时间"
-                />
-            </el-form-item>
-            <el-form-item for="-" label="整改情况：" prop="rectificationStatus">
-                <el-select
-                    v-model="form.rectificationStatus"
-                    clearable
-                    style="width: 100%"
-                    placeholder="请选择整改情况"
-                >
-                    <el-option
-                        v-for="item in rectificationStatusList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item for="-" label="整改时间：" prop="rectificationTime">
-                <el-date-picker
-                    style="width: 100%"
-                    v-model="form.rectificationTime"
-                    type="datetime"
-                    format="YYYY-MM-DD hh:mm:ss"
-                    value-format="YYYY-MM-DD hh:mm:ss"
-                    placeholder="请选择整改时间"
-                />
-            </el-form-item>
-            <el-form-item for="-" label="监督标准：" prop="supvStandard">
-                <el-input v-model="form.supvStandard" autocomplete="off" placeholder="请输入监督标准" />
-            </el-form-item>
-            <el-form-item for="-" label="监督标准序号：" prop="supvStandardSort">
-                <el-input v-model="form.supvStandardSort" autocomplete="off" placeholder="请输入监督标准序号" />
-            </el-form-item>
-            <el-form-item for="-" label="标准出处：" prop="supvResouce">
-                <el-input v-model="form.supvResouce" autocomplete="off" placeholder="请输入标准出处" />
-            </el-form-item>
-            <el-form-item for="-" label="问题等级：" prop="problemLevel">
-                <el-select v-model="form.problemLevel" clearable style="width: 100%" placeholder="请选择问题等级">
-                    <el-option
-                        v-for="item in problemLevelList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item for="-" label="问题类型：" prop="problemType">
-                <el-select v-model="form.problemType" clearable style="width: 100%" placeholder="请选择问题类型">
-                    <el-option
-                        v-for="item in problemTypeList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item for="-" label="问题发现时间：" prop="discoveryTime">
-                <el-date-picker
-                    style="width: 100%"
-                    v-model="form.discoveryTime"
-                    type="datetime"
-                    format="YYYY-MM-DD hh:mm:ss"
-                    value-format="YYYY-MM-DD hh:mm:ss"
-                    placeholder="问题发现时间"
-                />
-            </el-form-item>
-            <el-form-item for="-" label="定级依据：" prop="problemLevelReason" style="width:100%;">
-                <el-input type="textarea" v-model="form.problemLevelReason" autocomplete="off" placeholder="请输入定级依据" />
-            </el-form-item>
-            <el-form-item for="-" label="问题简要描述：" prop="simpleProblemDesc" style="width:100%;">
-                <el-input type="textarea"  v-model="form.simpleProblemDesc" autocomplete="off" placeholder="请输入问题简要描述" />
-            </el-form-item>
-            <el-form-item for="-" label="问题描述：" prop="problemDesc" style="width:100%;">
-                <el-input type="textarea"  v-model="form.problemDesc" autocomplete="off" placeholder="请输入问题描述" />
-            </el-form-item>
-            <el-form-item for="-" label="整改方案：" prop="rectificationProgramme"  style="width:100%;">
-                <el-input type="textarea"  v-model="form.rectificationProgramme" autocomplete="off" placeholder="请输入整改方案" />
-            </el-form-item>
-            <el-form-item for="-" label="整改措施：" prop="rectificationMeasure" style="width:100%;">
-                <el-input type="textarea"  v-model="form.rectificationMeasure" autocomplete="off" placeholder="请输入整改措施" />
-            </el-form-item>
-            <el-form-item for="-" label="备注：" style="width:100%;">
-                <el-input type="textarea"  v-model="form.remark" autocomplete="off" placeholder="请输入备注" />
-            </el-form-item>
-        </el-form>
-        <template #footer v-if="openType != 'detail'">
-            <div class="dialog-footer">
-                <el-button @click="close()">取消</el-button>
-                <el-button type="primary" @click="confirmForm()">确定</el-button>
-            </div>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch, onUnmounted } from 'vue'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-import { genFileId, ElMessage } from 'element-plus'
-import { useDictData } from '@/stores/dictData'
-import type { ComponentSize, FormInstance, FormRules } from 'element-plus'
-import { queryByAllCode } from '@/api/system-boot/dictTree'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { uploadFile } from '@/api/system-boot/file'
-import { addPlanFormData, getUserByDeptId, addPlanProblemFormData } from '@/api/supervision-boot/plan/index'
-import { getAreaList } from '@/api/common'
-import Area from '@/components/form/area/index.vue'
-const emits = defineEmits(['onSubmit'])
-const props = defineProps({
-    planId: {
-        type: String,
-        default: ''
-    }
-})
-const dictData = useDictData()
-const dialogFormVisible = ref(false)
-const form: any = ref({})
-const title: any = ref('')
-const ruleFormRef = ref(null)
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-//字典获取监测点类型
-const monitorTypeList = dictData.getBasicData('monitor_type')
-//字典获取问题类型
-const problemTypeList = dictData.getBasicData('problem_type')
-//字典整改情况
-const rectificationStatusList = dictData.getBasicData('rectification_type')
-//字典问题等级
-const problemLevelList = dictData.getBasicData('problem_level_type')
-const resetForm = () => {
-    form.value = {
-        discoveryTime: '', //问题发现时间
-        dutyOrgId: '', //	责任单位id，取ISC平台上的组织id
-        ifReleaseWarning: '0', //	是否发布预告警
-        monitorType: '', //监测点类型 ，仅供电电压监督计划必填
-        orderBy: '',
-        pageNum: 0,
-        pageSize: 0,
-        planId: '', //关联计划表id
-        planRectificationTime: '', //计划整改时间
-        problemDesc: '', //	问题描述
-        problemLevel: '', //	问题等级
-        problemLevelReason: '', //	定级依据
-        problemType: '', //问题类型
-        rectificationMeasure: '', //	整改措施
-        rectificationProgramme: '', //	整改方案
-        rectificationStatus: '', //	整改情况
-        rectificationTime: '', //整改时间
-        remark: '', //	备注
-        searchBeginTime: '',
-        searchEndTime: '',
-        searchState: 0,
-        searchValue: '',
-        simpleProblemDesc: '', //	问题简要描述
-        sortBy: '',
-        supvResouce: '', //	标准出处
-        supvStandard: '', //	监督标准
-        supvStandardSort: '' //	监督标准序号
-    }
-}
-//初始化数据
-resetForm()
-//定义校验规则
-const rules = ref({
-    discoveryTime: [
-        {
-            required: true,
-            message: '请选择问题发现时间',
-            trigger: 'change'
-        }
-    ],
-    dutyOrgId: [
-        {
-            required: true,
-            message: '请选择责任单位',
-            trigger: 'change'
-        }
-    ],
-    ifReleaseWarning: [
-        {
-            required: true,
-            message: '请选择是否发布预警',
-            trigger: 'change'
-        }
-    ],
-    monitorType: [
-        {
-            required: true,
-            message: '请选择监测点类型',
-            trigger: 'change'
-        }
-    ],
-    planRectificationTime: [
-        {
-            required: true,
-            message: '请选择计划整改时间',
-            trigger: 'change'
-        }
-    ],
-    problemDesc: [
-        {
-            required: true,
-            message: '请输入问题描述',
-            trigger: 'blur'
-        }
-    ],
-    problemLevel: [
-        {
-            required: true,
-            message: '请选择问题等级',
-            trigger: 'change'
-        }
-    ],
-    problemLevelReason: [
-        {
-            required: true,
-            message: '请输入定级依据',
-            trigger: 'blur'
-        }
-    ],
-    problemType: [
-        {
-            required: true,
-            message: '请选择问题类型',
-            trigger: 'change'
-        }
-    ],
-    rectificationMeasure: [
-        {
-            required: false,
-            message: '请输入整改措施',
-            trigger: 'change'
-        }
-    ],
-    rectificationProgramme: [
-        {
-            required: true,
-            message: '请输入整改方案',
-            trigger: 'blur'
-        }
-    ],
-    rectificationStatus: [
-        {
-            required: true,
-            message: '请选择整改情况',
-            trigger: 'change'
-        }
-    ],
-    rectificationTime: [
-        {
-            required: true,
-            message: '请选择整改时间',
-            trigger: 'change'
-        }
-    ],
-    remark: [
-        {
-            required: false,
-            message: '请输入备注',
-            trigger: 'blur'
-        }
-    ],
-    simpleProblemDesc: [
-        {
-            required: true,
-            message: '请输入问题简要描述',
-            trigger: 'blur'
-        }
-    ],
-    supvResouce: [
-        {
-            required: true,
-            message: '请输入标准出处',
-            trigger: 'blur'
-        }
-    ],
-    supvStandard: [
-        {
-            required: true,
-            message: '请输入监督标准',
-            trigger: 'blur'
-        }
-    ],
-    supvStandardSort: [
-        {
-            required: true,
-            message: '请输入监督标准序号',
-            trigger: 'blur'
-        }
-    ]
-})
-watch(
-    () => form.value,
-    (val, oldVal) => {},
-    {
-        deep: true,
-        immediate: true
-    }
-)
-const openType: any = ref('')
-const open = (row: any, val: any) => {
-    //详情（后面做编辑，再修改判断条件）
-    if (val == 'detail') {
-        for (let key in row) {
-            if (form.value.hasOwnProperty(key)) {
-                form.value[key] = row[key] // 对相同的key进行赋值
-            }
-        }
-        title.value = '技术计划监督实施问题详情'
-        openType.value = 'detail'
-    }
-    //新增
-    else if (val == 'add') {
-        title.value = '技术计划监督实施问题新增'
-        openType.value = 'add'
-        nextTick(() => {
-            ruleFormRef.value.resetFields()
-            resetForm()
-        })
-    }
-    dialogFormVisible.value = true
-}
-const close = () => {
-    //重置表单内容
-    //取消表单校验状态
-    ruleFormRef.value && ruleFormRef.value.resetFields()
-    dialogFormVisible.value = false
-    emits('onSubmit')
-    resetForm()
-}
-onMounted(() => {
-    console.log()
-})
-//设置监督类型时间选择范围不能<今天
-const disabledDate = time => {
-    return time.getTime() < Date.now() - 8.64e7 // 8.64e7 毫秒数代表一天
-}
-//提交
-const confirmForm = () => {
-    // 提交实施问题
-    ruleFormRef.value.validate(valid => {
-        if (valid) {
-            form.value.planId = props.planId
-            let confirmFormData = JSON.parse(JSON.stringify(form.value))
-            addPlanProblemFormData(confirmFormData).then(res => {
-                if (res.code == 'A0000') {
-                    ElMessage({
-                        message: '新增实施问题成功',
-                        type: 'success'
-                    })
-                    ruleFormRef.value.resetFields()
-                    resetForm()
-                    close()
-                }
-            })
-        } else {
-            console.log('表单验证失败')
-            return false
-        }
-    })
-}
-defineExpose({ open })
-</script>
+<template>
+    <el-dialog
+        v-model="dialogFormVisible"
+        :title="title"
+        width="60%"
+        :append-to-body="true"
+        :before-close="close"
+        :close-on-click-modal="false"
+        :lazy="true"
+        draggable
+        custom-class="fixed-dialog"
+    >
+        <el-form
+            :model="form"
+            :validate-on-rule-change="false"
+            :scroll-to-error="true"
+            :rules="rules"
+            ref="ruleFormRef"
+            :disabled="openType != 'add'"
+            label-width="auto"
+            class="form-two"
+        >
+            <el-form-item for="-" label="责任单位：" prop="dutyOrgId">
+                <Area ref="areaRef" v-model="form.dutyOrgId" />
+            </el-form-item>
+            <el-form-item for="-" label="监测点类型：" prop="monitorType">
+                <el-select v-model="form.monitorType" clearable style="width: 100%" placeholder="请选择监测点类型" filterable>
+                    <el-option
+                        v-for="item in monitorTypeList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item for="-" label="是否发布预警：" prop="ifReleaseWarning">
+                <el-select
+                    v-model="form.ifReleaseWarning"
+                    clearable
+                    style="width: 100%"
+                    placeholder="请选择是否发布预警"
+                    filterable
+                >
+                    <el-option label="是" value="1"></el-option>
+                    <el-option label="否" value="0"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item for="-" label="计划整改时间：" prop="planRectificationTime">
+                <el-date-picker
+                    style="width: 100%"
+                    v-model="form.planRectificationTime"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm:ss"
+                    value-format="YYYY-MM-DD hh:mm:ss"
+                    placeholder="请选择计划整改时间"
+                />
+            </el-form-item>
+            <el-form-item for="-" label="整改情况：" prop="rectificationStatus">
+                <el-select
+                    v-model="form.rectificationStatus"
+                    clearable
+                    style="width: 100%"
+                    placeholder="请选择整改情况"
+                    filterable
+                >
+                    <el-option
+                        v-for="item in rectificationStatusList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item for="-" label="整改时间：" prop="rectificationTime">
+                <el-date-picker
+                    style="width: 100%"
+                    v-model="form.rectificationTime"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm:ss"
+                    value-format="YYYY-MM-DD hh:mm:ss"
+                    placeholder="请选择整改时间"
+                />
+            </el-form-item>
+            <el-form-item for="-" label="监督标准：" prop="supvStandard">
+                <el-input v-model="form.supvStandard" autocomplete="off" placeholder="请输入监督标准" />
+            </el-form-item>
+            <el-form-item for="-" label="监督标准序号：" prop="supvStandardSort">
+                <el-input v-model="form.supvStandardSort" autocomplete="off" placeholder="请输入监督标准序号" />
+            </el-form-item>
+            <el-form-item for="-" label="标准出处：" prop="supvResouce">
+                <el-input v-model="form.supvResouce" autocomplete="off" placeholder="请输入标准出处" />
+            </el-form-item>
+            <el-form-item for="-" label="问题等级：" prop="problemLevel">
+                <el-select v-model="form.problemLevel" clearable style="width: 100%" placeholder="请选择问题等级" filterable>
+                    <el-option
+                        v-for="item in problemLevelList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item for="-" label="问题类型：" prop="problemType">
+                <el-select v-model="form.problemType" clearable style="width: 100%" placeholder="请选择问题类型" filterable>
+                    <el-option
+                        v-for="item in problemTypeList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item for="-" label="问题发现时间：" prop="discoveryTime">
+                <el-date-picker
+                    style="width: 100%"
+                    v-model="form.discoveryTime"
+                    type="datetime"
+                    format="YYYY-MM-DD hh:mm:ss"
+                    value-format="YYYY-MM-DD hh:mm:ss"
+                    placeholder="问题发现时间"
+                />
+            </el-form-item>
+            <el-form-item for="-" label="定级依据：" prop="problemLevelReason" style="width:100%;">
+                <el-input type="textarea" v-model="form.problemLevelReason" autocomplete="off" placeholder="请输入定级依据" />
+            </el-form-item>
+            <el-form-item for="-" label="问题简要描述：" prop="simpleProblemDesc" style="width:100%;">
+                <el-input type="textarea"  v-model="form.simpleProblemDesc" autocomplete="off" placeholder="请输入问题简要描述" />
+            </el-form-item>
+            <el-form-item for="-" label="问题描述：" prop="problemDesc" style="width:100%;">
+                <el-input type="textarea"  v-model="form.problemDesc" autocomplete="off" placeholder="请输入问题描述" />
+            </el-form-item>
+            <el-form-item for="-" label="整改方案：" prop="rectificationProgramme"  style="width:100%;">
+                <el-input type="textarea"  v-model="form.rectificationProgramme" autocomplete="off" placeholder="请输入整改方案" />
+            </el-form-item>
+            <el-form-item for="-" label="整改措施：" prop="rectificationMeasure" style="width:100%;">
+                <el-input type="textarea"  v-model="form.rectificationMeasure" autocomplete="off" placeholder="请输入整改措施" />
+            </el-form-item>
+            <el-form-item for="-" label="备注：" style="width:100%;">
+                <el-input type="textarea"  v-model="form.remark" autocomplete="off" placeholder="请输入备注" />
+            </el-form-item>
+        </el-form>
+        <template #footer v-if="openType != 'detail'">
+            <div class="dialog-footer">
+                <el-button @click="close()">取消</el-button>
+                <el-button type="primary" @click="confirmForm()">确定</el-button>
+            </div>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch, onUnmounted } from 'vue'
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+import { genFileId, ElMessage } from 'element-plus'
+import { useDictData } from '@/stores/dictData'
+import type { ComponentSize, FormInstance, FormRules } from 'element-plus'
+import { queryByAllCode } from '@/api/system-boot/dictTree'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { uploadFile } from '@/api/system-boot/file'
+import { addPlanFormData, getUserByDeptId, addPlanProblemFormData } from '@/api/supervision-boot/plan/index'
+import { getAreaList } from '@/api/common'
+import Area from '@/components/form/area/index.vue'
+const emits = defineEmits(['onSubmit'])
+const props = defineProps({
+    planId: {
+        type: String,
+        default: ''
+    }
+})
+const dictData = useDictData()
+const dialogFormVisible = ref(false)
+const form: any = ref({})
+const title: any = ref('')
+const ruleFormRef = ref(null)
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+//字典获取监测点类型
+const monitorTypeList = dictData.getBasicData('monitor_type')
+//字典获取问题类型
+const problemTypeList = dictData.getBasicData('problem_type')
+//字典整改情况
+const rectificationStatusList = dictData.getBasicData('rectification_type')
+//字典问题等级
+const problemLevelList = dictData.getBasicData('problem_level_type')
+const resetForm = () => {
+    form.value = {
+        discoveryTime: '', //问题发现时间
+        dutyOrgId: '', //	责任单位id，取ISC平台上的组织id
+        ifReleaseWarning: '0', //	是否发布预告警
+        monitorType: '', //监测点类型 ，仅供电电压监督计划必填
+        orderBy: '',
+        pageNum: 0,
+        pageSize: 0,
+        planId: '', //关联计划表id
+        planRectificationTime: '', //计划整改时间
+        problemDesc: '', //	问题描述
+        problemLevel: '', //	问题等级
+        problemLevelReason: '', //	定级依据
+        problemType: '', //问题类型
+        rectificationMeasure: '', //	整改措施
+        rectificationProgramme: '', //	整改方案
+        rectificationStatus: '', //	整改情况
+        rectificationTime: '', //整改时间
+        remark: '', //	备注
+        searchBeginTime: '',
+        searchEndTime: '',
+        searchState: 0,
+        searchValue: '',
+        simpleProblemDesc: '', //	问题简要描述
+        sortBy: '',
+        supvResouce: '', //	标准出处
+        supvStandard: '', //	监督标准
+        supvStandardSort: '' //	监督标准序号
+    }
+}
+//初始化数据
+resetForm()
+//定义校验规则
+const rules = ref({
+    discoveryTime: [
+        {
+            required: true,
+            message: '请选择问题发现时间',
+            trigger: 'change'
+        }
+    ],
+    dutyOrgId: [
+        {
+            required: true,
+            message: '请选择责任单位',
+            trigger: 'change'
+        }
+    ],
+    ifReleaseWarning: [
+        {
+            required: true,
+            message: '请选择是否发布预警',
+            trigger: 'change'
+        }
+    ],
+    monitorType: [
+        {
+            required: true,
+            message: '请选择监测点类型',
+            trigger: 'change'
+        }
+    ],
+    planRectificationTime: [
+        {
+            required: true,
+            message: '请选择计划整改时间',
+            trigger: 'change'
+        }
+    ],
+    problemDesc: [
+        {
+            required: true,
+            message: '请输入问题描述',
+            trigger: 'blur'
+        }
+    ],
+    problemLevel: [
+        {
+            required: true,
+            message: '请选择问题等级',
+            trigger: 'change'
+        }
+    ],
+    problemLevelReason: [
+        {
+            required: true,
+            message: '请输入定级依据',
+            trigger: 'blur'
+        }
+    ],
+    problemType: [
+        {
+            required: true,
+            message: '请选择问题类型',
+            trigger: 'change'
+        }
+    ],
+    rectificationMeasure: [
+        {
+            required: false,
+            message: '请输入整改措施',
+            trigger: 'change'
+        }
+    ],
+    rectificationProgramme: [
+        {
+            required: true,
+            message: '请输入整改方案',
+            trigger: 'blur'
+        }
+    ],
+    rectificationStatus: [
+        {
+            required: true,
+            message: '请选择整改情况',
+            trigger: 'change'
+        }
+    ],
+    rectificationTime: [
+        {
+            required: true,
+            message: '请选择整改时间',
+            trigger: 'change'
+        }
+    ],
+    remark: [
+        {
+            required: false,
+            message: '请输入备注',
+            trigger: 'blur'
+        }
+    ],
+    simpleProblemDesc: [
+        {
+            required: true,
+            message: '请输入问题简要描述',
+            trigger: 'blur'
+        }
+    ],
+    supvResouce: [
+        {
+            required: true,
+            message: '请输入标准出处',
+            trigger: 'blur'
+        }
+    ],
+    supvStandard: [
+        {
+            required: true,
+            message: '请输入监督标准',
+            trigger: 'blur'
+        }
+    ],
+    supvStandardSort: [
+        {
+            required: true,
+            message: '请输入监督标准序号',
+            trigger: 'blur'
+        }
+    ]
+})
+watch(
+    () => form.value,
+    (val, oldVal) => {},
+    {
+        deep: true,
+        immediate: true
+    }
+)
+const openType: any = ref('')
+const open = (row: any, val: any) => {
+    //详情（后面做编辑，再修改判断条件）
+    if (val == 'detail') {
+        for (let key in row) {
+            if (form.value.hasOwnProperty(key)) {
+                form.value[key] = row[key] // 对相同的key进行赋值
+            }
+        }
+        title.value = '技术计划监督实施问题详情'
+        openType.value = 'detail'
+    }
+    //新增
+    else if (val == 'add') {
+        title.value = '技术计划监督实施问题新增'
+        openType.value = 'add'
+        nextTick(() => {
+            ruleFormRef.value.resetFields()
+            resetForm()
+        })
+    }
+    dialogFormVisible.value = true
+}
+const close = () => {
+    //重置表单内容
+    //取消表单校验状态
+    ruleFormRef.value && ruleFormRef.value.resetFields()
+    dialogFormVisible.value = false
+    emits('onSubmit')
+    resetForm()
+}
+onMounted(() => {
+    console.log()
+})
+//设置监督类型时间选择范围不能<今天
+const disabledDate = time => {
+    return time.getTime() < Date.now() - 8.64e7 // 8.64e7 毫秒数代表一天
+}
+//提交
+const confirmForm = () => {
+    // 提交实施问题
+    ruleFormRef.value.validate(valid => {
+        if (valid) {
+            form.value.planId = props.planId
+            let confirmFormData = JSON.parse(JSON.stringify(form.value))
+            addPlanProblemFormData(confirmFormData).then(res => {
+                if (res.code == 'A0000') {
+                    ElMessage({
+                        message: '新增实施问题成功',
+                        type: 'success'
+                    })
+                    ruleFormRef.value.resetFields()
+                    resetForm()
+                    close()
+                }
+            })
+        } else {
+            console.log('表单验证失败')
+            return false
+        }
+    })
+}
+defineExpose({ open })
+</script>
diff --git a/src/views/pqs/supervise/plan/index.vue b/src/views/pqs/supervise/plan/index.vue
index a83e924b..af545f71 100644
--- a/src/views/pqs/supervise/plan/index.vue
+++ b/src/views/pqs/supervise/plan/index.vue
@@ -4,7 +4,7 @@
         <TableHeader area datePicker ref="TableHeaderRef" showCustomColumn>
             <template #select>
                 <el-form-item label="流程状态">
-                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态" filterable>
                         <el-option
                             v-for="item in statusSelect"
                             :key="item.id"
diff --git a/src/views/pqs/supervise/retire/deviceQuitPopup.vue b/src/views/pqs/supervise/retire/deviceQuitPopup.vue
index e9b39ed6..3edae8bb 100644
--- a/src/views/pqs/supervise/retire/deviceQuitPopup.vue
+++ b/src/views/pqs/supervise/retire/deviceQuitPopup.vue
@@ -1,258 +1,258 @@
-<template>
-    <el-dialog draggable  v-model="dialogVisible" :title="title" width="450px" top="20vh">
-        <el-scrollbar>
-            <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
-                <el-form-item label="终端" prop="deviceId">
-                    <el-tree-select
-                        v-model="form.deviceId"
-                        :data="data"
-                        filterable
-                        :filter-node-method="filterNode"
-                        style="width: 100%"
-                        @change="changeDevStatus"
-                        clearable
-                    />
-                </el-form-item>
-                <el-form-item label="终端当前状态:">
-                    <el-select v-model="runFlag" disabled placeholder="请选择终端" clearable class="select">
-                        <el-option
-                            v-for="item in devStatusList"
-                            :key="item.value"
-                            :label="item.name"
-                            :value="item.value"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="变更状态:" prop="devStatus">
-                    <el-select v-model="form.devStatus" placeholder="请选择终端状态" clearable class="select">
-                        <el-option
-                            v-for="item in devStatuData"
-                            :key="item.value"
-                            :label="item.name"
-                            :value="item.value"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-
-                <el-form-item label="变更原因" prop="propertyNo">
-                    <el-input
-                        type="textarea"
-                        clearable
-                        :autosize="{ minRows: 2, maxRows: 4 }"
-                        placeholder="请输入变更原因"
-                        v-model="form.propertyNo"
-                    ></el-input>
-                </el-form-item>
-            </el-form>
-        </el-scrollbar>
-
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="dialogVisible = false">取消</el-button>
-                <!-- <el-button type="primary" @click="submit">确认</el-button> -->
-                <el-button type="primary" @click="submit(true)" :loading="loading" >保存</el-button>
-                <el-button type="primary" @click="submit(false)" :loading="loading" >提交审批</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, inject } from 'vue'
-import { ElMessage } from 'element-plus'
-import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删除
-import { getTerminalSelectTree } from '@/api/device-boot/Business'
-import { addRunningDevice, quitRunningDeviceUpdate } from '@/api/supervision-boot/device/quitRunningDev'
-import { getDeviceDetailData } from '@/api/device-boot/line'
-import { defaultProps } from '@/utils/tree'
-const devStatusList = ref([
-    { name: '运行', value: '0' },
-    { name: '检修', value: '1' },
-    { name: '退运', value: '4' }
-])
-//下拉数据源
-const sourceData = ref()
-const deviceList = ref()
-const data = ref()
-const title = ref('')
-const loading = ref(false)
-const tableStore = inject('tableStore') as TableStore
-const formRef = ref()
-const devStatuData: any = ref([])
-
-const dialogVisible = ref(false)
-const runFlag = ref('')
-// 注意不要和表单ref的命名冲突
-const form = ref({
-    id: '',
-    deviceId: '',
-    deviceType: '1',
-    devOriginalStatus: '0',
-    devStatus: '',
-    propertyNo: '',
-    saveOrCheckflag: ''
-})
-
-//form表单校验规则
-const rules = {
-    deviceId: [{ required: true, message: '终端不能为空', trigger: 'change' }],
-    devStatus: [{ required: true, message: '请选择状态', trigger: 'change' }],
-    propertyNo: [{ required: true, message: '请输入退役原因', trigger: 'blur' }]
-}
-const resetForm = () => {
-    if (formRef.value) {
-        formRef.value.resetFields()
-    }
-}
-const filterNode = (value: string, data: any, node: any) => {
-    if (!value) return true
-
-    if (data.label) {
-        return chooseNode(value, data, node)
-    }
-}
-
-// 过滤父节点 / 子节点 (如果输入的参数是父节点且能匹配，则返回该节点以及其下的所有子节点；如果参数是子节点，则返回该节点的父节点。label是中文字符，enlabel是英文字符.
-const chooseNode = (value: string, data: any, node: any) => {
-    if (data.label.indexOf(value) !== -1) {
-        return true
-    }
-    const level = node.level
-    // 如果传入的节点本身就是一级节点就不用校验了
-    if (level === 1) {
-        return false
-    }
-    // 先取当前节点的父节点
-    let parentData = node.parent
-    // 遍历当前节点的父节点
-    let index = 0
-    while (index < level - 1) {
-        // 如果匹配到直接返回，此处label值是中文字符，enlabel是英文字符。判断匹配中英文过滤
-        if (parentData.data.label.indexOf(value) !== -1) {
-            return true
-        }
-        // 否则的话再往上一层做匹配
-        parentData = parentData.parent
-        index++
-    }
-    // 没匹配到返回false
-    return false
-}
-
-const open = async (text: string, tempData?: any) => {
-    title.value = text
-    //终端
-    await getTerminalSelectTree(4).then(res => {
-        deviceList.value = res.data
-    })
-    sourceData.value = deviceList.value
-    data.value = deviceList.value
-    if (tempData) {
-        // 表单赋值
-        for (let key in form.value) {
-            form.value[key] = tempData[key]
-        }
-        form.value.deviceType = form.value.deviceType + ''
-        changeDevStatus(form.value.deviceId, true)
-        form.value.devStatus = tempData.devStatus != null ? tempData.devStatus + '' : ''
-    } else {
-        resetForm()
-        // 在此处恢复默认表单
-        for (let key in form.value) {
-            form.value[key] = ''
-        }
-        runFlag.value = ''
-        form.value.deviceType = '1'
-    }
-    form.value.deviceType = '1'
-
-    // changeType(form.value.deviceType)
-    dialogVisible.value = true
-}
-
-/**
- * 提交用户表单数据
- */
-const submit =async (flag: boolean) => {
-    loading.value = true
-    if (flag) {
-        form.value.saveOrCheckflag = '1'
-
-        await  addRunningDevice(form.value).then(res => {
-            ElMessage.success('保存成功!')
-            tableStore.index()
-            dialogVisible.value = false
-        })
-    } else {
-        formRef.value.validate(async (valid: any) => {
-            if (valid) {
-                form.value.saveOrCheckflag = '2'
-                if (form.value.devOriginalStatus == form.value.devStatus) {
-                    if (form.value.devOriginalStatus == '0') {
-                        ElMessage.warning('终端当前状态就是运行，无需变更!')
-                    } else if (form.value.devOriginalStatus == '1') {
-                        ElMessage.warning('终端当前状态就是检修，无需变更!')
-                    } else {
-                        ElMessage.warning('终端当前状态就是退运，无需变更!')
-                    }
-                } else {
-                    if (form.value.id) {
-                        await quitRunningDeviceUpdate(form.value).then(res => {
-                            ElMessage.success('重新发起成功')
-                            tableStore.index()
-                            dialogVisible.value = false
-                        })
-                    } else {
-                        await addRunningDevice(form.value).then(res => {
-                            //查询进线数据，避免一直处于loading状态
-                            ElMessage.success('申请成功')
-                            tableStore.index()
-                            dialogVisible.value = false
-                        })
-                    }
-                }
-            }
-        })
-    }
-    await setTimeout(() => {
-        loading.value = false
-    }, 0)
-}
-
-/**
- * 终端类型切换
- */
-
-const changeType = (event: any) => {
-    sourceData.value = deviceList.value
-    form.value.deviceId = ''
-    data.value = sourceData.value
-}
-
-const changeDevStatus = async (event: any, flag?: boolean) => {
-    await getDeviceDetailData(event).then(res => {
-        //给当前终端赋值初始运行状态
-        runFlag.value = res.data.runFlag + ''
-        form.value.devOriginalStatus = runFlag.value
-        if (!flag) form.value.devStatus = ''
-        devStatuData.value = devStatusList.value.filter(item => item.value != res.data.runFlag)
-    })
-}
-
-defineExpose({ open })
-</script>
-
-<style scoped lang="scss">
-.el-upload-list__item {
-    transition: none !important;
-}
-
-.el-select {
-    min-width: 180px;
-}
-::v-deep .el-tree-node__children > div {
-    display: block !important;
-}
-:deep(.el-select__input) {
-    width: 100% !important;
-}
-</style>
+<template>
+    <el-dialog draggable  v-model="dialogVisible" :title="title" width="450px" top="20vh">
+        <el-scrollbar>
+            <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
+                <el-form-item label="终端" prop="deviceId">
+                    <el-tree-select
+                        v-model="form.deviceId"
+                        :data="data"
+                        filterable
+                        :filter-node-method="filterNode"
+                        style="width: 100%"
+                        @change="changeDevStatus"
+                        clearable
+                    />
+                </el-form-item>
+                <el-form-item label="终端当前状态:">
+                    <el-select v-model="runFlag" disabled placeholder="请选择终端" clearable class="select" filterable>
+                        <el-option
+                            v-for="item in devStatusList"
+                            :key="item.value"
+                            :label="item.name"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="变更状态:" prop="devStatus">
+                    <el-select v-model="form.devStatus" placeholder="请选择终端状态" clearable class="select" filterable>
+                        <el-option
+                            v-for="item in devStatuData"
+                            :key="item.value"
+                            :label="item.name"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item label="变更原因" prop="propertyNo">
+                    <el-input
+                        type="textarea"
+                        clearable
+                        :autosize="{ minRows: 2, maxRows: 4 }"
+                        placeholder="请输入变更原因"
+                        v-model="form.propertyNo"
+                    ></el-input>
+                </el-form-item>
+            </el-form>
+        </el-scrollbar>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <!-- <el-button type="primary" @click="submit">确认</el-button> -->
+                <el-button type="primary" @click="submit(true)" :loading="loading" >保存</el-button>
+                <el-button type="primary" @click="submit(false)" :loading="loading" >提交审批</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { ElMessage } from 'element-plus'
+import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删除
+import { getTerminalSelectTree } from '@/api/device-boot/Business'
+import { addRunningDevice, quitRunningDeviceUpdate } from '@/api/supervision-boot/device/quitRunningDev'
+import { getDeviceDetailData } from '@/api/device-boot/line'
+import { defaultProps } from '@/utils/tree'
+const devStatusList = ref([
+    { name: '运行', value: '0' },
+    { name: '检修', value: '1' },
+    { name: '退运', value: '4' }
+])
+//下拉数据源
+const sourceData = ref()
+const deviceList = ref()
+const data = ref()
+const title = ref('')
+const loading = ref(false)
+const tableStore = inject('tableStore') as TableStore
+const formRef = ref()
+const devStatuData: any = ref([])
+
+const dialogVisible = ref(false)
+const runFlag = ref('')
+// 注意不要和表单ref的命名冲突
+const form = ref({
+    id: '',
+    deviceId: '',
+    deviceType: '1',
+    devOriginalStatus: '0',
+    devStatus: '',
+    propertyNo: '',
+    saveOrCheckflag: ''
+})
+
+//form表单校验规则
+const rules = {
+    deviceId: [{ required: true, message: '终端不能为空', trigger: 'change' }],
+    devStatus: [{ required: true, message: '请选择状态', trigger: 'change' }],
+    propertyNo: [{ required: true, message: '请输入退役原因', trigger: 'blur' }]
+}
+const resetForm = () => {
+    if (formRef.value) {
+        formRef.value.resetFields()
+    }
+}
+const filterNode = (value: string, data: any, node: any) => {
+    if (!value) return true
+
+    if (data.label) {
+        return chooseNode(value, data, node)
+    }
+}
+
+// 过滤父节点 / 子节点 (如果输入的参数是父节点且能匹配，则返回该节点以及其下的所有子节点；如果参数是子节点，则返回该节点的父节点。label是中文字符，enlabel是英文字符.
+const chooseNode = (value: string, data: any, node: any) => {
+    if (data.label.indexOf(value) !== -1) {
+        return true
+    }
+    const level = node.level
+    // 如果传入的节点本身就是一级节点就不用校验了
+    if (level === 1) {
+        return false
+    }
+    // 先取当前节点的父节点
+    let parentData = node.parent
+    // 遍历当前节点的父节点
+    let index = 0
+    while (index < level - 1) {
+        // 如果匹配到直接返回，此处label值是中文字符，enlabel是英文字符。判断匹配中英文过滤
+        if (parentData.data.label.indexOf(value) !== -1) {
+            return true
+        }
+        // 否则的话再往上一层做匹配
+        parentData = parentData.parent
+        index++
+    }
+    // 没匹配到返回false
+    return false
+}
+
+const open = async (text: string, tempData?: any) => {
+    title.value = text
+    //终端
+    await getTerminalSelectTree(4).then(res => {
+        deviceList.value = res.data
+    })
+    sourceData.value = deviceList.value
+    data.value = deviceList.value
+    if (tempData) {
+        // 表单赋值
+        for (let key in form.value) {
+            form.value[key] = tempData[key]
+        }
+        form.value.deviceType = form.value.deviceType + ''
+        changeDevStatus(form.value.deviceId, true)
+        form.value.devStatus = tempData.devStatus != null ? tempData.devStatus + '' : ''
+    } else {
+        resetForm()
+        // 在此处恢复默认表单
+        for (let key in form.value) {
+            form.value[key] = ''
+        }
+        runFlag.value = ''
+        form.value.deviceType = '1'
+    }
+    form.value.deviceType = '1'
+
+    // changeType(form.value.deviceType)
+    dialogVisible.value = true
+}
+
+/**
+ * 提交用户表单数据
+ */
+const submit =async (flag: boolean) => {
+    loading.value = true
+    if (flag) {
+        form.value.saveOrCheckflag = '1'
+
+        await  addRunningDevice(form.value).then(res => {
+            ElMessage.success('保存成功!')
+            tableStore.index()
+            dialogVisible.value = false
+        })
+    } else {
+        formRef.value.validate(async (valid: any) => {
+            if (valid) {
+                form.value.saveOrCheckflag = '2'
+                if (form.value.devOriginalStatus == form.value.devStatus) {
+                    if (form.value.devOriginalStatus == '0') {
+                        ElMessage.warning('终端当前状态就是运行，无需变更!')
+                    } else if (form.value.devOriginalStatus == '1') {
+                        ElMessage.warning('终端当前状态就是检修，无需变更!')
+                    } else {
+                        ElMessage.warning('终端当前状态就是退运，无需变更!')
+                    }
+                } else {
+                    if (form.value.id) {
+                        await quitRunningDeviceUpdate(form.value).then(res => {
+                            ElMessage.success('重新发起成功')
+                            tableStore.index()
+                            dialogVisible.value = false
+                        })
+                    } else {
+                        await addRunningDevice(form.value).then(res => {
+                            //查询进线数据，避免一直处于loading状态
+                            ElMessage.success('申请成功')
+                            tableStore.index()
+                            dialogVisible.value = false
+                        })
+                    }
+                }
+            }
+        })
+    }
+    await setTimeout(() => {
+        loading.value = false
+    }, 0)
+}
+
+/**
+ * 终端类型切换
+ */
+
+const changeType = (event: any) => {
+    sourceData.value = deviceList.value
+    form.value.deviceId = ''
+    data.value = sourceData.value
+}
+
+const changeDevStatus = async (event: any, flag?: boolean) => {
+    await getDeviceDetailData(event).then(res => {
+        //给当前终端赋值初始运行状态
+        runFlag.value = res.data.runFlag + ''
+        form.value.devOriginalStatus = runFlag.value
+        if (!flag) form.value.devStatus = ''
+        devStatuData.value = devStatusList.value.filter(item => item.value != res.data.runFlag)
+    })
+}
+
+defineExpose({ open })
+</script>
+
+<style scoped lang="scss">
+.el-upload-list__item {
+    transition: none !important;
+}
+
+.el-select {
+    min-width: 180px;
+}
+::v-deep .el-tree-node__children > div {
+    display: block !important;
+}
+:deep(.el-select__input) {
+    width: 100% !important;
+}
+</style>
diff --git a/src/views/pqs/supervise/retire/monitor.vue b/src/views/pqs/supervise/retire/monitor.vue
index bbc01ed5..7eebb166 100644
--- a/src/views/pqs/supervise/retire/monitor.vue
+++ b/src/views/pqs/supervise/retire/monitor.vue
@@ -4,7 +4,7 @@
         <TableHeader date-picker nextFlag theCurrentTime showTimeAll showExport showCustomColumn>
             <template #select>
                 <el-form-item label="流程状态">
-                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态" filterable>
                         <el-option
                             v-for="item in statusSelect"
                             :key="item.id"
diff --git a/src/views/pqs/supervise/retire/monitorQuitPopup.vue b/src/views/pqs/supervise/retire/monitorQuitPopup.vue
index 364a9009..cb8a9a07 100644
--- a/src/views/pqs/supervise/retire/monitorQuitPopup.vue
+++ b/src/views/pqs/supervise/retire/monitorQuitPopup.vue
@@ -1,238 +1,238 @@
-<template>
-    <el-dialog draggable  v-model="dialogVisible" :title="title" width="450px" top="20vh">
-        <el-scrollbar>
-            <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
-                <!-- <el-form-item label="终端类型" prop="deviceType">
-            <el-radio-group v-model="form.deviceType"  :disabled="title == '监测点退运'" @change="changeType">
-                <el-radio border label="1">监测终端</el-radio>
-                <el-radio border label="2">监测点</el-radio>
-            </el-radio-group>
-        </el-form-item> -->
-                <el-form-item label="监测点" prop="deviceId">
-                    <el-tree-select
-                        v-model="form.deviceId"
-                        :data="data"
-                        filterable
-                        :default-expand-all="true"
-                        style="width: 100%"
-                        @change="changeDevStatus"
-                        clearable
-                    />
-                </el-form-item>
-                <el-form-item label="监测点当前状态:">
-                    <el-select v-model="runFlag" disabled placeholder="请选择监测点" clearable class="select">
-                        <el-option
-                            v-for="item in runFlagList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="变更状态:" prop="devStatus">
-                    <el-select v-model="form.devStatus" placeholder="请选择监测点变更状态" clearable class="select">
-                        <el-option
-                            v-for="item in runFlagData"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="退运原因" prop="propertyNo">
-                    <!-- <el-input
-              v-model='form.propertyNo'
-              clearable
-              placeholder='请输入退役原因'
-          /> -->
-                    <el-input
-                        type="textarea"
-                        clearable
-                        :autosize="{ minRows: 2, maxRows: 4 }"
-                        placeholder="请输入退运原因"
-                        v-model="form.propertyNo"
-                    ></el-input>
-                </el-form-item>
-            </el-form>
-        </el-scrollbar>
-
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="dialogVisible = false">取消</el-button>
-                <!-- <el-button type="primary" @click="submit">确认</el-button> -->
-                <el-button type="primary" @click="submit(true)" :loading="loading" >保存</el-button>
-                <el-button type="primary" @click="submit(false)" :loading="loading" >提交审批</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, inject } from 'vue'
-import { ElMessage } from 'element-plus'
-import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删除
-import { getTerminalSelectTree } from '@/api/device-boot/Business'
-import { addRunningDevice, quitRunningDeviceUpdate } from '@/api/supervision-boot/device/quitRunningDev'
-import { getLineDetailData } from '@/api/device-boot/line'
-
-//下拉数据源
-const sourceData = ref()
-const lineList = ref()
-const data = ref()
-const title = ref('')
-const loading = ref(false)
-const tableStore = inject('tableStore') as TableStore
-const formRef = ref()
-const runFlag = ref('')
-
-const runFlagData: any = ref([])
-const dialogVisible = ref(false)
-// 注意不要和表单ref的命名冲突
-const form = ref({
-    id: '',
-    deviceId: '',
-    deviceType: '2',
-    devOriginalStatus: '0',
-    devStatus: '',
-    saveOrCheckflag: '',
-    propertyNo: ''
-})
-const runFlagList = [
-    { id: '0', name: '投运' },
-    { id: '1', name: '检修' },
-    { id: '2', name: '停运' },
-    { id: '3', name: '调试' },
-    { id: '4', name: '退运' }
-]
-
-//form表单校验规则
-const rules = {
-    deviceId: [{ required: true, message: '终端不能为空', trigger: 'change' }],
-    propertyNo: [{ required: true, message: '请输入退役原因', trigger: 'blur' }],
-    devStatus: [{ required: true, message: '请选择变更状态', trigger: 'blur' }]
-}
-const resetForm = () => {
-    if (formRef.value) {
-        formRef.value.resetFields()
-    }
-}
-
-const open = async (text: string, tempData?: any) => {
-    title.value = text
-    //监测点
-    await getTerminalSelectTree(6).then(res => {
-        lineList.value = res.data
-    })
-
-    sourceData.value = lineList.value
-    data.value = lineList.value
-    if (tempData) {
-        // 表单赋值
-        for (let key in form.value) {
-            form.value[key] = tempData[key]
-        }
-        form.value.deviceType = form.value.deviceType + ''
-        changeDevStatus(form.value.deviceId, true)
-        form.value.devStatus = tempData.devStatus != null ? tempData.devStatus + '' : ''
-    } else {
-        resetForm()
-        // 在此处恢复默认表单
-        for (let key in form.value) {
-            form.value[key] = ''
-        }
-        form.value.deviceType = '1'
-        runFlag.value = ''
-    }
-    form.value.deviceType = '2'
-    dialogVisible.value = true
-}
-
-/**
- * 提交用户表单数据
- */
-const submit = async (flag: boolean) => {
-    loading.value = true
-    if (flag) {
-        form.value.saveOrCheckflag = '1'
-
-        await   addRunningDevice(form.value).then(res => {
-            ElMessage.success('保存成功!')
-            tableStore.index()
-            dialogVisible.value = false
-        })
-    } else {
-        formRef.value.validate(async (valid: any) => {
-            if (valid) {
-                form.value.saveOrCheckflag = '2'
-                {
-                    if (form.value.id) {
-                        await quitRunningDeviceUpdate(form.value)
-                        ElMessage.success('重新发起成功')
-                        tableStore.index()
-                        dialogVisible.value = false
-                    } else {
-                        await addRunningDevice(form.value)
-                        //查询进线数据，避免一直处于loading状态
-                        ElMessage.success('申请成功')
-                        tableStore.index()
-                        dialogVisible.value = false
-                    }
-                }
-            }
-        })
-    }
-    await setTimeout(() => {
-        loading.value = false
-    }, 0)
-}
-
-/**
- * 终端类型切换
- */
-
-const changeType = (event: any) => {
-    sourceData.value = lineList.value
-    form.value.deviceId = ''
-    data.value = sourceData.value
-}
-const changeDevStatus = async (event: any, flag?: any) => {
-    await getLineDetailData(event).then(res => {
-        //给当前终端赋值初始投运状态
-        // switch (res.data.runFlag) {
-
-        //     case '投运':
-        //         form.value.devOriginalStatus = '0'
-        //         break
-        //     case '检修':
-        //         form.value.devOriginalStatus = '1'
-        //         break
-        //     case '停运':
-        //         form.value.devOriginalStatus = '2'
-        //         break
-        //     case '调试':
-        //         form.value.devOriginalStatus = '3'
-        //         break
-        //     default:
-        //         form.value.devOriginalStatus = '4'
-        //         break
-        // }
-        runFlag.value = runFlagList.filter(item => item.name == res.data.runFlag)[0].id
-        form.value.devOriginalStatus = runFlag.value
-        if (!flag) {
-            form.value.devStatus = ''
-        }
-        runFlagData.value = runFlagList.filter(item => item.name != res.data.runFlag)
-    })
-}
-
-defineExpose({ open })
-</script>
-
-<style scoped>
-.el-upload-list__item {
-    transition: none !important;
-}
-
-.el-select {
-    min-width: 180px;
-}
-</style>
+<template>
+    <el-dialog draggable  v-model="dialogVisible" :title="title" width="450px" top="20vh">
+        <el-scrollbar>
+            <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
+                <!-- <el-form-item label="终端类型" prop="deviceType">
+            <el-radio-group v-model="form.deviceType"  :disabled="title == '监测点退运'" @change="changeType">
+                <el-radio border label="1">监测终端</el-radio>
+                <el-radio border label="2">监测点</el-radio>
+            </el-radio-group>
+        </el-form-item> -->
+                <el-form-item label="监测点" prop="deviceId">
+                    <el-tree-select
+                        v-model="form.deviceId"
+                        :data="data"
+                        filterable
+                        :default-expand-all="true"
+                        style="width: 100%"
+                        @change="changeDevStatus"
+                        clearable
+                    />
+                </el-form-item>
+                <el-form-item label="监测点当前状态:">
+                    <el-select v-model="runFlag" disabled placeholder="请选择监测点" clearable class="select" filterable>
+                        <el-option
+                            v-for="item in runFlagList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="变更状态:" prop="devStatus">
+                    <el-select v-model="form.devStatus" placeholder="请选择监测点变更状态" clearable class="select" filterable>
+                        <el-option
+                            v-for="item in runFlagData"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="退运原因" prop="propertyNo">
+                    <!-- <el-input
+              v-model='form.propertyNo'
+              clearable
+              placeholder='请输入退役原因'
+          /> -->
+                    <el-input
+                        type="textarea"
+                        clearable
+                        :autosize="{ minRows: 2, maxRows: 4 }"
+                        placeholder="请输入退运原因"
+                        v-model="form.propertyNo"
+                    ></el-input>
+                </el-form-item>
+            </el-form>
+        </el-scrollbar>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <!-- <el-button type="primary" @click="submit">确认</el-button> -->
+                <el-button type="primary" @click="submit(true)" :loading="loading" >保存</el-button>
+                <el-button type="primary" @click="submit(false)" :loading="loading" >提交审批</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { ElMessage } from 'element-plus'
+import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删除
+import { getTerminalSelectTree } from '@/api/device-boot/Business'
+import { addRunningDevice, quitRunningDeviceUpdate } from '@/api/supervision-boot/device/quitRunningDev'
+import { getLineDetailData } from '@/api/device-boot/line'
+
+//下拉数据源
+const sourceData = ref()
+const lineList = ref()
+const data = ref()
+const title = ref('')
+const loading = ref(false)
+const tableStore = inject('tableStore') as TableStore
+const formRef = ref()
+const runFlag = ref('')
+
+const runFlagData: any = ref([])
+const dialogVisible = ref(false)
+// 注意不要和表单ref的命名冲突
+const form = ref({
+    id: '',
+    deviceId: '',
+    deviceType: '2',
+    devOriginalStatus: '0',
+    devStatus: '',
+    saveOrCheckflag: '',
+    propertyNo: ''
+})
+const runFlagList = [
+    { id: '0', name: '投运' },
+    { id: '1', name: '检修' },
+    { id: '2', name: '停运' },
+    { id: '3', name: '调试' },
+    { id: '4', name: '退运' }
+]
+
+//form表单校验规则
+const rules = {
+    deviceId: [{ required: true, message: '终端不能为空', trigger: 'change' }],
+    propertyNo: [{ required: true, message: '请输入退役原因', trigger: 'blur' }],
+    devStatus: [{ required: true, message: '请选择变更状态', trigger: 'blur' }]
+}
+const resetForm = () => {
+    if (formRef.value) {
+        formRef.value.resetFields()
+    }
+}
+
+const open = async (text: string, tempData?: any) => {
+    title.value = text
+    //监测点
+    await getTerminalSelectTree(6).then(res => {
+        lineList.value = res.data
+    })
+
+    sourceData.value = lineList.value
+    data.value = lineList.value
+    if (tempData) {
+        // 表单赋值
+        for (let key in form.value) {
+            form.value[key] = tempData[key]
+        }
+        form.value.deviceType = form.value.deviceType + ''
+        changeDevStatus(form.value.deviceId, true)
+        form.value.devStatus = tempData.devStatus != null ? tempData.devStatus + '' : ''
+    } else {
+        resetForm()
+        // 在此处恢复默认表单
+        for (let key in form.value) {
+            form.value[key] = ''
+        }
+        form.value.deviceType = '1'
+        runFlag.value = ''
+    }
+    form.value.deviceType = '2'
+    dialogVisible.value = true
+}
+
+/**
+ * 提交用户表单数据
+ */
+const submit = async (flag: boolean) => {
+    loading.value = true
+    if (flag) {
+        form.value.saveOrCheckflag = '1'
+
+        await   addRunningDevice(form.value).then(res => {
+            ElMessage.success('保存成功!')
+            tableStore.index()
+            dialogVisible.value = false
+        })
+    } else {
+        formRef.value.validate(async (valid: any) => {
+            if (valid) {
+                form.value.saveOrCheckflag = '2'
+                {
+                    if (form.value.id) {
+                        await quitRunningDeviceUpdate(form.value)
+                        ElMessage.success('重新发起成功')
+                        tableStore.index()
+                        dialogVisible.value = false
+                    } else {
+                        await addRunningDevice(form.value)
+                        //查询进线数据，避免一直处于loading状态
+                        ElMessage.success('申请成功')
+                        tableStore.index()
+                        dialogVisible.value = false
+                    }
+                }
+            }
+        })
+    }
+    await setTimeout(() => {
+        loading.value = false
+    }, 0)
+}
+
+/**
+ * 终端类型切换
+ */
+
+const changeType = (event: any) => {
+    sourceData.value = lineList.value
+    form.value.deviceId = ''
+    data.value = sourceData.value
+}
+const changeDevStatus = async (event: any, flag?: any) => {
+    await getLineDetailData(event).then(res => {
+        //给当前终端赋值初始投运状态
+        // switch (res.data.runFlag) {
+
+        //     case '投运':
+        //         form.value.devOriginalStatus = '0'
+        //         break
+        //     case '检修':
+        //         form.value.devOriginalStatus = '1'
+        //         break
+        //     case '停运':
+        //         form.value.devOriginalStatus = '2'
+        //         break
+        //     case '调试':
+        //         form.value.devOriginalStatus = '3'
+        //         break
+        //     default:
+        //         form.value.devOriginalStatus = '4'
+        //         break
+        // }
+        runFlag.value = runFlagList.filter(item => item.name == res.data.runFlag)[0].id
+        form.value.devOriginalStatus = runFlag.value
+        if (!flag) {
+            form.value.devStatus = ''
+        }
+        runFlagData.value = runFlagList.filter(item => item.name != res.data.runFlag)
+    })
+}
+
+defineExpose({ open })
+</script>
+
+<style scoped>
+.el-upload-list__item {
+    transition: none !important;
+}
+
+.el-select {
+    min-width: 180px;
+}
+</style>
diff --git a/src/views/pqs/supervise/retire/terminal.vue b/src/views/pqs/supervise/retire/terminal.vue
index 8ef9c804..75c672a4 100644
--- a/src/views/pqs/supervise/retire/terminal.vue
+++ b/src/views/pqs/supervise/retire/terminal.vue
@@ -4,7 +4,7 @@
         <TableHeader date-picker nextFlag theCurrentTime showTimeAll showExport showCustomColumn>
             <template v-slot:select>
                 <el-form-item label="流程状态">
-                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态" filterable>
                         <el-option
                             v-for="item in statusSelect"
                             :key="item.id"
diff --git a/src/views/pqs/supervise/technology/components/alarm.vue b/src/views/pqs/supervise/technology/components/alarm.vue
index fba8a120..8e3945c4 100644
--- a/src/views/pqs/supervise/technology/components/alarm.vue
+++ b/src/views/pqs/supervise/technology/components/alarm.vue
@@ -2,7 +2,7 @@
     <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showExport showCustomColumn>
         <template #select>
             <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态" filterable>
                     <el-option
                         v-for="item in statusSelect"
                         :key="item.id"
@@ -12,7 +12,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="是否解决">
-                <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
+                <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决" filterable>
                     <el-option label="未解决" value="0"></el-option>
                     <!-- <el-option label="已解决" value="1"></el-option> -->
                 </el-select>
diff --git a/src/views/pqs/supervise/technology/components/earlyWarn.vue b/src/views/pqs/supervise/technology/components/earlyWarn.vue
index 002b31df..891cfdb4 100644
--- a/src/views/pqs/supervise/technology/components/earlyWarn.vue
+++ b/src/views/pqs/supervise/technology/components/earlyWarn.vue
@@ -2,7 +2,7 @@
     <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showExport showCustomColumn>
          <template #select>
             <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态" filterable>
                     <el-option
                         v-for="item in statusSelect"
                         :key="item.id"
diff --git a/src/views/pqs/supervise/technology/components/listForm.vue b/src/views/pqs/supervise/technology/components/listForm.vue
index 304b6c76..3593321e 100644
--- a/src/views/pqs/supervise/technology/components/listForm.vue
+++ b/src/views/pqs/supervise/technology/components/listForm.vue
@@ -1,157 +1,157 @@
-<template>
-    <el-dialog draggable v-model="dialogVisible" :title="title" style="width: 800px" :before-close="handleClose">
-        <el-form :model="form" class="form-two" label-width="auto" :rules="rules">
-            <el-form-item label="单据编号:" prop="billNo">
-                <el-input v-model="form.billNo" placeholder="请输入单据编号" clearable></el-input>
-            </el-form-item>
-            <el-form-item label="单据名称:" prop="billName">
-                <el-input v-model="form.billName" placeholder="请输入单据名称" clearable></el-input>
-            </el-form-item>
-            <el-form-item label="单据类别:" prop="billType">
-                <el-select v-model="form.billType" clearable placeholder="请选择单据类别">
-                    <el-option
-                        v-for="item in Categories"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="编制单位名称:" prop="createrOrgName">
-                <el-input v-model="form.createrOrgName" placeholder="请输入编制单位名称" clearable></el-input>
-            </el-form-item>
-            <el-form-item label="所属专业:" prop="specialityType">
-                <el-select v-model="form.specialityType" clearable placeholder="请选择所属专业">
-                    <el-option v-for="item in Major" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="责任单位名称:" prop="orgName">
-                <el-input v-model="form.orgName" placeholder="请输入责任单位名称" clearable></el-input>
-            </el-form-item>
-            <el-form-item label="接收人名称:" prop="receiveUserId">
-                <el-select v-model="form.receiveUserId" clearable placeholder="请选择接收人名称">
-                    <el-option
-                        v-for="item in ImplementationPeople"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="编制时间:" prop="createrTime">
-                <el-date-picker
-                    v-model="form.createrTime"
-                    type="date"
-                    value-format="YYYY-MM-DD"
-                    placeholder="选择日期"
-                ></el-date-picker>
-            </el-form-item>
-            <el-form-item label="主管部门名称:" prop="managerDeptName">
-                <el-input v-model="form.managerDeptName" placeholder="请输入主管部门名称" clearable></el-input>
-            </el-form-item>
-            <el-form-item label="主送单位名称:" prop="mainSenderName">
-                <el-input v-model="form.mainSenderName" placeholder="请输入主送单位名称" clearable></el-input>
-            </el-form-item>
-            <el-form-item label="抄送单位名称:" prop="copySenderName">
-                <el-input v-model="form.copySenderName" placeholder="请输入抄送单位名称" clearable></el-input>
-            </el-form-item>
-            <el-form-item label="处理建议:" prop="dealAdvise">
-                <el-input
-                    v-model="form.dealAdvise"
-                    type="textarea"
-                    autosize
-                    placeholder="请输入处理建议"
-                    clearable
-                ></el-input>
-            </el-form-item>
-            <el-form-item label="依据标准:" prop="techSupvBasis">
-                <el-input v-model="form.techSupvBasis" type="textarea" autosize placeholder="请输入依据标准"></el-input>
-            </el-form-item>
-            <el-form-item label="问题描述:" prop="problemDesc">
-                <el-input v-model="form.problemDesc" type="textarea" autosize placeholder="请输入问题描述"></el-input>
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="handleClose">取消</el-button>
-                <el-button type="primary" @click="submit">确认</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-<script setup lang="ts">
-import { ref } from 'vue'
-import { useDictData } from '@/stores/dictData'
-
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-
-import { genFileId, ElMessage } from 'element-plus'
-const emit = defineEmits(['onsubmit'])
-const dictData = useDictData()
-const manufactorList = dictData.getBasicData('Dev_Manufacturers')
-const dialogVisible = ref(false)
-const title: any = ref('')
-const ImplementationPeople = ref([])
-const Categories = ref([])
-const Major = ref([])
-const form: any = ref({
-    billName: '',
-    billNo: '',
-    billType: '',
-    copySenderId: '',
-    copySenderName: '',
-    createrOrgId: '',
-    createrOrgName: '',
-    createrTime: '',
-    dealAdvise: '',
-    mainSenderId: '',
-    mainSenderName: '',
-    managerDeptId: '',
-    managerDeptName: '',
-    orgId: '',
-    orgName: '',
-    problemDesc: '',
-    receiveUserName: '',
-    receiveUserId: '',
-    specialityType: '',
-    techSupvBasis: ''
-})
-const elform = ref()
-const uploadRef = ref()
-const rules = {
-    billNo: [{ required: true, message: '请输入单据编号', trigger: 'blur' }],
-    billName: [{ required: true, message: '请输入单据名称', trigger: 'blur' }],
-    billType: [{ required: true, message: '请选择单据类别', trigger: 'change' }],
-    createrOrgName: [{ required: true, message: '请选择编制单位', trigger: 'change' }],
-    specialityType: [{ required: true, message: '请选择所属专业', trigger: 'change' }],
-    orgName: [{ required: true, message: '请选择责任单位', trigger: 'change' }],
-    createrTime: [{ required: true, message: '选择日期', trigger: 'change' }],
-    managerDeptName: [{ required: true, message: '请选择主管部门名称', trigger: 'change' }],
-    techSupvBasis: [{ required: true, message: '请输入依据标准', trigger: 'blur' }],
-    problemDesc: [{ required: true, message: '请输入问题描述', trigger: 'blur' }],
-    dealAdvise: [{ required: true, message: '请输入处理建议', trigger: 'blur' }],
-    treatmentMeasures: [{ required: true, message: '请输入采取措施', trigger: 'blur' }],
-    fillUserId: [{ required: true, message: '请选择接收人名称', trigger: 'change' }],
-    completeTime: [{ required: true, message: '选择日期', trigger: 'change' }]
-}
-const submit = () => {
-    handleClose()
-}
-
-const open = (text: any) => {
-    dialogVisible.value = true
-    title.value = text
-}
-
-const handleClose = () => {
-    // elform.value.resetFields()
-    dialogVisible.value = false
-}
-
-defineExpose({ open })
-</script>
-<style lang="scss" scoped>
-:deep(.el-upload-list__item) {
-    width: 400px;
-}
-</style>
+<template>
+    <el-dialog draggable v-model="dialogVisible" :title="title" style="width: 800px" :before-close="handleClose">
+        <el-form :model="form" class="form-two" label-width="auto" :rules="rules">
+            <el-form-item label="单据编号:" prop="billNo">
+                <el-input v-model="form.billNo" placeholder="请输入单据编号" clearable></el-input>
+            </el-form-item>
+            <el-form-item label="单据名称:" prop="billName">
+                <el-input v-model="form.billName" placeholder="请输入单据名称" clearable></el-input>
+            </el-form-item>
+            <el-form-item label="单据类别:" prop="billType">
+                <el-select v-model="form.billType" clearable placeholder="请选择单据类别" filterable>
+                    <el-option
+                        v-for="item in Categories"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="编制单位名称:" prop="createrOrgName">
+                <el-input v-model="form.createrOrgName" placeholder="请输入编制单位名称" clearable></el-input>
+            </el-form-item>
+            <el-form-item label="所属专业:" prop="specialityType">
+                <el-select v-model="form.specialityType" clearable placeholder="请选择所属专业" filterable>
+                    <el-option v-for="item in Major" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="责任单位名称:" prop="orgName">
+                <el-input v-model="form.orgName" placeholder="请输入责任单位名称" clearable></el-input>
+            </el-form-item>
+            <el-form-item label="接收人名称:" prop="receiveUserId">
+                <el-select v-model="form.receiveUserId" clearable placeholder="请选择接收人名称" filterable>
+                    <el-option
+                        v-for="item in ImplementationPeople"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="编制时间:" prop="createrTime">
+                <el-date-picker
+                    v-model="form.createrTime"
+                    type="date"
+                    value-format="YYYY-MM-DD"
+                    placeholder="选择日期"
+                ></el-date-picker>
+            </el-form-item>
+            <el-form-item label="主管部门名称:" prop="managerDeptName">
+                <el-input v-model="form.managerDeptName" placeholder="请输入主管部门名称" clearable></el-input>
+            </el-form-item>
+            <el-form-item label="主送单位名称:" prop="mainSenderName">
+                <el-input v-model="form.mainSenderName" placeholder="请输入主送单位名称" clearable></el-input>
+            </el-form-item>
+            <el-form-item label="抄送单位名称:" prop="copySenderName">
+                <el-input v-model="form.copySenderName" placeholder="请输入抄送单位名称" clearable></el-input>
+            </el-form-item>
+            <el-form-item label="处理建议:" prop="dealAdvise">
+                <el-input
+                    v-model="form.dealAdvise"
+                    type="textarea"
+                    autosize
+                    placeholder="请输入处理建议"
+                    clearable
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="依据标准:" prop="techSupvBasis">
+                <el-input v-model="form.techSupvBasis" type="textarea" autosize placeholder="请输入依据标准"></el-input>
+            </el-form-item>
+            <el-form-item label="问题描述:" prop="problemDesc">
+                <el-input v-model="form.problemDesc" type="textarea" autosize placeholder="请输入问题描述"></el-input>
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="handleClose">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useDictData } from '@/stores/dictData'
+
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+
+import { genFileId, ElMessage } from 'element-plus'
+const emit = defineEmits(['onsubmit'])
+const dictData = useDictData()
+const manufactorList = dictData.getBasicData('Dev_Manufacturers')
+const dialogVisible = ref(false)
+const title: any = ref('')
+const ImplementationPeople = ref([])
+const Categories = ref([])
+const Major = ref([])
+const form: any = ref({
+    billName: '',
+    billNo: '',
+    billType: '',
+    copySenderId: '',
+    copySenderName: '',
+    createrOrgId: '',
+    createrOrgName: '',
+    createrTime: '',
+    dealAdvise: '',
+    mainSenderId: '',
+    mainSenderName: '',
+    managerDeptId: '',
+    managerDeptName: '',
+    orgId: '',
+    orgName: '',
+    problemDesc: '',
+    receiveUserName: '',
+    receiveUserId: '',
+    specialityType: '',
+    techSupvBasis: ''
+})
+const elform = ref()
+const uploadRef = ref()
+const rules = {
+    billNo: [{ required: true, message: '请输入单据编号', trigger: 'blur' }],
+    billName: [{ required: true, message: '请输入单据名称', trigger: 'blur' }],
+    billType: [{ required: true, message: '请选择单据类别', trigger: 'change' }],
+    createrOrgName: [{ required: true, message: '请选择编制单位', trigger: 'change' }],
+    specialityType: [{ required: true, message: '请选择所属专业', trigger: 'change' }],
+    orgName: [{ required: true, message: '请选择责任单位', trigger: 'change' }],
+    createrTime: [{ required: true, message: '选择日期', trigger: 'change' }],
+    managerDeptName: [{ required: true, message: '请选择主管部门名称', trigger: 'change' }],
+    techSupvBasis: [{ required: true, message: '请输入依据标准', trigger: 'blur' }],
+    problemDesc: [{ required: true, message: '请输入问题描述', trigger: 'blur' }],
+    dealAdvise: [{ required: true, message: '请输入处理建议', trigger: 'blur' }],
+    treatmentMeasures: [{ required: true, message: '请输入采取措施', trigger: 'blur' }],
+    fillUserId: [{ required: true, message: '请选择接收人名称', trigger: 'change' }],
+    completeTime: [{ required: true, message: '选择日期', trigger: 'change' }]
+}
+const submit = () => {
+    handleClose()
+}
+
+const open = (text: any) => {
+    dialogVisible.value = true
+    title.value = text
+}
+
+const handleClose = () => {
+    // elform.value.resetFields()
+    dialogVisible.value = false
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+</style>
diff --git a/src/views/pqs/supervise/technology/components/technology.vue b/src/views/pqs/supervise/technology/components/technology.vue
index 01fa997d..b58825c9 100644
--- a/src/views/pqs/supervise/technology/components/technology.vue
+++ b/src/views/pqs/supervise/technology/components/technology.vue
@@ -12,7 +12,7 @@
                     </el-form-item>
 
                     <el-form-item label="事务类型:">
-                        <el-select v-model="tableStore.table.params.type" clearable placeholder="请选择事务类型">
+                        <el-select v-model="tableStore.table.params.type" clearable placeholder="请选择事务类型" filterable>
                             <el-option
                                 v-for="item in affairs"
                                 :key="item.id"
@@ -22,7 +22,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="所属流程:">
-                        <el-select v-model="tableStore.table.params.searchState" placeholder="请选择所属流程">
+                        <el-select v-model="tableStore.table.params.searchState" placeholder="请选择所属流程" filterable>
                             <el-option
                                 v-for="item in process"
                                 :key="item.id"
diff --git a/src/views/pqs/supervise/terminal/components/add.vue b/src/views/pqs/supervise/terminal/components/add.vue
index 4cd13cef..273de158 100644
--- a/src/views/pqs/supervise/terminal/components/add.vue
+++ b/src/views/pqs/supervise/terminal/components/add.vue
@@ -1,153 +1,153 @@
-<template>
-    <el-dialog draggable v-model="dialogVisible" :title="title" style="width: 800px" :before-close="handleClose">
-        <el-form :model="form" :rules="rules" class="form-two" ref="elform" label-width="120px">
-            <el-form-item label="终端编号:" prop="id">
-                <el-input
-                    clearable
-                    :disabled="title == `编辑`"
-                    v-model="form.id"
-                    placeholder="请输入终端编号"
-                ></el-input>
-            </el-form-item>
-            <el-form-item label="终端名称:" prop="name">
-                <el-input clearable v-model="form.name" placeholder="请输入终端名称"></el-input>
-            </el-form-item>
-            <el-form-item label="送检单位:" prop="inspectionUnit">
-                <el-input clearable v-model="form.inspectionUnit" placeholder="请输入送检单位"></el-input>
-            </el-form-item>
-            <el-form-item label="检测时间:" prop="inspectionTime">
-                <el-date-picker
-                    v-model="form.inspectionTime"
-                    type="date"
-                    value-format="YYYY-MM-DD"
-                    placeholder="选择日期"
-                ></el-date-picker>
-            </el-form-item>
-
-            <el-form-item label="安装位置:" prop="installPlace">
-                <el-input clearable v-model="form.installPlace" placeholder="请输入安装位置"></el-input>
-            </el-form-item>
-            <el-form-item label="生产厂家:" prop="manufacture">
-                <el-select v-model="form.manufacture" placeholder="请选择生产厂家" clearable class="select">
-                    <el-option
-                        v-for="item in manufactorList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="原始数据报告:">
-                <el-upload
-                    v-model:file-list="form.fileList"
-                    ref="uploadRef"
-                    action=""
-                    accept=".doc,.docx"
-                    :limit="1"
-                    :on-exceed="handleExceed"
-                    :on-change="choose"
-                    :auto-upload="false"
-                >
-                    <template #trigger>
-                        <el-button type="primary">上传文件</el-button>
-                    </template>
-                </el-upload>
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="handleClose">取消</el-button>
-                <el-button type="primary" @click="submit">确认</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-<script setup lang="ts">
-import { ref } from 'vue'
-import { useDictData } from '@/stores/dictData'
-import { upload, insertTerminal, updateTerminal } from '@/api/process-boot/terminal'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-
-import { genFileId, ElMessage } from 'element-plus'
-const emit = defineEmits(['onsubmit'])
-const dictData = useDictData()
-const manufactorList = dictData.getBasicData('Dev_Manufacturers')
-const dialogVisible = ref(false)
-const title: any = ref('')
-const form: any = ref({
-    id: '',
-    inspectionUnit: '',
-    inspectionTime: '',
-    installPlace: '',
-    originalReport: '',
-    manufacture: '',
-    name: '',
-    originalName: '',
-    orgNo: dictData.state.area[0].id,
-    orgName: dictData.state.area[0].name,
-    fileList: []
-})
-const elform = ref()
-const uploadRef = ref()
-const rules = {
-    id: [{ required: true, message: '请输入终端编号', trigger: 'blur' }],
-    name: [{ required: true, message: '请输入终端名称', trigger: 'blur' }],
-    installPlace: [{ required: true, message: '请输入安装位置', trigger: 'blur' }],
-    inspectionUnit: [{ required: true, message: '请输入送检单位', trigger: 'blur' }],
-    inspectionTime: [{ required: true, message: '请选择时间', trigger: 'change' }],
-    manufacture: [{ required: true, message: '请选择生产厂家', trigger: 'change' }],
-    fileList: [{ required: true, message: '请选择文件', trigger: 'change' }]
-}
-const submit = () => {
-    elform.value.validate((valid: any) => {
-        if (title.value == '新增') {
-            insertTerminal(form.value).then(res => {
-                ElMessage.success('新增成功!')
-                handleClose()
-                emit('onsubmit')
-            })
-        } else {
-            updateTerminal(form.value).then(res => {
-                ElMessage.success('修改成功!')
-                handleClose()
-                emit('onsubmit')
-            })
-        }
-    })
-}
-
-// 上传报告
-const handleExceed: UploadProps['onExceed'] = files => {
-    uploadRef.value!.clearFiles()
-    const file = files[0] as UploadRawFile
-    file.uid = genFileId()
-    uploadRef.value!.handleStart(file)
-}
-const choose = (e: any) => {
-    upload(e.raw).then(res => {
-        form.value.originalReport = res.data
-        form.value.originalName = e.name
-    })
-}
-
-const open = (row: any) => {
-    title.value = row.title
-    if (row.title == '编辑') {
-        row.row ? (form.value = JSON.parse(JSON.stringify(row.row))) : ''
-        form.value.orgNo = dictData.state.area[0].id
-        form.value.fileList = [{ name: form.value.originalName, status: 'ready', uid: form.value.id }]
-    }
-    dialogVisible.value = true
-}
-const handleClose = () => {
-    elform.value.resetFields()
-    dialogVisible.value = false
-}
-
-defineExpose({ open })
-</script>
-<style lang="scss" scoped>
-:deep(.el-upload-list__item) {
-    width: 400px;
-}
-</style>
+<template>
+    <el-dialog draggable v-model="dialogVisible" :title="title" style="width: 800px" :before-close="handleClose">
+        <el-form :model="form" :rules="rules" class="form-two" ref="elform" label-width="120px">
+            <el-form-item label="终端编号:" prop="id">
+                <el-input
+                    clearable
+                    :disabled="title == `编辑`"
+                    v-model="form.id"
+                    placeholder="请输入终端编号"
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="终端名称:" prop="name">
+                <el-input clearable v-model="form.name" placeholder="请输入终端名称"></el-input>
+            </el-form-item>
+            <el-form-item label="送检单位:" prop="inspectionUnit">
+                <el-input clearable v-model="form.inspectionUnit" placeholder="请输入送检单位"></el-input>
+            </el-form-item>
+            <el-form-item label="检测时间:" prop="inspectionTime">
+                <el-date-picker
+                    v-model="form.inspectionTime"
+                    type="date"
+                    value-format="YYYY-MM-DD"
+                    placeholder="选择日期"
+                ></el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="安装位置:" prop="installPlace">
+                <el-input clearable v-model="form.installPlace" placeholder="请输入安装位置"></el-input>
+            </el-form-item>
+            <el-form-item label="生产厂家:" prop="manufacture">
+                <el-select v-model="form.manufacture" placeholder="请选择生产厂家" clearable class="select" filterable>
+                    <el-option
+                        v-for="item in manufactorList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="原始数据报告:">
+                <el-upload
+                    v-model:file-list="form.fileList"
+                    ref="uploadRef"
+                    action=""
+                    accept=".doc,.docx"
+                    :limit="1"
+                    :on-exceed="handleExceed"
+                    :on-change="choose"
+                    :auto-upload="false"
+                >
+                    <template #trigger>
+                        <el-button type="primary">上传文件</el-button>
+                    </template>
+                </el-upload>
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="handleClose">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import { upload, insertTerminal, updateTerminal } from '@/api/process-boot/terminal'
+import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
+
+import { genFileId, ElMessage } from 'element-plus'
+const emit = defineEmits(['onsubmit'])
+const dictData = useDictData()
+const manufactorList = dictData.getBasicData('Dev_Manufacturers')
+const dialogVisible = ref(false)
+const title: any = ref('')
+const form: any = ref({
+    id: '',
+    inspectionUnit: '',
+    inspectionTime: '',
+    installPlace: '',
+    originalReport: '',
+    manufacture: '',
+    name: '',
+    originalName: '',
+    orgNo: dictData.state.area[0].id,
+    orgName: dictData.state.area[0].name,
+    fileList: []
+})
+const elform = ref()
+const uploadRef = ref()
+const rules = {
+    id: [{ required: true, message: '请输入终端编号', trigger: 'blur' }],
+    name: [{ required: true, message: '请输入终端名称', trigger: 'blur' }],
+    installPlace: [{ required: true, message: '请输入安装位置', trigger: 'blur' }],
+    inspectionUnit: [{ required: true, message: '请输入送检单位', trigger: 'blur' }],
+    inspectionTime: [{ required: true, message: '请选择时间', trigger: 'change' }],
+    manufacture: [{ required: true, message: '请选择生产厂家', trigger: 'change' }],
+    fileList: [{ required: true, message: '请选择文件', trigger: 'change' }]
+}
+const submit = () => {
+    elform.value.validate((valid: any) => {
+        if (title.value == '新增') {
+            insertTerminal(form.value).then(res => {
+                ElMessage.success('新增成功!')
+                handleClose()
+                emit('onsubmit')
+            })
+        } else {
+            updateTerminal(form.value).then(res => {
+                ElMessage.success('修改成功!')
+                handleClose()
+                emit('onsubmit')
+            })
+        }
+    })
+}
+
+// 上传报告
+const handleExceed: UploadProps['onExceed'] = files => {
+    uploadRef.value!.clearFiles()
+    const file = files[0] as UploadRawFile
+    file.uid = genFileId()
+    uploadRef.value!.handleStart(file)
+}
+const choose = (e: any) => {
+    upload(e.raw).then(res => {
+        form.value.originalReport = res.data
+        form.value.originalName = e.name
+    })
+}
+
+const open = (row: any) => {
+    title.value = row.title
+    if (row.title == '编辑') {
+        row.row ? (form.value = JSON.parse(JSON.stringify(row.row))) : ''
+        form.value.orgNo = dictData.state.area[0].id
+        form.value.fileList = [{ name: form.value.originalName, status: 'ready', uid: form.value.id }]
+    }
+    dialogVisible.value = true
+}
+const handleClose = () => {
+    elform.value.resetFields()
+    dialogVisible.value = false
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+</style>
diff --git a/src/views/pqs/supervise/terminal/components/cycleTab.vue b/src/views/pqs/supervise/terminal/components/cycleTab.vue
index 23382e81..b2c538bf 100644
--- a/src/views/pqs/supervise/terminal/components/cycleTab.vue
+++ b/src/views/pqs/supervise/terminal/components/cycleTab.vue
@@ -18,6 +18,7 @@
                             collapse-tags
                             clearable
                             class="select"
+                            filterable
                         >
                             <el-option
                                 v-for="item in manufactorList"
@@ -34,6 +35,7 @@
                             placeholder="请选择检测结果"
                             clearable
                             class="select"
+                            filterable
                         >
                             <el-option
                                 v-for="item in testResultsList"
diff --git a/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue b/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue
index f73104a4..fd1c5992 100644
--- a/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue
+++ b/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue
@@ -3,7 +3,7 @@
         <TableHeader area ref="TableHeaderRef" showExport showCustomColumn>
             <template #select>
                 <el-form-item label="运行状态">
-                    <el-select v-model="tableStore.table.params.runF" clearable placeholder="请选择运行状态">
+                    <el-select v-model="tableStore.table.params.runF" clearable placeholder="请选择运行状态" filterable>
                         <el-option
                             v-for="item in runFlagList"
                             :key="item.id"
@@ -13,7 +13,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="通讯状态">
-                    <el-select v-model="tableStore.table.params.comF" clearable placeholder="请选择通讯状态">
+                    <el-select v-model="tableStore.table.params.comF" clearable placeholder="请选择通讯状态" filterable>
                         <el-option
                             v-for="item in comFlagList"
                             :key="item.id"
diff --git a/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue b/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue
index 479d8b44..4d7f1aaf 100644
--- a/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue
+++ b/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue
@@ -7,7 +7,7 @@
                         clearable maxlength="32" show-word-limit></el-input>
                 </el-form-item>
                 <el-form-item label="所在地市">
-                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
+                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市" filterable>
                         <el-option v-for="item in areaOptionList" :key="item.id" :label="item.name"
                             :value="item.name"></el-option>
                     </el-select>
diff --git a/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue b/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue
index 03de0d48..50556592 100644
--- a/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue
+++ b/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue
@@ -3,7 +3,7 @@
         <TableHeader area ref="TableHeaderRef" showExport showCustomColumn>
             <template #select>
                 <el-form-item label="运行状态">
-                    <el-select v-model="tableStore.table.params.runF" clearable placeholder="请选择运行状态">
+                    <el-select v-model="tableStore.table.params.runF" clearable placeholder="请选择运行状态" filterable>
                         <el-option
                             v-for="item in runFlagList"
                             :key="item.id"
@@ -25,12 +25,13 @@
                 <el-form-item label="电压等级:">
                     <el-select
                         v-model="tableStore.table.params.scale"
-                        filterable
+                        
                         multiple
                         collapse-tags
                         clearable
                         placeholder="请选择电压等级"
                         value-key="id"
+                        filterable
                     >
                         <el-option
                             v-for="item in voltageleveloption"
diff --git a/src/views/pqs/supervise/terminal/components/networkTab.vue b/src/views/pqs/supervise/terminal/components/networkTab.vue
index c0ea2cd5..e14ded82 100644
--- a/src/views/pqs/supervise/terminal/components/networkTab.vue
+++ b/src/views/pqs/supervise/terminal/components/networkTab.vue
@@ -18,6 +18,7 @@
                             collapse-tags
                             clearable
                             class="select"
+                            filterable
                         >
                             <el-option
                                 v-for="item in manufactorList"
@@ -34,6 +35,7 @@
                             placeholder="请选择检测结果"
                             clearable
                             class="select"
+                            filterable
                         >
                             <el-option
                                 v-for="item in testResultsList"
diff --git a/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue b/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue
index f5586e86..0ba87b9c 100644
--- a/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue
+++ b/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue
@@ -7,7 +7,7 @@
                         clearable maxlength="32" show-word-limit></el-input>
                 </el-form-item>
                 <el-form-item label="所在地市">
-                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
+                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市" filterable>
                         <el-option v-for="item in areaOptionList" :key="item.id" :label="item.name"
                             :value="item.name"></el-option>
                     </el-select>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue
index 50f6ba71..926e0c81 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue
@@ -12,7 +12,7 @@
         ></el-input>
       </el-form-item>
       <el-form-item label='流程状态'>
-        <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择流程状态'>
+        <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择流程状态' filterable>
           <el-option
               v-for='item in statusSelect'
               :key='item.id'
@@ -22,7 +22,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label='处理状态'>
-        <el-select v-model='tableStore.table.params.state' clearable placeholder='请选处理状态'>
+        <el-select v-model='tableStore.table.params.state' clearable placeholder='请选处理状态' filterable>
           <el-option
               v-for='item in stateSelect'
               :key='item.id'
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
index 5ac09c29..43ecf31f 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
@@ -7,7 +7,7 @@
                     clearable style="width: 250px" maxlength="32" show-word-limit></el-input>
             </el-form-item>
             <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态" filterable>
                     <el-option v-for="item in statusSelect" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
index f3239c2d..60ce45c0 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/addForm.vue
@@ -30,27 +30,27 @@
                     placeholder="请选择工程投产日期" />
             </el-form-item>
             <el-form-item v-if="false" for="-" label="所在地市：" prop="city">
-                <el-select v-model="form.city" clearable style="width: 100%" :disabled="true" placeholder="请选择所在地市">
+                <el-select v-model="form.city" clearable style="width: 100%" :disabled="true" placeholder="请选择所在地市" filterable>
                     <el-option v-for="item in areaOptionList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item v-if="false" for="-" label="用户状态：" prop="userStatus">
-                <el-select v-model="form.userStatus" placeholder="请选择用户状态" :disabled="true" style="width: 100%">
+                <el-select v-model="form.userStatus" placeholder="请选择用户状态" :disabled="true" style="width: 100%" filterable>
                     <el-option v-for="(item, index) in userStateList" :label="item.name" :value="item.id"
                         :disabled="item.name != '建设'" :key="index" />
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="关联干扰源：" prop="userName">
                 <el-select v-model="form.userName" clearable style="width: 100%" placeholder="请选择关联干扰源"
-                    @change="changeUserName">
+                    @change="changeUserName" filterable>
                     <el-option v-for="(item, index) in userNameList" :key="index" :label="item.projectName"
                         :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="关联终端：" prop="monitoringTerminalCode">
                 <el-select v-model="form.monitoringTerminalCode" clearable style="width: 100%" filterable
-                    placeholder="请选择关联终端" @change="changeDevice">
+                    placeholder="请选择关联终端" @change="changeDevice" >
                     <el-option v-for="(item, index) in monitoringTerminalList" :key="index"
                         :label="item.monitoringTerminalCode" :value="item.id"></el-option>
                 </el-select>
@@ -59,7 +59,7 @@
                 <el-input v-model="form.connectedBus" autocomplete="off" placeholder="请输入接入母线 如：110kV4母线" />
             </el-form-item>
             <el-form-item for="-" label="监测点运行状态：" prop="operationStatus">
-                <el-select v-model="form.operationStatus" placeholder="请选择运行状态">
+                <el-select v-model="form.operationStatus" placeholder="请选择运行状态" filterable>
                     <el-option v-for="(item, index) in operationStatusList" :label="item.name" :value="item.id"
                         :key="index" />
                 </el-select>
@@ -69,8 +69,8 @@
             </el-form-item>
             <!-- {{ voltageLevelList[2].value * 10 }}:{{ 1 }} -->
             <el-form-item for="-" label="监测点电压等级：" prop="voltageLevel">
-                <el-select v-model="form.voltageLevel" clearable style="width: 100%" placeholder="请选择监测点电压等级" filterable
-                    @change="changevoltageDeviationLimit">
+                <el-select v-model="form.voltageLevel" clearable style="width: 100%" placeholder="请选择监测点电压等级" 
+                    @change="changevoltageDeviationLimit" filterable>
                     <el-option v-for="item in voltageLevelList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
@@ -117,25 +117,25 @@
                 </el-input>
             </el-form-item>
             <el-form-item for="-" label="干扰源类型：" prop="loadType">
-                <el-select v-model="form.loadType" style="width: 100%" placeholder="请选择干扰源类型" @change="changeLoadType">
+                <el-select v-model="form.loadType" style="width: 100%" placeholder="请选择干扰源类型" @change="changeLoadType" filterable>
                     <el-option v-for="item in loadTypeList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="干扰源类别：" prop="businessType">
-                <el-select v-model="form.businessType" style="width: 100%" placeholder="请选择干扰源类别">
+                <el-select v-model="form.businessType" style="width: 100%" placeholder="请选择干扰源类别" filterable>
                     <el-option v-for="item in businessTypeList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="接线方式：">
-                <el-select v-model="form.ptType" clearable style="width: 100%" placeholder="请选择接线方式">
+                <el-select v-model="form.ptType" clearable style="width: 100%" placeholder="请选择接线方式" filterable>
                     <el-option v-for="item in ptTypeList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="线路号：">
-                <el-select v-model="form.num" clearable style="width: 100%" placeholder="请选择线路号">
+                <el-select v-model="form.num" clearable style="width: 100%" placeholder="请选择线路号" filterable>
                     <el-option v-for="item in numList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
@@ -146,7 +146,7 @@
                 <el-input-number style="width: 100%" v-model="form.voltageDeviationLowerLimit" />
             </el-form-item>
             <el-form-item for="-" label="测量间隔：" prop="timeInterval">
-                <el-select v-model="form.timeInterval" placeholder="请选择测量间隔">
+                <el-select v-model="form.timeInterval" placeholder="请选择测量间隔" filterable>
                     <el-option v-for="(item, index) in timeIntervalList" :label="item.name" :value="item.id"
                         :key="index" />
                 </el-select>
@@ -155,7 +155,7 @@
                 <el-input v-model="form.lineId" autocomplete="off" placeholder="请输入上送网公司编码"  clearable maxlength="32" show-word-limit/>
             </el-form-item>
             <el-form-item for="-" label="监测点性质：" prop="pointNature">
-                <el-select v-model="form.pointNature" placeholder="请选择监测点性质">
+                <el-select v-model="form.pointNature" placeholder="请选择监测点性质" filterable>
                     <el-option v-for="(item, index) in pointNatureList" :label="item.name" :value="item.id"
                         :key="index" />
                 </el-select>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
index dafcb764..fbf785b3 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
@@ -7,7 +7,7 @@
                     clearable style="width: 280px" maxlength="32" show-word-limit></el-input>
             </el-form-item>
             <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态" filterable>
                     <el-option v-for="item in statusSelect" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
index 0e2ef41a..a616b3d6 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/addForm.vue
@@ -27,7 +27,7 @@
                     format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择工程投产日期" />
             </el-form-item>
             <el-form-item for="-" label="所在地市：" prop="city">
-                <el-select v-model="form.city" clearable style="width: 100%" placeholder="请选择所在地市">
+                <el-select v-model="form.city" clearable style="width: 100%" placeholder="请选择所在地市" filterable>
                     <el-option v-for="item in areaOptionList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
@@ -87,14 +87,14 @@
             </el-form-item>
             <el-form-item for="-" label="所属供电公司：" prop="powerCompany">
                 <el-select v-model="form.powerCompany" clearable style="width: 100%" placeholder="请选择所属供电公司"
-                    @change="findSubstationVoltageLevel">
+                    @change="findSubstationVoltageLevel" filterable>
                     <el-option v-for="item in powerCompanyList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item for="-" v-if="form.customSubstationFlag == 0" label="并网变电站：" prop="substation">
                 <el-select v-model="form.substation" clearable style="width: 100%" placeholder="请选择并网变电站" filterable
-                    @change="changeSubstation">
+                    @change="changeSubstation" >
                     <el-option v-for="item in substationList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
@@ -103,7 +103,7 @@
                 <el-input v-model="form.substationName" autocomplete="off" placeholder="请输入并网变电站" />
             </el-form-item>
             <el-form-item for="-" label="变电站电压等级：" prop="substationVoltageLevel">
-                <el-select v-model="form.substationVoltageLevel" clearable style="width: 100%" placeholder="请选择变压站电压等级">
+                <el-select v-model="form.substationVoltageLevel" clearable style="width: 100%" placeholder="请选择变压站电压等级" filterable>
                     <el-option v-for="item in voltageLevelList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
@@ -117,7 +117,7 @@
                     placeholder="请输入纬度" />
             </el-form-item>
             <el-form-item for="-" label="终端型号：" prop="terminalType">
-                <el-select v-model="form.terminalType" filterable clearable style="width: 100%" placeholder="请选择终端型号">
+                <el-select v-model="form.terminalType" filterable clearable style="width: 100%" placeholder="请选择终端型号" >
                     <el-option v-for="item in terminalTypeList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
@@ -127,7 +127,7 @@
                 <el-input v-model="form.monitoringTerminalName" autocomplete="off" placeholder="请输入终端名称" maxlength="32" show-word-limit clearable/>
             </el-form-item>
             <el-form-item for="-" label="通讯类型：">
-                <el-select v-model="form.frontType" clearable style="width: 100%" placeholder="请选择通讯类型">
+                <el-select v-model="form.frontType" clearable style="width: 100%" placeholder="请选择通讯类型" filterable>
                     <el-option v-for="item in frontTypeList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
@@ -138,7 +138,7 @@
             </el-form-item>
             <el-form-item v-if="false" for="-" label="通讯状态：" prop="communicationStatus">
                 <el-select v-model="form.communicationStatus" clearable style="width: 100%" placeholder="请选择通讯状态"
-                    :disabled="true">
+                    :disabled="true" filterable>
                     <el-option v-for="item in communicationStatusList" :key="item.id" :label="item.name"
                         :value="item.id" :disabled="item.id == '1'"></el-option>
                 </el-select>
@@ -160,7 +160,7 @@
                     placeholder="请选择数据更新时间" />
             </el-form-item>
             <el-form-item for="-" label="所属前置机：" prop="frontEndMachine">
-                <el-select v-model="form.frontEndMachine" clearable style="width: 100%" placeholder="请选择所属前置机">
+                <el-select v-model="form.frontEndMachine" clearable style="width: 100%" placeholder="请选择所属前置机" filterable>
                     <el-option v-for="item in frontEndMachineList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
@@ -168,7 +168,7 @@
             <el-form-item for="-" label="监测终端安装位置：" prop="monitoringDeviceInstallationPosition" class="label_over_warp">
                 <!-- 电网侧、用户侧 -->
                 <el-select v-model="form.monitoringDeviceInstallationPosition" clearable style="width: 100%"
-                    placeholder="请选择监测终端安装位置" >
+                    placeholder="请选择监测终端安装位置" filterable>
                     <el-option v-for="item in monitoringDeviceInstallationPositionList" :key="item.id"
                         :label="item.name" :value="item.id"></el-option>
                 </el-select>
@@ -180,26 +180,26 @@
                 <el-input v-model="form.terminalSecretKey" autocomplete="off" placeholder="请输入终端秘钥" />
             </el-form-item>
             <el-form-item for="-" label="终端模型：" prop="terminalModel">
-                <el-select v-model="form.terminalModel" clearable style="width: 100%" placeholder="请选择终端模型">
+                <el-select v-model="form.terminalModel" clearable style="width: 100%" placeholder="请选择终端模型" filterable>
                     <el-option v-for="item in terminalModelList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="数据类型：" prop="dataType">
-                <el-select v-model="form.dataType" clearable style="width: 100%" placeholder="请选择数据类型">
+                <el-select v-model="form.dataType" clearable style="width: 100%" placeholder="请选择数据类型" filterable>
                     <el-option v-for="item in dataTypeList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="终端接线方式类型：" prop="terminalWiringMethodType" class="label_over_warp">
                 <el-select v-model="form.terminalWiringMethodType" clearable style="width: 100%"
-                    placeholder="请选择终端接线方式类型">
+                    placeholder="请选择终端接线方式类型" filterable>
                     <el-option v-for="item in terminalWiringMethodTypeList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="厂家：" prop="manufacturer">
-                <el-select v-model="form.manufacturer" clearable style="width: 100%" placeholder="请选择厂家">
+                <el-select v-model="form.manufacturer" clearable style="width: 100%" placeholder="请选择厂家" filterable>
                     <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
@@ -214,14 +214,14 @@
             </el-form-item>
 
             <el-form-item for="-" label="电压互感器类型：" prop="voltageTransformerType">
-                <el-select v-model="form.voltageTransformerType" clearable style="width: 100%" placeholder="请选择电压互感器类型">
+                <el-select v-model="form.voltageTransformerType" clearable style="width: 100%" placeholder="请选择电压互感器类型" filterable>
                     <el-option v-for="item in voltageTransformerTypeList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="中性点接线方式：" prop="neutralPointWiringMethod">
                 <el-select v-model="form.neutralPointWiringMethod" clearable style="width: 100%"
-                    placeholder="请选择中性点接线方式">
+                    placeholder="请选择中性点接线方式" filterable>
                     <el-option v-for="item in neutralPointWiringMethodList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
@@ -242,13 +242,13 @@
             </el-form-item>
             <el-form-item for="-" label="电度功能：" prop="electroplatingFunction">
                 <!-- 默认 关闭 下拉框 -->
-                <el-select v-model="form.electroplatingFunction" clearable style="width: 100%" placeholder="请选择电度功能">
+                <el-select v-model="form.electroplatingFunction" clearable style="width: 100%" placeholder="请选择电度功能" filterable>
                     <el-option v-for="item in electroplatingFunctionList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item for="-" label="召唤标志：" prop="summonFlag">
-                <el-select v-model="form.summonFlag" clearable style="width: 100%" placeholder="请选择召唤标志">
+                <el-select v-model="form.summonFlag" clearable style="width: 100%" placeholder="请选择召唤标志" filterable>
                     <el-option v-for="item in summonFlagList" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
index 70203ba8..bf101809 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
@@ -6,7 +6,7 @@
                     clearable style="width: 220px" maxlength="32" show-word-limit></el-input>
             </el-form-item>
             <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态" filterable>
                     <el-option v-for="item in statusSelect" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select>
diff --git a/src/views/pqs/supervise/testRun/index.vue b/src/views/pqs/supervise/testRun/index.vue
index e7099afe..3632ef74 100644
--- a/src/views/pqs/supervise/testRun/index.vue
+++ b/src/views/pqs/supervise/testRun/index.vue
@@ -6,7 +6,7 @@
                 <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showCustomColumn>
                     <template #select>
                         <el-form-item label="流程状态">
-                            <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                            <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态" filterable>
                                 <el-option
                                     v-for="item in statusSelect"
                                     :key="item.id"
diff --git a/src/views/pqs/task/myTask/index.vue b/src/views/pqs/task/myTask/index.vue
index d27e231f..b1a58d1c 100644
--- a/src/views/pqs/task/myTask/index.vue
+++ b/src/views/pqs/task/myTask/index.vue
@@ -7,7 +7,7 @@
                     <el-input v-model='tableStore.table.params.name' clearable placeholder='流程名称' />
                 </el-form-item>
                 <el-form-item label='流程分类'>
-                    <el-select v-model="tableStore.table.params.searchState" clearable placeholder="请选择流程分类">
+                    <el-select v-model="tableStore.table.params.searchState" clearable placeholder="请选择流程分类" filterable>
                         <el-option v-for="item in categoryList" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
diff --git a/src/views/pqs/voltageSags/Region/distribution/index.vue b/src/views/pqs/voltageSags/Region/distribution/index.vue
index 9b9b671c..0fc99985 100644
--- a/src/views/pqs/voltageSags/Region/distribution/index.vue
+++ b/src/views/pqs/voltageSags/Region/distribution/index.vue
@@ -1,313 +1,314 @@
-<template>
-    <div class="default-main">
-        <TableHeader area ref="header">
-            <template v-slot:select>
-                <el-form-item label="统计类型">
-                    <el-select
-                        v-model="tableStore.table.params.statisticalType"
-                        value-key="id"
-                        placeholder="请选择统计类型"
-                    >
-                        <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
-                    </el-select>
-                </el-form-item>
-            </template>
-        </TableHeader>
-        <div v-loading="tableStore.table.loading" class="pr10">
-            <el-row>
-                <el-col :span="12">
-                    <MyEchartMap
-                        ref="EchartMap"
-                        :options="echartMapList"
-                        class="map"
-                        @eliminate="eliminate"
-                        @getRegionByRegion="getRegionByRegion"
-                    />
-                </el-col>
-                <el-col :span="12">
-                    <my-echart class="tall" :options="echartList" />
-                    <div class="tall">
-                        <vxe-table height="auto" auto-resize :data="distributionData" v-bind="defaultAttribute">
-                            >
-                            <vxe-column
-                                field="qy"
-                                :title="
-                                    titleA == '电压等级'
-                                        ? '电压等级'
-                                        : titleA == '终端厂家'
-                                        ? '终端厂家'
-                                        : titleA == '干扰源类型'
-                                        ? '干扰源类型'
-                                        : titleA == '电网拓扑'
-                                        ? '区域'
-                                        : ''
-                                "
-                                show-overflow-tooltip
-                            ></vxe-column>
-                            <vxe-column field="jcd" title="监测点数(个数)"></vxe-column>
-                            <vxe-column field="zc" title="通讯正常(个数)" sortable></vxe-column>
-                            <vxe-column field="zd" title="通讯中断(个数)" sortable></vxe-column>
-                        </vxe-table>
-                    </div>
-                </el-col>
-            </el-row>
-        </div>
-    </div>
-</template>
-<script setup lang="ts">
-import TableHeader from '@/components/table/header/index.vue'
-
-import { useDictData } from '@/stores/dictData'
-import { defaultAttribute } from '@/components/table/defaultAttribute'
-import MyEchartMap from '@/components/echarts/MyEchartMap.vue'
-import MyEchart from '@/components/echarts/MyEchart.vue'
-import TableStore from '@/utils/tableStore'
-import { ref, onMounted, provide } from 'vue'
-import { mainHeight } from '@/utils/layout'
-defineOptions({
-    name: 'Region/distribution'
-})
-const EchartMap = ref()
-const dictData = useDictData()
-const options = dictData.getBasicData('Statistical_Type', ['Report_Type'])
-const echartMapList: any = ref({})
-const echartList = ref({})
-const titleA = ref('')
-const header = ref()
-const distributionData: any = ref([])
-
-const tableStore = new TableStore({
-    url: '/event-boot/area/getAreaLineDetail',
-    method: 'POST',
-    column: [],
-    loadCallback: () => {
-        titleA.value = tableStore.table.params.statisticalType.name
-        header.value.areaRef.change()
-        // 处理地图数据
-        map(tableStore.table.data)
-        tabulation(tableStore.table.data)
-        histogram(tableStore.table.data)
-        EchartMap.value.GetEchar(header.value.areaRef.areaName)
-    }
-})
-provide('tableStore', tableStore)
-
-// tableStore.table.params.deptIndex = dictData.state.area[0].id
-tableStore.table.params.statisticalType = dictData.getBasicData('Statistical_Type', ['Report_Type'])[0]
-tableStore.table.params.monitorFlag = 2
-tableStore.table.params.powerFlag = 2
-tableStore.table.params.serverName = 'event-boot'
-
-// 地图点击事件
-const getRegionByRegion = (list: any) => {
-    tableStore.table.params.deptIndex = list.id
-    tableStore.onTableAction('search', {})
-}
-// 消除点
-const eliminate = (name: string) => {
-    echartMapList.value.options.series = []
-    EchartMap.value.GetEchar(name)
-}
-
-// 地图数处理
-const map = (res: any) => {
-    echartMapList.value = {
-        name: '',
-        title: {
-            text: '监测网分布' //+ "(" + _this.titles + ")",
-        },
-        tooltip: {
-            formatter: function (params: any) {
-                //console.log(params)
-                var tips = ''
-                if (params.value == 0) {
-                    tips = "<font style='color: #000'>暂无数据</font><br/>"
-                } else {
-                    tips +=
-                        "<font style='color: #000'> " +
-                        params.name +
-                        '</font><br/>区域暂降评估' +
-                        "<font style='color: #000'>:" +
-                        params.value +
-                        '</font><br/>'
-                }
-                return tips
-            }
-        },
-        color: ['green', 'red'],
-        legend: {
-            selectedMode: false,
-            data: [
-                {
-                    name: '正常'
-                },
-                {
-                    name: '中断'
-                }
-            ]
-        },
-        options: {
-            series: []
-        }
-    }
-    let mapList: any = [[], [], []]
-    if (res.substationDetailVOList != null) {
-        res.substationDetailVOList.forEach((item: any) => {
-            if (item.color == 'green') {
-                mapList[0].push(item)
-            } else if (item.color == 'red') {
-                mapList[1].push(item)
-            }
-        })
-    }
-    mapList.forEach((item: any, ind: number) => {
-        echartMapList.value.options.series.push({
-            type: 'scatter',
-            mapName: 'china',
-            name: ind == 0 ? '正常' : ind == 1 ? '中断' : '变电站',
-            coordinateSystem: 'geo',
-            geoIndex: 0,
-            animation: false, //坐标点是否显示动画
-            roam: true,
-            symbol: 'pin',
-            symbolSize: function () {
-                //坐标点大小
-                return 30
-            },
-            label: {
-                normal: {
-                    show: false
-                },
-                emphasis: {
-                    show: false
-                }
-            },
-            data: item.map(function (itemOpt: any) {
-                // console.log(itemOpt);
-                return {
-                    name: itemOpt.srbName,
-                    value: [
-                        parseFloat(itemOpt.coordY), //经度
-                        parseFloat(itemOpt.coordX) //维度
-                    ],
-
-                    itemStyle: {
-                        //地图区域的多边形
-                        normal: {
-                            color: itemOpt.color, //坐标点颜色
-                            shadowBlur: 0, // 图形阴影的模糊大小
-                            shadowOffsetX: 0 // 阴影水平方向上的偏移距离。
-                        }
-                    },
-                    tooltip: {
-                        //仅在 options中最外层的 tooltip.trigger 为 'item'时有效
-                        position: 'bottom', //提示框位置,仅在 options中最外层的 tooltip.trigger 为 'item'时有效
-                        formatter: function (params: any, ticket: any, callback: any) {
-                            var strHtml = '<div>变电站(场站):' + itemOpt.subName + '<br/>' + '监测点:' + itemOpt.srbName
-
-                            strHtml += '</div>'
-                            return strHtml
-                        }
-                    }
-                }
-            })
-        })
-    })
-}
-
-// 表格数据处理
-const tabulation = (res: any) => {
-    distributionData.value = []
-    for (var i = 0; i < res.areaValue.length; i++) {
-        distributionData.value.push({
-            qy: res.areaValue[i][0],
-            jcd: res.areaValue[i][1],
-            zc: res.areaValue[i][2],
-            zd: res.areaValue[i][3]
-        })
-    }
-}
-// 柱状图数据处理
-const histogram = (res: any) => {
-    echartList.value = {
-        title: {
-            text:
-                titleA.value == '电压等级'
-                    ? '电压等级'
-                    : titleA.value == '终端厂家'
-                    ? '终端厂家'
-                    : titleA.value == '干扰源类型'
-                    ? '干扰源类型'
-                    : titleA.value == '电网拓扑'
-                    ? header.value.areaRef.areaName
-                    : '' // 给X轴加单位
-        },
-        tooltip: {
-            formatter: function (params: any) {
-                // console.log(params);
-                var tips = ''
-                for (var i = 0; i < params.length; i++) {
-                    tips += params[i].name + '</br/>'
-                    tips += '监测点数' + ':' + '&nbsp' + '&nbsp' + params[i].value + '</br/>'
-                }
-                return tips
-            }
-        },
-
-        xAxis: {
-            name:
-                titleA.value == '电压等级'
-                    ? '(电压\n等级)'
-                    : titleA.value == '终端厂家'
-                    ? '(终端\n厂家)'
-                    : titleA.value == '干扰源类型'
-                    ? '(干扰\n源类型)'
-                    : titleA.value == '电网拓扑'
-                    ? '(区域)'
-                    : '', // 给X轴加单位
-            data: distributionData.value.map((item: any) => item.qy)
-        },
-        yAxis: {
-            name: '监测点数（个）' // 给X轴加单位
-        },
-        options: {
-            series: [
-                {
-                    //   name: '暂降次数',
-                    type: 'bar',
-                    data: distributionData.value.map((item: any) => item.jcd),
-                    barMaxWidth: 30,
-                    itemStyle: {
-                        normal: {
-                            color: '#07CCCA'
-                        }
-                    },
-                    label: {
-                        show: true,
-                        position: 'top',
-                        textStyle: {
-                            //数值样式
-                            color: '#000'
-                        },
-                        fontSize: 12
-                    }
-                }
-            ]
-        }
-    }
-}
-
-onMounted(() => {
-    tableStore.index()
-})
-const layout = mainHeight(83) as any
-const layout1 = mainHeight(93) as any
-</script>
-<style lang="scss" scoped>
-.map {
-    height: v-bind('layout.height');
-}
-.tall {
-    height: calc(v-bind('layout1.height') / 2);
-}
-</style>
+<template>
+    <div class="default-main">
+        <TableHeader area ref="header">
+            <template v-slot:select>
+                <el-form-item label="统计类型">
+                    <el-select
+                        v-model="tableStore.table.params.statisticalType"
+                        value-key="id"
+                        placeholder="请选择统计类型"
+                        filterable
+                    >
+                        <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
+                    </el-select>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <div v-loading="tableStore.table.loading" class="pr10">
+            <el-row>
+                <el-col :span="12">
+                    <MyEchartMap
+                        ref="EchartMap"
+                        :options="echartMapList"
+                        class="map"
+                        @eliminate="eliminate"
+                        @getRegionByRegion="getRegionByRegion"
+                    />
+                </el-col>
+                <el-col :span="12">
+                    <my-echart class="tall" :options="echartList" />
+                    <div class="tall">
+                        <vxe-table height="auto" auto-resize :data="distributionData" v-bind="defaultAttribute">
+                            >
+                            <vxe-column
+                                field="qy"
+                                :title="
+                                    titleA == '电压等级'
+                                        ? '电压等级'
+                                        : titleA == '终端厂家'
+                                        ? '终端厂家'
+                                        : titleA == '干扰源类型'
+                                        ? '干扰源类型'
+                                        : titleA == '电网拓扑'
+                                        ? '区域'
+                                        : ''
+                                "
+                                show-overflow-tooltip
+                            ></vxe-column>
+                            <vxe-column field="jcd" title="监测点数(个数)"></vxe-column>
+                            <vxe-column field="zc" title="通讯正常(个数)" sortable></vxe-column>
+                            <vxe-column field="zd" title="通讯中断(个数)" sortable></vxe-column>
+                        </vxe-table>
+                    </div>
+                </el-col>
+            </el-row>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import TableHeader from '@/components/table/header/index.vue'
+
+import { useDictData } from '@/stores/dictData'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import MyEchartMap from '@/components/echarts/MyEchartMap.vue'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import TableStore from '@/utils/tableStore'
+import { ref, onMounted, provide } from 'vue'
+import { mainHeight } from '@/utils/layout'
+defineOptions({
+    name: 'Region/distribution'
+})
+const EchartMap = ref()
+const dictData = useDictData()
+const options = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+const echartMapList: any = ref({})
+const echartList = ref({})
+const titleA = ref('')
+const header = ref()
+const distributionData: any = ref([])
+
+const tableStore = new TableStore({
+    url: '/event-boot/area/getAreaLineDetail',
+    method: 'POST',
+    column: [],
+    loadCallback: () => {
+        titleA.value = tableStore.table.params.statisticalType.name
+        header.value.areaRef.change()
+        // 处理地图数据
+        map(tableStore.table.data)
+        tabulation(tableStore.table.data)
+        histogram(tableStore.table.data)
+        EchartMap.value.GetEchar(header.value.areaRef.areaName)
+    }
+})
+provide('tableStore', tableStore)
+
+// tableStore.table.params.deptIndex = dictData.state.area[0].id
+tableStore.table.params.statisticalType = dictData.getBasicData('Statistical_Type', ['Report_Type'])[0]
+tableStore.table.params.monitorFlag = 2
+tableStore.table.params.powerFlag = 2
+tableStore.table.params.serverName = 'event-boot'
+
+// 地图点击事件
+const getRegionByRegion = (list: any) => {
+    tableStore.table.params.deptIndex = list.id
+    tableStore.onTableAction('search', {})
+}
+// 消除点
+const eliminate = (name: string) => {
+    echartMapList.value.options.series = []
+    EchartMap.value.GetEchar(name)
+}
+
+// 地图数处理
+const map = (res: any) => {
+    echartMapList.value = {
+        name: '',
+        title: {
+            text: '监测网分布' //+ "(" + _this.titles + ")",
+        },
+        tooltip: {
+            formatter: function (params: any) {
+                //console.log(params)
+                var tips = ''
+                if (params.value == 0) {
+                    tips = "<font style='color: #000'>暂无数据</font><br/>"
+                } else {
+                    tips +=
+                        "<font style='color: #000'> " +
+                        params.name +
+                        '</font><br/>区域暂降评估' +
+                        "<font style='color: #000'>:" +
+                        params.value +
+                        '</font><br/>'
+                }
+                return tips
+            }
+        },
+        color: ['green', 'red'],
+        legend: {
+            selectedMode: false,
+            data: [
+                {
+                    name: '正常'
+                },
+                {
+                    name: '中断'
+                }
+            ]
+        },
+        options: {
+            series: []
+        }
+    }
+    let mapList: any = [[], [], []]
+    if (res.substationDetailVOList != null) {
+        res.substationDetailVOList.forEach((item: any) => {
+            if (item.color == 'green') {
+                mapList[0].push(item)
+            } else if (item.color == 'red') {
+                mapList[1].push(item)
+            }
+        })
+    }
+    mapList.forEach((item: any, ind: number) => {
+        echartMapList.value.options.series.push({
+            type: 'scatter',
+            mapName: 'china',
+            name: ind == 0 ? '正常' : ind == 1 ? '中断' : '变电站',
+            coordinateSystem: 'geo',
+            geoIndex: 0,
+            animation: false, //坐标点是否显示动画
+            roam: true,
+            symbol: 'pin',
+            symbolSize: function () {
+                //坐标点大小
+                return 30
+            },
+            label: {
+                normal: {
+                    show: false
+                },
+                emphasis: {
+                    show: false
+                }
+            },
+            data: item.map(function (itemOpt: any) {
+                // console.log(itemOpt);
+                return {
+                    name: itemOpt.srbName,
+                    value: [
+                        parseFloat(itemOpt.coordY), //经度
+                        parseFloat(itemOpt.coordX) //维度
+                    ],
+
+                    itemStyle: {
+                        //地图区域的多边形
+                        normal: {
+                            color: itemOpt.color, //坐标点颜色
+                            shadowBlur: 0, // 图形阴影的模糊大小
+                            shadowOffsetX: 0 // 阴影水平方向上的偏移距离。
+                        }
+                    },
+                    tooltip: {
+                        //仅在 options中最外层的 tooltip.trigger 为 'item'时有效
+                        position: 'bottom', //提示框位置,仅在 options中最外层的 tooltip.trigger 为 'item'时有效
+                        formatter: function (params: any, ticket: any, callback: any) {
+                            var strHtml = '<div>变电站(场站):' + itemOpt.subName + '<br/>' + '监测点:' + itemOpt.srbName
+
+                            strHtml += '</div>'
+                            return strHtml
+                        }
+                    }
+                }
+            })
+        })
+    })
+}
+
+// 表格数据处理
+const tabulation = (res: any) => {
+    distributionData.value = []
+    for (var i = 0; i < res.areaValue.length; i++) {
+        distributionData.value.push({
+            qy: res.areaValue[i][0],
+            jcd: res.areaValue[i][1],
+            zc: res.areaValue[i][2],
+            zd: res.areaValue[i][3]
+        })
+    }
+}
+// 柱状图数据处理
+const histogram = (res: any) => {
+    echartList.value = {
+        title: {
+            text:
+                titleA.value == '电压等级'
+                    ? '电压等级'
+                    : titleA.value == '终端厂家'
+                    ? '终端厂家'
+                    : titleA.value == '干扰源类型'
+                    ? '干扰源类型'
+                    : titleA.value == '电网拓扑'
+                    ? header.value.areaRef.areaName
+                    : '' // 给X轴加单位
+        },
+        tooltip: {
+            formatter: function (params: any) {
+                // console.log(params);
+                var tips = ''
+                for (var i = 0; i < params.length; i++) {
+                    tips += params[i].name + '</br/>'
+                    tips += '监测点数' + ':' + '&nbsp' + '&nbsp' + params[i].value + '</br/>'
+                }
+                return tips
+            }
+        },
+
+        xAxis: {
+            name:
+                titleA.value == '电压等级'
+                    ? '(电压\n等级)'
+                    : titleA.value == '终端厂家'
+                    ? '(终端\n厂家)'
+                    : titleA.value == '干扰源类型'
+                    ? '(干扰\n源类型)'
+                    : titleA.value == '电网拓扑'
+                    ? '(区域)'
+                    : '', // 给X轴加单位
+            data: distributionData.value.map((item: any) => item.qy)
+        },
+        yAxis: {
+            name: '监测点数（个）' // 给X轴加单位
+        },
+        options: {
+            series: [
+                {
+                    //   name: '暂降次数',
+                    type: 'bar',
+                    data: distributionData.value.map((item: any) => item.jcd),
+                    barMaxWidth: 30,
+                    itemStyle: {
+                        normal: {
+                            color: '#07CCCA'
+                        }
+                    },
+                    label: {
+                        show: true,
+                        position: 'top',
+                        textStyle: {
+                            //数值样式
+                            color: '#000'
+                        },
+                        fontSize: 12
+                    }
+                }
+            ]
+        }
+    }
+}
+
+onMounted(() => {
+    tableStore.index()
+})
+const layout = mainHeight(83) as any
+const layout1 = mainHeight(93) as any
+</script>
+<style lang="scss" scoped>
+.map {
+    height: v-bind('layout.height');
+}
+.tall {
+    height: calc(v-bind('layout1.height') / 2);
+}
+</style>
diff --git a/src/views/pqs/voltageSags/Region/transientList/addForm.vue b/src/views/pqs/voltageSags/Region/transientList/addForm.vue
index 4ef00e7a..cf89a80a 100644
--- a/src/views/pqs/voltageSags/Region/transientList/addForm.vue
+++ b/src/views/pqs/voltageSags/Region/transientList/addForm.vue
@@ -1,67 +1,67 @@
-<template>
-    <el-dialog draggable width="500px" v-model="dialogVisible" title="人工维护">
-        <el-scrollbar>
-            <el-form :inline="false" :model="form" label-width="140px" :rules="rules" ref="formRef">
-
-                <el-form-item label="暂降核实原因:" prop="verifyReason">
-                  
-                    <el-select v-model="form.verifyReason" placeholder="请选择暂降核实原因">
-                        <el-option v-for="item in verifyReasonList" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="暂降核实原因详情:" prop="verifyReasonDetail">
-             
-                    <el-input v-model="form.verifyReasonDetail" :rows="3" type="textarea" placeholder="请输入暂降核实原因详情" />
-                </el-form-item>
-            </el-form>
-        </el-scrollbar>
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="dialogVisible = false">取消</el-button>
-                <el-button type="primary" @click="submit">确认</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, inject } from 'vue'
-import { reactive } from 'vue'
-import { ElMessage } from 'element-plus'
-import { updateEventReason } from '@/api/event-boot/highAndLowPressure'
-import { useDictData } from '@/stores/dictData'
-const  emit=defineEmits(['onSubmit'])
-const dictData = useDictData()
-const dialogVisible = ref(false)
-const verifyReasonList: any = dictData.getBasicData('verifyReason')
-const formRef = ref()
-const form: any = reactive({
-    eventId: '',
-    verifyReason: '',
-    verifyReasonDetail: ''
-})
-const rules = {
-    verifyReasonDetail: [{ required: true, message: '请输入暂降核实原因详情', trigger: 'blur' },],
-    verifyReason: [{ required: true, message: '请输入暂降核实原因', trigger: 'blur' },],
-}
-
-const open = (row: any) => {
-    dialogVisible.value = true
-    form.eventId = row.eventId
-    form.verifyReason = row.verifyReason
-    form.verifyReasonDetail = row.verifyReasonDetail
-}
-const submit = () => {
-    formRef.value.validate(async (valid: boolean) => {
-        if (valid) {
-            updateEventReason(form).then(res => {
-
-                ElMessage.success('录入成功！')
-                dialogVisible.value = false
-                emit('onSubmit')
-            })
-        }
-    })
-}
-
-defineExpose({ open })
-</script>
+<template>
+    <el-dialog draggable width="500px" v-model="dialogVisible" title="人工维护">
+        <el-scrollbar>
+            <el-form :inline="false" :model="form" label-width="140px" :rules="rules" ref="formRef">
+
+                <el-form-item label="暂降核实原因:" prop="verifyReason">
+                  
+                    <el-select v-model="form.verifyReason" placeholder="请选择暂降核实原因" filterable>
+                        <el-option v-for="item in verifyReasonList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="暂降核实原因详情:" prop="verifyReasonDetail">
+             
+                    <el-input v-model="form.verifyReasonDetail" :rows="3" type="textarea" placeholder="请输入暂降核实原因详情" />
+                </el-form-item>
+            </el-form>
+        </el-scrollbar>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { reactive } from 'vue'
+import { ElMessage } from 'element-plus'
+import { updateEventReason } from '@/api/event-boot/highAndLowPressure'
+import { useDictData } from '@/stores/dictData'
+const  emit=defineEmits(['onSubmit'])
+const dictData = useDictData()
+const dialogVisible = ref(false)
+const verifyReasonList: any = dictData.getBasicData('verifyReason')
+const formRef = ref()
+const form: any = reactive({
+    eventId: '',
+    verifyReason: '',
+    verifyReasonDetail: ''
+})
+const rules = {
+    verifyReasonDetail: [{ required: true, message: '请输入暂降核实原因详情', trigger: 'blur' },],
+    verifyReason: [{ required: true, message: '请输入暂降核实原因', trigger: 'blur' },],
+}
+
+const open = (row: any) => {
+    dialogVisible.value = true
+    form.eventId = row.eventId
+    form.verifyReason = row.verifyReason
+    form.verifyReasonDetail = row.verifyReasonDetail
+}
+const submit = () => {
+    formRef.value.validate(async (valid: boolean) => {
+        if (valid) {
+            updateEventReason(form).then(res => {
+
+                ElMessage.success('录入成功！')
+                dialogVisible.value = false
+                emit('onSubmit')
+            })
+        }
+    })
+}
+
+defineExpose({ open })
+</script>
diff --git a/src/views/pqs/voltageSags/Region/transientList/index.vue b/src/views/pqs/voltageSags/Region/transientList/index.vue
index 87daa6ba..90d0d90a 100644
--- a/src/views/pqs/voltageSags/Region/transientList/index.vue
+++ b/src/views/pqs/voltageSags/Region/transientList/index.vue
@@ -27,6 +27,7 @@
                             multiple
                             collapse-tags
                             style="width: 100%"
+                            filterable
                         >
                             <el-option
                                 v-for="item in triggeroptions"
@@ -42,6 +43,7 @@
                             placeholder="请选择是否存在波形"
                             clearable
                             style="width: 100%"
+                            filterable
                         >
                             <el-option
                                 v-for="item in wareaoptions"
@@ -102,6 +104,7 @@
                             multiple
                             collapse-tags
                             style="width: 100%"
+                            filterable
                         >
                             <el-option
                                 v-for="item in reasonoptions"
@@ -119,7 +122,8 @@
                             multiple
                             collapse-tags
                             collapse-tags-tooltip
-                        >
+                            filterable
+                            >
                             <el-option
                                 v-for="item in verifyReasonList"
                                 :key="item.id"
diff --git a/src/views/pqs/voltageSags/monitoringPoint/transientList/index.vue b/src/views/pqs/voltageSags/monitoringPoint/transientList/index.vue
index 6c5546ce..a46a3fe1 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/transientList/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/transientList/index.vue
@@ -11,7 +11,7 @@
                         />
                     </el-form-item>
                     <el-form-item label="触发类型">
-                        <el-select v-model.trim="tableStore.table.params.dicData" placeholder="请选择" clearable>
+                        <el-select v-model.trim="tableStore.table.params.dicData" placeholder="请选择" clearable filterable>
                             <el-option
                                 v-for="item in triggerType"
                                 :key="item.id"
diff --git a/src/views/pqs/voltageSags/operationsManagement/TerminalOperation/index.vue b/src/views/pqs/voltageSags/operationsManagement/TerminalOperation/index.vue
index 8eabc40b..94e708f5 100644
--- a/src/views/pqs/voltageSags/operationsManagement/TerminalOperation/index.vue
+++ b/src/views/pqs/voltageSags/operationsManagement/TerminalOperation/index.vue
@@ -9,6 +9,7 @@
                         collapse-tags
                         v-model="tableStore.table.params.runFlag"
                         placeholder="请选择"
+                        filterable
                     >
                         <el-option label="投运" value="0" />
                         <el-option label="检修" value="1" />
@@ -22,6 +23,7 @@
                         collapse-tags
                         v-model="tableStore.table.params.comFlag"
                         placeholder="请选择"
+                        filterable
                     >
                         <el-option label="正常" value="1" />
                         <el-option label="中断" value="0" />
@@ -35,6 +37,7 @@
                         v-model="manufacturerForm"
                         placeholder="请选择"
                         @change="onManufacturerChange"
+                        filterable
                     >
                         <el-option v-for="item in manufacturer" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
diff --git a/src/views/pqs/voltageSags/operationsManagement/point/index.vue b/src/views/pqs/voltageSags/operationsManagement/point/index.vue
index 9b771002..35597864 100644
--- a/src/views/pqs/voltageSags/operationsManagement/point/index.vue
+++ b/src/views/pqs/voltageSags/operationsManagement/point/index.vue
@@ -10,6 +10,7 @@
                         v-model="interferenceSourceForm"
                         placeholder="请选择"
                         @change="onLoadTypeChange"
+                        filterable
                     >
                         <el-option
                             v-for="item in interferenceSource"
@@ -27,6 +28,7 @@
                         v-model="scaleForm"
                         placeholder="请选择"
                         @change="onScaleChange"
+                        filterable
                     >
                         <el-option v-for="item in level" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
@@ -38,6 +40,7 @@
                         collapse-tags
                         v-model="tableStore.table.params.comFlag"
                         placeholder="请选择"
+                        filterable
                     >
                         <el-option label="正常" value="1" />
                         <el-option label="中断" value="0" />
diff --git a/src/views/pqs/voltageSags/overview/index.vue b/src/views/pqs/voltageSags/overview/index.vue
index e78edc9b..7dbb6ad5 100644
--- a/src/views/pqs/voltageSags/overview/index.vue
+++ b/src/views/pqs/voltageSags/overview/index.vue
@@ -42,7 +42,7 @@
                 </div>
             </div>
             <div class="selectBox">
-                <el-select @change="pointChange" filterable clearable v-model="lineId" placeholder="输入监测点名称查询">
+                <el-select @change="pointChange" filterable clearable v-model="lineId" placeholder="输入监测点名称查询" >
                     <el-option
                         v-for="item in areaLineInfo"
                         :key="item.lineId"
diff --git a/src/views/pqs/voltageSags/report/eventReports/index.vue b/src/views/pqs/voltageSags/report/eventReports/index.vue
index 241b26e5..bca9c93d 100644
--- a/src/views/pqs/voltageSags/report/eventReports/index.vue
+++ b/src/views/pqs/voltageSags/report/eventReports/index.vue
@@ -9,7 +9,7 @@
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="触发类型">
-                    <el-select v-model.trim="tableStore.table.params.waveType" placeholder="请选择" clearable>
+                    <el-select v-model.trim="tableStore.table.params.waveType" placeholder="请选择" clearable filterable>
                         <el-option
                             v-for="item in triggerType"
                             :key="item.id"
@@ -19,7 +19,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="电网标志">
-                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
+                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志" filterable>
                         <el-option v-for="item in sign" :key="item.id" :label="item.name" :value="item.algoDescribe" />
                     </el-select>
                 </el-form-item>
@@ -28,6 +28,7 @@
                         v-model="tableStore.table.params.monitorFlag"
                         collapse-tags
                         placeholder="请选择网公司标志"
+                        filterable
                     >
                         <el-option
                             v-for="item in monitorList"
@@ -35,7 +36,7 @@
                             :label="item.label"
                             :value="item.value"
                         ></el-option>
-                    </el-select>
+                    </el-select> 
                 </el-form-item>
                 <el-form-item label="筛选数据">
                     <el-input
diff --git a/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue b/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue
index 7578ba18..849ef4ad 100644
--- a/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue
+++ b/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue
@@ -15,7 +15,7 @@
                 <TableHeader ref="TableHeaderRef" date-picker :show-search="false">
                     <template v-slot:select>
                         <el-form-item label=" 模板策略">
-                            <el-select v-model="value" placeholder="请选择" @change="changeFn" clearable>
+                            <el-select v-model="value" placeholder="请选择" @change="changeFn" clearable filterable> 
                                 <el-option
                                     v-for="item in templatePolicy"
                                     :key="item.id"
diff --git a/src/views/pqs/voltageSags/report/regionalReports/index.vue b/src/views/pqs/voltageSags/report/regionalReports/index.vue
index b134b0c0..d1f6196b 100644
--- a/src/views/pqs/voltageSags/report/regionalReports/index.vue
+++ b/src/views/pqs/voltageSags/report/regionalReports/index.vue
@@ -12,7 +12,7 @@
                 <TableHeader ref="TableHeaderRef" date-picker :show-search="false">
                     <template v-slot:select>
                         <el-form-item label="报告类型">
-                            <el-select v-model="tableStore.table.params.waveType" placeholder="请选择" clearable>
+                            <el-select v-model="tableStore.table.params.waveType" placeholder="请选择" clearable filterable>
                                 <el-option
                                     v-for="item in waveTypeList"
                                     :key="item.value"
@@ -22,7 +22,7 @@
                             </el-select>
                         </el-form-item>
                         <!-- <el-form-item label=" 模板策略">
-                            <el-select v-model="value" placeholder="请选择" @change="changeFn" clearable>
+                            <el-select v-model="value" placeholder="请选择" @change="changeFn" clearable filterable>
                                 <el-option
                                     v-for="item in templatePolicy"
                                     :key="item.id"
diff --git a/src/views/pqs/voltageSags/sagGovern/businessUser/incomingLinePopup.vue b/src/views/pqs/voltageSags/sagGovern/businessUser/incomingLinePopup.vue
index 28fd9acd..55e9f2ac 100644
--- a/src/views/pqs/voltageSags/sagGovern/businessUser/incomingLinePopup.vue
+++ b/src/views/pqs/voltageSags/sagGovern/businessUser/incomingLinePopup.vue
@@ -1,119 +1,119 @@
-<template>
-    <el-dialog
-        draggable
-        class="cn-operate-dialog"
-        v-model="incomingDialogVisible"
-        :title="title"
-        style="width: 415px;"
-    >
-        <el-scrollbar>
-            <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
-                <el-form-item label="进线名称" prop="name">
-                    <el-input v-model="form.name" placeholder="请输入进线名称" />
-                </el-form-item>
-                <el-form-item label="关联监测点" prop="lineId">
-                    <el-select v-model="form.lineId" placeholder="请选择关联监测点" :filterable="true">
-                        <el-option v-for="line in lineList" :key="line.id" :label="line.name" :value="line.id" />
-                    </el-select>
-                </el-form-item>
-            </el-form>
-        </el-scrollbar>
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="incomingDialogVisible = false">取消</el-button>
-                <el-button type="primary" @click="submit">确认</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, inject, reactive } from 'vue'
-import { ElMessage } from 'element-plus'
-import TableStore from '@/utils/tableStore'
-import { addSgIncomingLine, lineOptionList, updateSgIncomingLine } from '@/api/advance-boot/sgGroven/incomingLine'
-import { sgUserList } from '@/api/advance-boot/sgGroven/sgUser' // 若不是列表页面弹框可删除
-const incomingDialogVisible = ref(false)
-const title = ref('')
-const tableStore = inject('tableStore') as TableStore
-const formRef = ref()
-
-
-const lineList = ref([
-    {
-        id: '123456',
-        name: '测试1号线'
-    },
-    {
-        id: '01e796a4ffbd8de00c4ee9f34b49d7cb',
-        name: '测试2号线'
-    },
-    {
-        id: '1223456',
-        name: '测试3号线'
-    }
-])
-
-// 注意不要和表单ref的命名冲突
-const form = reactive({
-    id: '',
-    userId: '',
-    name: '',
-    lineId: ''
-})
-
-//form表单校验规则
-const rules = {
-    name: [{ required: true, message: '进线名不能为空', trigger: 'blur' }],
-    lineId: [{ required: true, message: '监测点不能为空', trigger: 'change' }]
-}
-const resetForm = () => {
-    if (formRef.value) {
-        formRef.value.resetFields()
-    }
-}
-
-const open =async (text: string, data: any) => {
-    title.value = text
-    //默认选中第一个tab
-    incomingDialogVisible.value = true
-    if (data.id) {
-        // 表单赋值
-        for (let key in form) {
-            form[key] = data[key]
-        }
-    } else {
-        resetForm()
-        // 在此处恢复默认表单
-        for (let key in form) {
-            form[key] = ''
-        }
-    }
-    form.userId = data.userId
-    await lineOptionList().then(res => {
-        lineList.value = res.data
-    })
-}
-
-const submit = () => {
-    formRef.value.validate(async (valid: any) => {
-        if (valid) {
-            if (form.id) {
-                await updateSgIncomingLine(form)
-            } else {
-                await addSgIncomingLine(form)
-            }
-            ElMessage.success('保存进线成功')
-            tableStore.index()
-            incomingDialogVisible.value = false
-        }
-    })
-}
-
-defineExpose({ open })
-</script>
-
-<style scoped>
-.el-select {
-    min-width: 180px;
-}
-</style>
+<template>
+    <el-dialog
+        draggable
+        class="cn-operate-dialog"
+        v-model="incomingDialogVisible"
+        :title="title"
+        style="width: 415px;"
+    >
+        <el-scrollbar>
+            <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
+                <el-form-item label="进线名称" prop="name">
+                    <el-input v-model="form.name" placeholder="请输入进线名称" />
+                </el-form-item>
+                <el-form-item label="关联监测点" prop="lineId">
+                    <el-select v-model="form.lineId" placeholder="请选择关联监测点" :filterable="true" filterable>
+                        <el-option v-for="line in lineList" :key="line.id" :label="line.name" :value="line.id" />
+                    </el-select>
+                </el-form-item>
+            </el-form>
+        </el-scrollbar>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="incomingDialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject, reactive } from 'vue'
+import { ElMessage } from 'element-plus'
+import TableStore from '@/utils/tableStore'
+import { addSgIncomingLine, lineOptionList, updateSgIncomingLine } from '@/api/advance-boot/sgGroven/incomingLine'
+import { sgUserList } from '@/api/advance-boot/sgGroven/sgUser' // 若不是列表页面弹框可删除
+const incomingDialogVisible = ref(false)
+const title = ref('')
+const tableStore = inject('tableStore') as TableStore
+const formRef = ref()
+
+
+const lineList = ref([
+    {
+        id: '123456',
+        name: '测试1号线'
+    },
+    {
+        id: '01e796a4ffbd8de00c4ee9f34b49d7cb',
+        name: '测试2号线'
+    },
+    {
+        id: '1223456',
+        name: '测试3号线'
+    }
+])
+
+// 注意不要和表单ref的命名冲突
+const form = reactive({
+    id: '',
+    userId: '',
+    name: '',
+    lineId: ''
+})
+
+//form表单校验规则
+const rules = {
+    name: [{ required: true, message: '进线名不能为空', trigger: 'blur' }],
+    lineId: [{ required: true, message: '监测点不能为空', trigger: 'change' }]
+}
+const resetForm = () => {
+    if (formRef.value) {
+        formRef.value.resetFields()
+    }
+}
+
+const open =async (text: string, data: any) => {
+    title.value = text
+    //默认选中第一个tab
+    incomingDialogVisible.value = true
+    if (data.id) {
+        // 表单赋值
+        for (let key in form) {
+            form[key] = data[key]
+        }
+    } else {
+        resetForm()
+        // 在此处恢复默认表单
+        for (let key in form) {
+            form[key] = ''
+        }
+    }
+    form.userId = data.userId
+    await lineOptionList().then(res => {
+        lineList.value = res.data
+    })
+}
+
+const submit = () => {
+    formRef.value.validate(async (valid: any) => {
+        if (valid) {
+            if (form.id) {
+                await updateSgIncomingLine(form)
+            } else {
+                await addSgIncomingLine(form)
+            }
+            ElMessage.success('保存进线成功')
+            tableStore.index()
+            incomingDialogVisible.value = false
+        }
+    })
+}
+
+defineExpose({ open })
+</script>
+
+<style scoped>
+.el-select {
+    min-width: 180px;
+}
+</style>
diff --git a/src/views/setting/translate/configuration/component/setSms.vue b/src/views/setting/translate/configuration/component/setSms.vue
index 114840e1..0dcd7284 100644
--- a/src/views/setting/translate/configuration/component/setSms.vue
+++ b/src/views/setting/translate/configuration/component/setSms.vue
@@ -1,272 +1,272 @@
-<template>
-    <div>
-        <el-card class="default-main mb10 mr0">
-            <template #header>
-                <div class="card-header">
-                    <span>短信配置</span>
-                </div>
-            </template>
-            <div :style="height">
-                <div>
-                    <div class="title">短信发送设置</div>
-                    <el-form :model="form" inline label-width="100px" class="mb10 ml30 mt20">
-                        <el-form-item label="短信发送功能">
-                            <el-select v-model="form.sms" style="width: 100px">
-                                <el-option
-                                    v-for="item in list[0]"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                />
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="事件扫描间隔">
-                            <el-select v-model="form.interval" style="width: 100px">
-                                <el-option
-                                    v-for="item in list[1]"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                />
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="离线数据时间">
-                            <el-select v-model="form.time" style="width: 100px">
-                                <el-option
-                                    v-for="item in list[2]"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                />
-                            </el-select>
-                        </el-form-item>
-                    </el-form>
-                </div>
-                <div>
-                    <div class="title">短信发送时间段设置</div>
-                    <div class="mb20 ml30 checkbox">
-                        <el-checkbox-group v-model="form.sendTime">
-                            <el-checkbox
-                                v-for="item in timePeriod"
-                                class="mt10"
-                                :key="item.start + item.end"
-                                :label="`${item.start} - ${item.end}`"
-                                border
-                            />
-                        </el-checkbox-group>
-                        <el-button type="primary" icon="el-icon-Plus" @click="addTime" class="mt10"></el-button>
-                    </div>
-                </div>
-                <div>
-                    <div class="title">类型设置</div>
-                    <div class="mb20 ml30 checkbox">
-                        <el-checkbox-group v-model="form.type">
-                            <el-checkbox
-                                v-for="item in typeList"
-                                class="mt10"
-                                :key="item.label"
-                                :label="item.label"
-                                border
-                            />
-                        </el-checkbox-group>
-                        <el-button type="primary" icon="el-icon-Plus" @click="addType" class="mt10"></el-button>
-                    </div>
-                </div>
-                <el-divider />
-                <div style="text-align: center">
-                    <el-button type="primary" icon="el-icon-Tools" @click="addTime" class="mt10">设置</el-button>
-                </div>
-            </div>
-        </el-card>
-        <!-- 时间范围 -->
-        <el-dialog draggable v-model="timeFlag" title="添加时间范围模版" width="300">
-            <div>
-                <span class="mr10">起始时间</span>
-                <el-time-select
-                    v-model="startTime"
-                    style="width: 200px"
-                    :max-time="endTime"
-                    placeholder="起始时间"
-                    start="00:00"
-                    step="1:00"
-                    end="23:00"
-                />
-            </div>
-            <div class="mt10">
-                <span class="mr10">结束时间</span>
-                <el-time-select
-                    v-model="endTime"
-                    style="width: 200px"
-                    :min-time="startTime"
-                    placeholder="结束时间"
-                    start="00:00"
-                    step="1:00"
-                    end="23:00"
-                />
-            </div>
-
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button @click="timeFlag = false">取消</el-button>
-                    <el-button type="primary" @click="determineTheTime">确定</el-button>
-                </div>
-            </template>
-        </el-dialog>
-        <!-- 添加类型模版 -->
-        <el-dialog draggable v-model="typeFlag" title="添加类型模版" width="300">
-            <div>
-                <span class="mr10">　类型名称</span>
-                <el-input v-model="typeName" style="width: 200px" placeholder="请输入类型名称"></el-input>
-            </div>
-            <div class="mt10">
-                <span class="mr10">临界最小值</span>
-                <el-input-number
-                    v-model="minType"
-                    :min="0"
-                    @change="minChange"
-                    style="width: 200px"
-                    placeholder="请输入临界最小值"
-                ></el-input-number>
-            </div>
-            <div class="mt10">
-                <span class="mr10">临界最大值</span>
-                <el-input-number
-                    v-model="maxType"
-                    :min="minType + 1"
-                    style="width: 200px"
-                    placeholder="请输入临界最大值"
-                ></el-input-number>
-            </div>
-
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button @click="timeFlag = false">取消</el-button>
-                    <el-button type="primary" @click="addAType">确定</el-button>
-                </div>
-            </template>
-        </el-dialog>
-    </div>
-</template>
-<script setup lang="ts">
-import { ref, reactive } from 'vue'
-import { mainHeight } from '@/utils/layout'
-import { ElMessage } from 'element-plus'
-defineOptions({
-    name: 'smsConfiguration'
-})
-const list = [
-    [
-        { label: '关闭', value: 0 },
-        { label: '启动', value: 1 }
-    ],
-    [
-        { label: '2分钟', value: 2 },
-        { label: '3分钟', value: 3 },
-        { label: '5分钟', value: 5 },
-        { label: '10分钟', value: 10 },
-        { label: '30分钟', value: 30 }
-    ],
-    [
-        { label: '1天', value: 1 },
-        { label: '2天', value: 2 },
-        { label: '3天', value: 3 },
-        { label: '4天', value: 4 },
-        { label: '5天', value: 5 },
-        { label: '6天', value: 6 },
-        { label: '7天', value: 7 }
-    ]
-]
-const typeList = ref([{ label: '暂降', min: 0, max: 0 }])
-const timeFlag = ref(false)
-const typeFlag = ref(false)
-const startTime = ref('')
-const endTime = ref('')
-const timePeriod = ref([
-    { start: '08:00', end: '12:00' },
-    { start: '13:00', end: '18:00' }
-])
-const typeName = ref('')
-const minType = ref(0)
-const maxType = ref(0)
-
-const height = mainHeight(105)
-const form = reactive({
-    sms: 0,
-    interval: 3,
-    time: 1,
-    sendTime: [],
-    type: []
-})
-
-const addTime = () => {
-    startTime.value = ''
-    endTime.value = ''
-    timeFlag.value = true
-    // 这里可以添加逻辑来处理时间范围的添加
-}
-const addType = () => {
-    typeName.value = ''
-    minType.value = 0
-    maxType.value = 0
-    typeFlag.value = true
-    // 这里可以添加逻辑来处理时间范围的添加
-
-}
-// 确定时间
-const determineTheTime = () => {
-    if (!startTime.value || !endTime.value) {
-        ElMessage({
-            message: '请选择时间',
-            type: 'warning'
-        })
-        return
-    }
-    timePeriod.value.push({
-        start: startTime.value,
-        end: endTime.value
-    })
-    timeFlag.value = false
-}
-// 确定设置类型
-const addAType = () => {
-    if (!typeName.value) {
-        ElMessage({
-            message: '请输入类型名称',
-            type: 'warning'
-        })
-        return
-    }
-    typeList.value.push({
-        label: typeName.value,
-        min: minType.value,
-        max: maxType.value
-    })
-    typeFlag.value = false
-}
-const minChange = (val: number) => {
-    if (val >= maxType.value) {
-        maxType.value = val + 1
-    }
-}
-</script>
-<style lang="scss" scoped>
-.title {
-    background-color: #f2f2f2;
-    height: 30px;
-    line-height: 30px;
-    font-weight: 600;
-    padding-left: 10px;
-    margin-bottom: 10px;
-    border-left: 10px solid var(--el-color-primary);
-}
-:deep(.el-card__body) {
-    padding: 10px !important;
-}
-:deep(.el-select) {
-    min-width: 80px !important;
-}
-.checkbox {
-    display: flex;
-    justify-content: space-between;
-}
-</style>
+<template>
+    <div>
+        <el-card class="default-main mb10 mr0">
+            <template #header>
+                <div class="card-header">
+                    <span>短信配置</span>
+                </div>
+            </template>
+            <div :style="height">
+                <div>
+                    <div class="title">短信发送设置</div>
+                    <el-form :model="form" inline label-width="100px" class="mb10 ml30 mt20">
+                        <el-form-item label="短信发送功能">
+                            <el-select v-model="form.sms" style="width: 100px" filterable>
+                                <el-option
+                                    v-for="item in list[0]"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                />
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="事件扫描间隔">
+                            <el-select v-model="form.interval" style="width: 100px" filterable>
+                                <el-option
+                                    v-for="item in list[1]"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                />
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="离线数据时间">
+                            <el-select v-model="form.time" style="width: 100px" filterable>
+                                <el-option
+                                    v-for="item in list[2]"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    </el-form>
+                </div>
+                <div>
+                    <div class="title">短信发送时间段设置</div>
+                    <div class="mb20 ml30 checkbox">
+                        <el-checkbox-group v-model="form.sendTime">
+                            <el-checkbox
+                                v-for="item in timePeriod"
+                                class="mt10"
+                                :key="item.start + item.end"
+                                :label="`${item.start} - ${item.end}`"
+                                border
+                            />
+                        </el-checkbox-group>
+                        <el-button type="primary" icon="el-icon-Plus" @click="addTime" class="mt10"></el-button>
+                    </div>
+                </div>
+                <div>
+                    <div class="title">类型设置</div>
+                    <div class="mb20 ml30 checkbox">
+                        <el-checkbox-group v-model="form.type">
+                            <el-checkbox
+                                v-for="item in typeList"
+                                class="mt10"
+                                :key="item.label"
+                                :label="item.label"
+                                border
+                            />
+                        </el-checkbox-group>
+                        <el-button type="primary" icon="el-icon-Plus" @click="addType" class="mt10"></el-button>
+                    </div>
+                </div>
+                <el-divider />
+                <div style="text-align: center">
+                    <el-button type="primary" icon="el-icon-Tools" @click="addTime" class="mt10">设置</el-button>
+                </div>
+            </div>
+        </el-card>
+        <!-- 时间范围 -->
+        <el-dialog draggable v-model="timeFlag" title="添加时间范围模版" width="300">
+            <div>
+                <span class="mr10">起始时间</span>
+                <el-time-select
+                    v-model="startTime"
+                    style="width: 200px"
+                    :max-time="endTime"
+                    placeholder="起始时间"
+                    start="00:00"
+                    step="1:00"
+                    end="23:00"
+                />
+            </div>
+            <div class="mt10">
+                <span class="mr10">结束时间</span>
+                <el-time-select
+                    v-model="endTime"
+                    style="width: 200px"
+                    :min-time="startTime"
+                    placeholder="结束时间"
+                    start="00:00"
+                    step="1:00"
+                    end="23:00"
+                />
+            </div>
+
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button @click="timeFlag = false">取消</el-button>
+                    <el-button type="primary" @click="determineTheTime">确定</el-button>
+                </div>
+            </template>
+        </el-dialog>
+        <!-- 添加类型模版 -->
+        <el-dialog draggable v-model="typeFlag" title="添加类型模版" width="300">
+            <div>
+                <span class="mr10">　类型名称</span>
+                <el-input v-model="typeName" style="width: 200px" placeholder="请输入类型名称"></el-input>
+            </div>
+            <div class="mt10">
+                <span class="mr10">临界最小值</span>
+                <el-input-number
+                    v-model="minType"
+                    :min="0"
+                    @change="minChange"
+                    style="width: 200px"
+                    placeholder="请输入临界最小值"
+                ></el-input-number>
+            </div>
+            <div class="mt10">
+                <span class="mr10">临界最大值</span>
+                <el-input-number
+                    v-model="maxType"
+                    :min="minType + 1"
+                    style="width: 200px"
+                    placeholder="请输入临界最大值"
+                ></el-input-number>
+            </div>
+
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button @click="timeFlag = false">取消</el-button>
+                    <el-button type="primary" @click="addAType">确定</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { mainHeight } from '@/utils/layout'
+import { ElMessage } from 'element-plus'
+defineOptions({
+    name: 'smsConfiguration'
+})
+const list = [
+    [
+        { label: '关闭', value: 0 },
+        { label: '启动', value: 1 }
+    ],
+    [
+        { label: '2分钟', value: 2 },
+        { label: '3分钟', value: 3 },
+        { label: '5分钟', value: 5 },
+        { label: '10分钟', value: 10 },
+        { label: '30分钟', value: 30 }
+    ],
+    [
+        { label: '1天', value: 1 },
+        { label: '2天', value: 2 },
+        { label: '3天', value: 3 },
+        { label: '4天', value: 4 },
+        { label: '5天', value: 5 },
+        { label: '6天', value: 6 },
+        { label: '7天', value: 7 }
+    ]
+]
+const typeList = ref([{ label: '暂降', min: 0, max: 0 }])
+const timeFlag = ref(false)
+const typeFlag = ref(false)
+const startTime = ref('')
+const endTime = ref('')
+const timePeriod = ref([
+    { start: '08:00', end: '12:00' },
+    { start: '13:00', end: '18:00' }
+])
+const typeName = ref('')
+const minType = ref(0)
+const maxType = ref(0)
+
+const height = mainHeight(105)
+const form = reactive({
+    sms: 0,
+    interval: 3,
+    time: 1,
+    sendTime: [],
+    type: []
+})
+
+const addTime = () => {
+    startTime.value = ''
+    endTime.value = ''
+    timeFlag.value = true
+    // 这里可以添加逻辑来处理时间范围的添加
+}
+const addType = () => {
+    typeName.value = ''
+    minType.value = 0
+    maxType.value = 0
+    typeFlag.value = true
+    // 这里可以添加逻辑来处理时间范围的添加
+
+}
+// 确定时间
+const determineTheTime = () => {
+    if (!startTime.value || !endTime.value) {
+        ElMessage({
+            message: '请选择时间',
+            type: 'warning'
+        })
+        return
+    }
+    timePeriod.value.push({
+        start: startTime.value,
+        end: endTime.value
+    })
+    timeFlag.value = false
+}
+// 确定设置类型
+const addAType = () => {
+    if (!typeName.value) {
+        ElMessage({
+            message: '请输入类型名称',
+            type: 'warning'
+        })
+        return
+    }
+    typeList.value.push({
+        label: typeName.value,
+        min: minType.value,
+        max: maxType.value
+    })
+    typeFlag.value = false
+}
+const minChange = (val: number) => {
+    if (val >= maxType.value) {
+        maxType.value = val + 1
+    }
+}
+</script>
+<style lang="scss" scoped>
+.title {
+    background-color: #f2f2f2;
+    height: 30px;
+    line-height: 30px;
+    font-weight: 600;
+    padding-left: 10px;
+    margin-bottom: 10px;
+    border-left: 10px solid var(--el-color-primary);
+}
+:deep(.el-card__body) {
+    padding: 10px !important;
+}
+:deep(.el-select) {
+    min-width: 80px !important;
+}
+.checkbox {
+    display: flex;
+    justify-content: space-between;
+}
+</style>
diff --git a/src/views/setting/translate/smsQueries/index.vue b/src/views/setting/translate/smsQueries/index.vue
index 253c115c..5c693878 100644
--- a/src/views/setting/translate/smsQueries/index.vue
+++ b/src/views/setting/translate/smsQueries/index.vue
@@ -1,127 +1,127 @@
-<template>
-    <div class="default-main" style="position: relative">
-        <TableHeader datePicker showExport>
-            <template #select>
-                <el-form-item label="发送结果">
-                    <el-select v-model="tableStore.table.params.searchState" clearable placeholder="请选择发送结果">
-                        <el-option label="成功" value="1" />
-                        <el-option label="失败" value="2" />
-                        <el-option label="异常" value="0" />
-                    </el-select>
-                </el-form-item>
-            </template>
-            <template #operation>
-                <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" :showOverflow="false" />
-    </div>
-</template>
-
-<script setup lang="ts">
-import { Plus } from '@element-plus/icons-vue'
-import { ref, onMounted, provide } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { ElMessage } from 'element-plus'
-import { dictTypeDelete } from '@/api/system-boot/dictType'
-
-defineOptions({
-    name: 'smsQueries'
-})
-const tableStore = new TableStore({
-    url: '/system-boot/dictType/list',
-    method: 'POST',
-
-    column: [
-        { width: '60', type: 'checkbox' },
-        {
-            title: '序号',
-            width: 80,
-
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { title: '时间', field: 'time', width: '200px' },
-        { title: '接收人', field: 'uesr', width: '120px' },
-
-        { title: '手机号', field: 'sort', width: '180px' },
-        {
-            title: '发送结果',
-            field: 'outcome',
-            width: '120px',
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'success',
-                2: 'danger'
-            },
-            replaceValue: {
-                0: '异常',
-                1: '成功',
-                2: '失败'
-            }
-        },
-        { title: '内容', field: 'content', align: 'left' }
-    ],
-    loadCallback: () => {
-        tableStore.table.data = [
-            {
-                time: '2023-10-01 12:00:00',
-                uesr: '张三',
-                sort: '1234567890',
-                outcome: '1',
-                content:
-                    '①、2025-05-30 00:12:55 220kV龙泉站 220kV主变1#高压侧发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;②、2025-05-30 00:12:55 220kV龙泉站 220kV福泉II线发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;③、2025-05-30 03:51:58 220kV龙泉站 110kV主变1#中压侧发生暂降事件,特征幅值:0.88p.u.(55.96 kV),持续时间:0.015s;④、2025-05-30 10:46:11 110kV八一站 10kV主变1#低压侧发生暂降事件,特征幅值:0.22p.u.(1.25 kV),持续时间:0.595s;⑤、2025-05-30 03:51:58 220kV龙泉站 10kV主变1#低压侧发生暂降事件,特征幅值:0.85p.u.(4.88 kV),持续时间:0.015s;⑥、2025-05-30 00:12:55 220kV龙泉站 110kV主变1#中压侧发生暂降事件,特征幅值:0.84p.u.(53.17 kV),持续时间:0.189s;⑦、2025-05-30 02:49:29 110kV昌洒站 35kV主变1#中压侧发生暂降事件,特征幅值:0.79p.u.(16.04 kV),持续时间:0.073s;⑧、2025-05-30 00:12:55 220kV龙泉站 220kV福泉I线发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;⑨、2025-05-30 00:12:55 220kV龙泉站 10kV主变1#低压侧发生暂降事件,特征幅值:0.85p.u.(4.90 kV),持续时间:0.189s; 详情请登录海南电网电能质量监测系统查看!'
-            },
-            {
-                time: '2023-10-01 12:00:00',
-                uesr: '张三',
-                sort: '1234567890',
-                outcome: '2',
-                content:
-                    '①、2025-05-30 00:12:55 220kV龙泉站 220kV主变1#高压侧发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;②、2025-05-30 00:12:55 220kV龙泉站 220kV福泉II线发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;③、2025-05-30 03:51:58 220kV龙泉站 110kV主变1#中压侧发生暂降事件,特征幅值:0.88p.u.(55.96 kV),持续时间:0.015s;④、2025-05-30 10:46:11 110kV八一站 10kV主变1#低压侧发生暂降事件,特征幅值:0.22p.u.(1.25 kV),持续时间:0.595s;⑤、2025-05-30 03:51:58 220kV龙泉站 10kV主变1#低压侧发生暂降事件,特征幅值:0.85p.u.(4.88 kV),持续时间:0.015s;⑥、2025-05-30 00:12:55 220kV龙泉站 110kV主变1#中压侧发生暂降事件,特征幅值:0.84p.u.(53.17 kV),持续时间:0.189s;⑦、2025-05-30 02:49:29 110kV昌洒站 35kV主变1#中压侧发生暂降事件,特征幅值:0.79p.u.(16.04 kV),持续时间:0.073s;⑧、2025-05-30 00:12:55 220kV龙泉站 220kV福泉I线发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;⑨、2025-05-30 00:12:55 220kV龙泉站 10kV主变1#低压侧发生暂降事件,特征幅值:0.85p.u.(4.90 kV),持续时间:0.189s; 详情请登录海南电网电能质量监测系统查看!'
-            },
-            {
-                time: '2023-10-01 12:00:00',
-                uesr: '张三',
-                sort: '1234567890',
-                outcome: '0',
-                content:
-                    '①、2025-05-30 00:12:55 220kV龙泉站 220kV主变1#高压侧发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;②、2025-05-30 00:12:55 220kV龙泉站 220kV福泉II线发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;③、2025-05-30 03:51:58 220kV龙泉站 110kV主变1#中压侧发生暂降事件,特征幅值:0.88p.u.(55.96 kV),持续时间:0.015s;④、2025-05-30 10:46:11 110kV八一站 10kV主变1#低压侧发生暂降事件,特征幅值:0.22p.u.(1.25 kV),持续时间:0.595s;⑤、2025-05-30 03:51:58 220kV龙泉站 10kV主变1#低压侧发生暂降事件,特征幅值:0.85p.u.(4.88 kV),持续时间:0.015s;⑥、2025-05-30 00:12:55 220kV龙泉站 110kV主变1#中压侧发生暂降事件,特征幅值:0.84p.u.(53.17 kV),持续时间:0.189s;⑦、2025-05-30 02:49:29 110kV昌洒站 35kV主变1#中压侧发生暂降事件,特征幅值:0.79p.u.(16.04 kV),持续时间:0.073s;⑧、2025-05-30 00:12:55 220kV龙泉站 220kV福泉I线发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;⑨、2025-05-30 00:12:55 220kV龙泉站 10kV主变1#低压侧发生暂降事件,特征幅值:0.85p.u.(4.90 kV),持续时间:0.189s; 详情请登录海南电网电能质量监测系统查看!'
-            }
-        ]
-    }
-})
-
-provide('tableStore', tableStore)
-tableStore.table.params.searchValue = ''
-tableStore.table.params.searchState = ''
-const deleteEven = (row: any) => {
-    if (tableStore.table.selection.length == 0) {
-        ElMessage({
-            type: 'warning',
-            message: '请选择要删除的数据'
-        })
-    } else {
-        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        }).then(() => {
-            // deleteQuitRunningDevice(tableStore.table.selection.map(item => item.id)).then(res => {
-            //     ElMessage({
-            //         type: 'success',
-            //         message: '删除成功!'
-            //     })
-            //     tableStore.index()
-            // })
-        })
-    }
-}
-onMounted(() => {
-    tableStore.index()
-})
-</script>
+<template>
+    <div class="default-main" style="position: relative">
+        <TableHeader datePicker showExport>
+            <template #select>
+                <el-form-item label="发送结果">
+                    <el-select v-model="tableStore.table.params.searchState" clearable placeholder="请选择发送结果" filterable>
+                        <el-option label="成功" value="1" />
+                        <el-option label="失败" value="2" />
+                        <el-option label="异常" value="0" />
+                    </el-select>
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" :showOverflow="false" />
+    </div>
+</template>
+
+<script setup lang="ts">
+import { Plus } from '@element-plus/icons-vue'
+import { ref, onMounted, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage } from 'element-plus'
+import { dictTypeDelete } from '@/api/system-boot/dictType'
+
+defineOptions({
+    name: 'smsQueries'
+})
+const tableStore = new TableStore({
+    url: '/system-boot/dictType/list',
+    method: 'POST',
+
+    column: [
+        { width: '60', type: 'checkbox' },
+        {
+            title: '序号',
+            width: 80,
+
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '时间', field: 'time', width: '200px' },
+        { title: '接收人', field: 'uesr', width: '120px' },
+
+        { title: '手机号', field: 'sort', width: '180px' },
+        {
+            title: '发送结果',
+            field: 'outcome',
+            width: '120px',
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'success',
+                2: 'danger'
+            },
+            replaceValue: {
+                0: '异常',
+                1: '成功',
+                2: '失败'
+            }
+        },
+        { title: '内容', field: 'content', align: 'left' }
+    ],
+    loadCallback: () => {
+        tableStore.table.data = [
+            {
+                time: '2023-10-01 12:00:00',
+                uesr: '张三',
+                sort: '1234567890',
+                outcome: '1',
+                content:
+                    '①、2025-05-30 00:12:55 220kV龙泉站 220kV主变1#高压侧发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;②、2025-05-30 00:12:55 220kV龙泉站 220kV福泉II线发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;③、2025-05-30 03:51:58 220kV龙泉站 110kV主变1#中压侧发生暂降事件,特征幅值:0.88p.u.(55.96 kV),持续时间:0.015s;④、2025-05-30 10:46:11 110kV八一站 10kV主变1#低压侧发生暂降事件,特征幅值:0.22p.u.(1.25 kV),持续时间:0.595s;⑤、2025-05-30 03:51:58 220kV龙泉站 10kV主变1#低压侧发生暂降事件,特征幅值:0.85p.u.(4.88 kV),持续时间:0.015s;⑥、2025-05-30 00:12:55 220kV龙泉站 110kV主变1#中压侧发生暂降事件,特征幅值:0.84p.u.(53.17 kV),持续时间:0.189s;⑦、2025-05-30 02:49:29 110kV昌洒站 35kV主变1#中压侧发生暂降事件,特征幅值:0.79p.u.(16.04 kV),持续时间:0.073s;⑧、2025-05-30 00:12:55 220kV龙泉站 220kV福泉I线发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;⑨、2025-05-30 00:12:55 220kV龙泉站 10kV主变1#低压侧发生暂降事件,特征幅值:0.85p.u.(4.90 kV),持续时间:0.189s; 详情请登录海南电网电能质量监测系统查看!'
+            },
+            {
+                time: '2023-10-01 12:00:00',
+                uesr: '张三',
+                sort: '1234567890',
+                outcome: '2',
+                content:
+                    '①、2025-05-30 00:12:55 220kV龙泉站 220kV主变1#高压侧发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;②、2025-05-30 00:12:55 220kV龙泉站 220kV福泉II线发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;③、2025-05-30 03:51:58 220kV龙泉站 110kV主变1#中压侧发生暂降事件,特征幅值:0.88p.u.(55.96 kV),持续时间:0.015s;④、2025-05-30 10:46:11 110kV八一站 10kV主变1#低压侧发生暂降事件,特征幅值:0.22p.u.(1.25 kV),持续时间:0.595s;⑤、2025-05-30 03:51:58 220kV龙泉站 10kV主变1#低压侧发生暂降事件,特征幅值:0.85p.u.(4.88 kV),持续时间:0.015s;⑥、2025-05-30 00:12:55 220kV龙泉站 110kV主变1#中压侧发生暂降事件,特征幅值:0.84p.u.(53.17 kV),持续时间:0.189s;⑦、2025-05-30 02:49:29 110kV昌洒站 35kV主变1#中压侧发生暂降事件,特征幅值:0.79p.u.(16.04 kV),持续时间:0.073s;⑧、2025-05-30 00:12:55 220kV龙泉站 220kV福泉I线发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;⑨、2025-05-30 00:12:55 220kV龙泉站 10kV主变1#低压侧发生暂降事件,特征幅值:0.85p.u.(4.90 kV),持续时间:0.189s; 详情请登录海南电网电能质量监测系统查看!'
+            },
+            {
+                time: '2023-10-01 12:00:00',
+                uesr: '张三',
+                sort: '1234567890',
+                outcome: '0',
+                content:
+                    '①、2025-05-30 00:12:55 220kV龙泉站 220kV主变1#高压侧发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;②、2025-05-30 00:12:55 220kV龙泉站 220kV福泉II线发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;③、2025-05-30 03:51:58 220kV龙泉站 110kV主变1#中压侧发生暂降事件,特征幅值:0.88p.u.(55.96 kV),持续时间:0.015s;④、2025-05-30 10:46:11 110kV八一站 10kV主变1#低压侧发生暂降事件,特征幅值:0.22p.u.(1.25 kV),持续时间:0.595s;⑤、2025-05-30 03:51:58 220kV龙泉站 10kV主变1#低压侧发生暂降事件,特征幅值:0.85p.u.(4.88 kV),持续时间:0.015s;⑥、2025-05-30 00:12:55 220kV龙泉站 110kV主变1#中压侧发生暂降事件,特征幅值:0.84p.u.(53.17 kV),持续时间:0.189s;⑦、2025-05-30 02:49:29 110kV昌洒站 35kV主变1#中压侧发生暂降事件,特征幅值:0.79p.u.(16.04 kV),持续时间:0.073s;⑧、2025-05-30 00:12:55 220kV龙泉站 220kV福泉I线发生暂降事件,特征幅值:0.86p.u.(109.56 kV),持续时间:0.189s;⑨、2025-05-30 00:12:55 220kV龙泉站 10kV主变1#低压侧发生暂降事件,特征幅值:0.85p.u.(4.90 kV),持续时间:0.189s; 详情请登录海南电网电能质量监测系统查看!'
+            }
+        ]
+    }
+})
+
+provide('tableStore', tableStore)
+tableStore.table.params.searchValue = ''
+tableStore.table.params.searchState = ''
+const deleteEven = (row: any) => {
+    if (tableStore.table.selection.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: '请选择要删除的数据'
+        })
+    } else {
+        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        }).then(() => {
+            // deleteQuitRunningDevice(tableStore.table.selection.map(item => item.id)).then(res => {
+            //     ElMessage({
+            //         type: 'success',
+            //         message: '删除成功!'
+            //     })
+            //     tableStore.index()
+            // })
+        })
+    }
+}
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/system/ReportConfiguration/components/disposition.vue b/src/views/system/ReportConfiguration/components/disposition.vue
index 32b630d8..e57a8804 100644
--- a/src/views/system/ReportConfiguration/components/disposition.vue
+++ b/src/views/system/ReportConfiguration/components/disposition.vue
@@ -3,7 +3,7 @@
         <TableHeader ref="TableHeaderRef">
             <template v-slot:select>
                 <el-form-item label="模板类型">
-                    <el-select v-model="tableStore.table.params.type" placeholder="Select" size="large"  @change="handleTypeChange">
+                    <el-select v-model="tableStore.table.params.type" placeholder="Select" size="large"  @change="handleTypeChange" filterable>
                         <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                 </el-form-item>
diff --git a/src/views/system/auth/department/popupForm.vue b/src/views/system/auth/department/popupForm.vue
index 2e506e86..dd9e628e 100644
--- a/src/views/system/auth/department/popupForm.vue
+++ b/src/views/system/auth/department/popupForm.vue
@@ -9,7 +9,7 @@
                     <el-input v-model="form.name" placeholder="请输入部门名称" maxlength="32" show-word-limit clearable @input="handleInput"/>
                 </el-form-item>
                 <el-form-item class="top" label="部门类型:" prop="type">
-                    <el-select v-model="form.type" placeholder="选择部门类型" style="width: 100%">
+                    <el-select v-model="form.type" placeholder="选择部门类型" style="width: 100%" filterable>
                         <el-option
                             v-for="item in customDeptOption"
                             :key="item.value"
@@ -19,7 +19,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item class="top" label="子类型:" >
-                    <el-select v-model="form.specialType" placeholder="选择子类型" style="width: 100%">
+                    <el-select v-model="form.specialType" placeholder="选择子类型" style="width: 100%" filterable>
                         <el-option
                             v-for="item in ziDeptOption"
                             :key="item.value"
@@ -29,7 +29,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item class="top" label="部门区域:" prop="area">
-                    <el-select v-model="form.area" placeholder="选择部门区域" style="width: 100%">
+                    <el-select v-model="form.area" placeholder="选择部门区域" style="width: 100%" filterable>
                         <el-option
                             v-for="item in areaOption"
                             :key="item.id"
diff --git a/src/views/system/auth/userList/UserSelect.vue b/src/views/system/auth/userList/UserSelect.vue
index 13401d35..fec70e74 100644
--- a/src/views/system/auth/userList/UserSelect.vue
+++ b/src/views/system/auth/userList/UserSelect.vue
@@ -1,31 +1,31 @@
-<!-- TODO puhui999: 先单独一个后面封装成通用选择组件 -->
-<template>
-    <el-select class='w-1/1' v-bind='attrs'>
-        <el-option
-            v-for='(dict, index) in userOptions'
-            :key='index'
-            :label='dict.nickname'
-            :value='dict.id'
-        />
-    </el-select>
-</template>
-
-<script lang='ts' setup>
-import { ref, onMounted, provide } from 'vue'
-import { getUserListByIds } from '@/api/user-boot/user'
-
-defineOptions({ name: 'UserSelect' })
-const attrs = useAttrs()
-const userOptions = ref([]) // 用户下拉数据
-
-onMounted(async () => {
-    let data: any = []
-    await getUserListByIds().then(res => {
-        data = res.data
-    })
-    if (!data || data.length === 0) {
-        return
-    }
-    userOptions.value = data
-})
-</script>
+<!-- TODO puhui999: 先单独一个后面封装成通用选择组件 -->
+<template>
+    <el-select class='w-1/1' v-bind='attrs'>
+        <el-option
+            v-for='(dict, index) in userOptions'
+            :key='index'
+            :label='dict.nickname'
+            :value='dict.id'
+        />
+    </el-select>
+</template>
+
+<script lang='ts' setup>
+import { ref, onMounted, provide } from 'vue'
+import { getUserListByIds } from '@/api/user-boot/user'
+
+defineOptions({ name: 'UserSelect' })
+const attrs = useAttrs()
+const userOptions = ref([]) // 用户下拉数据
+
+onMounted(async () => {
+    let data: any = []
+    await getUserListByIds().then(res => {
+        data = res.data
+    })
+    if (!data || data.length === 0) {
+        return
+    }
+    userOptions.value = data
+})
+</script>
diff --git a/src/views/system/auth/userList/index.vue b/src/views/system/auth/userList/index.vue
index cc2453fa..8503a222 100644
--- a/src/views/system/auth/userList/index.vue
+++ b/src/views/system/auth/userList/index.vue
@@ -3,7 +3,7 @@
         <TableHeader showCustomColumn>
             <template v-slot:select>
                 <el-form-item label="用户状态">
-                    <el-select v-model="tableStore.table.params.searchState" placeholder="选择用户状态">
+                    <el-select v-model="tableStore.table.params.searchState" placeholder="选择用户状态" filterable>
                         <el-option
                             v-for="(item, index) in userState"
                             :label="item.label"
@@ -13,7 +13,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="用户类型:">
-                    <el-select v-model="tableStore.table.params.casualUser" placeholder="选择用户类型">
+                    <el-select v-model="tableStore.table.params.casualUser" placeholder="选择用户类型" filterable>
                         <el-option
                             v-for="(item, index) in casualUser"
                             :label="item.label"
diff --git a/src/views/system/auth/userList/popupEdit.vue b/src/views/system/auth/userList/popupEdit.vue
index 889f9573..c8e40ce6 100644
--- a/src/views/system/auth/userList/popupEdit.vue
+++ b/src/views/system/auth/userList/popupEdit.vue
@@ -11,7 +11,7 @@
                 <el-input v-model="form.password" placeholder="请输入密码" disabled />
             </el-form-item>
             <el-form-item label="权限类型" prop="type">
-                <el-select v-model="form.type" @change="changeValue" disabled placeholder="请选择权限类型">
+                <el-select v-model="form.type" @change="changeValue" disabled placeholder="请选择权限类型" filterable>
                     <el-option
                         v-for="(item, index) in UserTypeOption"
                         :label="item.label"
@@ -21,7 +21,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="用户类型" prop="casualUser">
-                <el-select v-model="form.casualUser" placeholder="请选择用户类型类型">
+                <el-select v-model="form.casualUser" placeholder="请选择用户类型类型" filterable>
                     <el-option
                         v-for="(item, index) in TypeOptions"
                         :label="item.label"
@@ -34,7 +34,7 @@
                 <Area style="width: 100%" v-model="form.deptId" />
             </el-form-item>
             <el-form-item label="角色" prop="role">
-                <el-select v-model="form.role" placeholder="请选择角色" multiple collapse-tags>
+                <el-select v-model="form.role" placeholder="请选择角色" multiple collapse-tags filterable>
                     <el-option
                         v-for="(item, index) in roleOptions"
                         :label="item.label"
diff --git a/src/views/system/bpm/processInstance/detail/dialog/TaskDelegateForm.vue b/src/views/system/bpm/processInstance/detail/dialog/TaskDelegateForm.vue
index 58739738..13a76ae2 100644
--- a/src/views/system/bpm/processInstance/detail/dialog/TaskDelegateForm.vue
+++ b/src/views/system/bpm/processInstance/detail/dialog/TaskDelegateForm.vue
@@ -1,93 +1,93 @@
-<template>
-  <el-dialog v-model="dialogVisible" title="委派任务" width="500">
-    <el-form
-      ref="formRef"
-      v-loading="formLoading"
-      :model="formData"
-      :rules="formRules"
-      label-width="110px"
-    >
-      <el-form-item label="接收人" prop="delegateUserId">
-        <el-select v-model="formData.delegateUserId" clearable style="width: 100%">
-          <el-option
-            v-for="item in userList"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="委派理由" prop="reason">
-        <el-input v-model="formData.reason" clearable placeholder="请输入委派理由" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </el-dialog>
-</template>
-<script lang="ts" setup>
-import { onMounted, provide, ref, getCurrentInstance, reactive, watch, unref,nextTick } from 'vue'
-import { getUserSimpleList } from '@/api/user-boot/user'
-import { delegateTask } from '@/api/bpm-boot/task'
-
-defineOptions({ name: 'BpmTaskDelegateForm' })
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const formLoading = ref(false) // 表单的加载中
-const formData = ref({
-  id: '',
-  delegateUserId: undefined,
-  reason: ''
-})
-const formRules = ref({
-  delegateUserId: [{ required: true, message: '接收人不能为空', trigger: 'change' }],
-  reason: [{ required: true, message: '委派理由不能为空', trigger: 'blur' }]
-})
-
-const formRef = ref() // 表单 Ref
-const userList = ref<any[]>([]) // 用户列表
-
-/** 打开弹窗 */
-const open = async (id: string) => {
-  dialogVisible.value = true
-  resetForm()
-  formData.value.id = id
-
-  // 获得用户列表
-  await getUserSimpleList().then(res => {
-    userList.value = res.data
-  })
-}
-defineExpose({ open }) // 提供 openModal 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  if (!formRef) return
-  const valid = await formRef.value.validate()
-  if (!valid) return
-  // 提交请求
-  formLoading.value = true
-  try {
-    await delegateTask(formData.value)
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: '',
-    delegateUserId: undefined,
-    reason: ''
-  }
-  formRef.value?.resetFields()
-}
-</script>
+<template>
+  <el-dialog v-model="dialogVisible" title="委派任务" width="500">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="110px"
+    >
+      <el-form-item label="接收人" prop="delegateUserId">
+        <el-select v-model="formData.delegateUserId" clearable style="width: 100%" filterable>
+          <el-option
+            v-for="item in userList"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="委派理由" prop="reason">
+        <el-input v-model="formData.reason" clearable placeholder="请输入委派理由" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </el-dialog>
+</template>
+<script lang="ts" setup>
+import { onMounted, provide, ref, getCurrentInstance, reactive, watch, unref,nextTick } from 'vue'
+import { getUserSimpleList } from '@/api/user-boot/user'
+import { delegateTask } from '@/api/bpm-boot/task'
+
+defineOptions({ name: 'BpmTaskDelegateForm' })
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const formData = ref({
+  id: '',
+  delegateUserId: undefined,
+  reason: ''
+})
+const formRules = ref({
+  delegateUserId: [{ required: true, message: '接收人不能为空', trigger: 'change' }],
+  reason: [{ required: true, message: '委派理由不能为空', trigger: 'blur' }]
+})
+
+const formRef = ref() // 表单 Ref
+const userList = ref<any[]>([]) // 用户列表
+
+/** 打开弹窗 */
+const open = async (id: string) => {
+  dialogVisible.value = true
+  resetForm()
+  formData.value.id = id
+
+  // 获得用户列表
+  await getUserSimpleList().then(res => {
+    userList.value = res.data
+  })
+}
+defineExpose({ open }) // 提供 openModal 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    await delegateTask(formData.value)
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    delegateUserId: undefined,
+    reason: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/bpm/processInstance/detail/dialog/TaskReturnForm.vue b/src/views/system/bpm/processInstance/detail/dialog/TaskReturnForm.vue
index 3d6cd6c4..0e36e121 100644
--- a/src/views/system/bpm/processInstance/detail/dialog/TaskReturnForm.vue
+++ b/src/views/system/bpm/processInstance/detail/dialog/TaskReturnForm.vue
@@ -1,93 +1,93 @@
-<template>
-  <el-dialog v-model='dialogVisible' title='回退任务' width='500'>
-    <el-form
-        ref='formRef'
-        v-loading='formLoading'
-        :model='formData'
-        :rules='formRules'
-        label-width='110px'
-    >
-      <el-form-item label='退回节点' prop='targetTaskDefinitionKey'>
-        <el-select v-model='formData.targetTaskDefinitionKey' clearable style='width: 100%'>
-          <el-option
-              v-for='item in returnList'
-              :key='item.taskDefinitionKey'
-              :label='item.name'
-              :value='item.taskDefinitionKey'
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label='回退理由' prop='reason'>
-        <el-input v-model='formData.reason' clearable placeholder='请输入回退理由' />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button :disabled='formLoading' type='primary' @click='submitForm'>确 定</el-button>
-      <el-button @click='dialogVisible = false'>取 消</el-button>
-    </template>
-  </el-dialog>
-</template>
-<script lang='ts' name='TaskRollbackDialogForm' setup>
-import { onMounted, provide, ref, getCurrentInstance, reactive, watch, unref, nextTick } from 'vue'
-import { ElMessage } from 'element-plus'
-import { getTaskListByReturn, returnTask } from '@/api/bpm-boot/task'
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const formLoading = ref(false) // 表单的加载中
-const formData = ref({
-  id: '',
-  targetTaskDefinitionKey: undefined,
-  reason: ''
-})
-const formRules = ref({
-  targetTaskDefinitionKey: [{ required: true, message: '必须选择回退节点', trigger: 'change' }],
-  reason: [{ required: true, message: '回退理由不能为空', trigger: 'blur' }]
-})
-
-const formRef = ref() // 表单 Ref
-const returnList = ref([] as any)
-/** 打开弹窗 */
-const open = async (id: string) => {
-  await getTaskListByReturn(id).then(res => {
-    returnList.value = res.data
-  })
-  if (returnList.value.length === 0) {
-    ElMessage.warning('当前没有可回退的节点')
-    return false
-  }
-  dialogVisible.value = true
-  resetForm()
-  formData.value.id = id
-}
-defineExpose({ open }) // 提供 openModal 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  if (!formRef) return
-  const valid = await formRef.value.validate()
-  if (!valid) return
-  // 提交请求
-  formLoading.value = true
-  try {
-    await returnTask(formData.value)
-    ElMessage.success('回退成功')
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: '',
-    targetTaskDefinitionKey: undefined,
-    reason: ''
-  }
-  formRef.value?.resetFields()
-}
-</script>
+<template>
+  <el-dialog v-model='dialogVisible' title='回退任务' width='500'>
+    <el-form
+        ref='formRef'
+        v-loading='formLoading'
+        :model='formData'
+        :rules='formRules'
+        label-width='110px'
+    >
+      <el-form-item label='退回节点' prop='targetTaskDefinitionKey'>
+        <el-select v-model='formData.targetTaskDefinitionKey' clearable style='width: 100%' filterable>
+          <el-option
+              v-for='item in returnList'
+              :key='item.taskDefinitionKey'
+              :label='item.name'
+              :value='item.taskDefinitionKey'
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label='回退理由' prop='reason'>
+        <el-input v-model='formData.reason' clearable placeholder='请输入回退理由' />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled='formLoading' type='primary' @click='submitForm'>确 定</el-button>
+      <el-button @click='dialogVisible = false'>取 消</el-button>
+    </template>
+  </el-dialog>
+</template>
+<script lang='ts' name='TaskRollbackDialogForm' setup>
+import { onMounted, provide, ref, getCurrentInstance, reactive, watch, unref, nextTick } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getTaskListByReturn, returnTask } from '@/api/bpm-boot/task'
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const formData = ref({
+  id: '',
+  targetTaskDefinitionKey: undefined,
+  reason: ''
+})
+const formRules = ref({
+  targetTaskDefinitionKey: [{ required: true, message: '必须选择回退节点', trigger: 'change' }],
+  reason: [{ required: true, message: '回退理由不能为空', trigger: 'blur' }]
+})
+
+const formRef = ref() // 表单 Ref
+const returnList = ref([] as any)
+/** 打开弹窗 */
+const open = async (id: string) => {
+  await getTaskListByReturn(id).then(res => {
+    returnList.value = res.data
+  })
+  if (returnList.value.length === 0) {
+    ElMessage.warning('当前没有可回退的节点')
+    return false
+  }
+  dialogVisible.value = true
+  resetForm()
+  formData.value.id = id
+}
+defineExpose({ open }) // 提供 openModal 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    await returnTask(formData.value)
+    ElMessage.success('回退成功')
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    targetTaskDefinitionKey: undefined,
+    reason: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/bpm/processInstance/detail/dialog/TaskSignCreateForm.vue b/src/views/system/bpm/processInstance/detail/dialog/TaskSignCreateForm.vue
index a9efb2ed..f9868fe7 100644
--- a/src/views/system/bpm/processInstance/detail/dialog/TaskSignCreateForm.vue
+++ b/src/views/system/bpm/processInstance/detail/dialog/TaskSignCreateForm.vue
@@ -1,102 +1,102 @@
-<template>
-  <el-dialog v-model="dialogVisible" title="加签" width="500">
-    <el-form
-      ref="formRef"
-      v-loading="formLoading"
-      :model="formData"
-      :rules="formRules"
-      label-width="110px"
-    >
-      <el-form-item label="加签处理人" prop="userIds">
-        <el-select v-model="formData.userIds" multiple clearable style="width: 100%">
-          <el-option
-            v-for="item in userList"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="加签理由" prop="reason">
-        <el-input v-model="formData.reason" clearable placeholder="请输入加签理由" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm('before')">
-        向前加签
-      </el-button>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm('after')">
-        向后加签
-      </el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </el-dialog>
-</template>
-<script lang="ts" setup>
-import { onMounted, provide, ref, getCurrentInstance, reactive, watch, unref,nextTick } from 'vue'
-import { ElMessage } from 'element-plus'
-import { getUserSimpleList } from '@/api/user-boot/user'
-import { createSignTask } from '@/api/bpm-boot/task'
-defineOptions({ name: 'TaskSignCreateForm' })
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const formLoading = ref(false) // 表单的加载中
-const formData = ref({
-  id: '',
-  userIds: [],
-  type: '',
-  reason: ''
-})
-const formRules = ref({
-  userIds: [{ required: true, message: '加签处理人不能为空', trigger: 'change' }],
-  reason: [{ required: true, message: '加签理由不能为空', trigger: 'change' }]
-})
-
-const formRef = ref() // 表单 Ref
-const userList = ref<any[]>([]) // 用户列表
-
-/** 打开弹窗 */
-const open = async (id: string) => {
-  dialogVisible.value = true
-  resetForm()
-  formData.value.id = id
-  // 获得用户列表
-  // 获得用户列表
-  await getUserSimpleList().then(res => {
-    userList.value = res.data
-  })
-}
-defineExpose({ open }) // 提供 openModal 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async (type: string) => {
-  // 校验表单
-  if (!formRef) return
-  const valid = await formRef.value.validate()
-  if (!valid) return
-  // 提交请求
-  formLoading.value = true
-  formData.value.type = type
-  try {
-    await createSignTask(formData.value)
-    ElMessage.success('加签成功')
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: '',
-    userIds: [],
-    type: '',
-    reason: ''
-  }
-  formRef.value?.resetFields()
-}
-</script>
+<template>
+  <el-dialog v-model="dialogVisible" title="加签" width="500">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="110px"
+    >
+      <el-form-item label="加签处理人" prop="userIds">
+        <el-select v-model="formData.userIds" multiple clearable style="width: 100%" filterable>
+          <el-option
+            v-for="item in userList"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="加签理由" prop="reason">
+        <el-input v-model="formData.reason" clearable placeholder="请输入加签理由" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm('before')">
+        向前加签
+      </el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm('after')">
+        向后加签
+      </el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </el-dialog>
+</template>
+<script lang="ts" setup>
+import { onMounted, provide, ref, getCurrentInstance, reactive, watch, unref,nextTick } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getUserSimpleList } from '@/api/user-boot/user'
+import { createSignTask } from '@/api/bpm-boot/task'
+defineOptions({ name: 'TaskSignCreateForm' })
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const formData = ref({
+  id: '',
+  userIds: [],
+  type: '',
+  reason: ''
+})
+const formRules = ref({
+  userIds: [{ required: true, message: '加签处理人不能为空', trigger: 'change' }],
+  reason: [{ required: true, message: '加签理由不能为空', trigger: 'change' }]
+})
+
+const formRef = ref() // 表单 Ref
+const userList = ref<any[]>([]) // 用户列表
+
+/** 打开弹窗 */
+const open = async (id: string) => {
+  dialogVisible.value = true
+  resetForm()
+  formData.value.id = id
+  // 获得用户列表
+  // 获得用户列表
+  await getUserSimpleList().then(res => {
+    userList.value = res.data
+  })
+}
+defineExpose({ open }) // 提供 openModal 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async (type: string) => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  formData.value.type = type
+  try {
+    await createSignTask(formData.value)
+    ElMessage.success('加签成功')
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    userIds: [],
+    type: '',
+    reason: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/bpm/processInstance/detail/dialog/TaskTransferForm.vue b/src/views/system/bpm/processInstance/detail/dialog/TaskTransferForm.vue
index 17ccfd03..497d7761 100644
--- a/src/views/system/bpm/processInstance/detail/dialog/TaskTransferForm.vue
+++ b/src/views/system/bpm/processInstance/detail/dialog/TaskTransferForm.vue
@@ -1,93 +1,93 @@
-<template>
-  <el-dialog v-model="dialogVisible" title="转派任务" width="500">
-    <el-form
-      ref="formRef"
-      v-loading="formLoading"
-      :model="formData"
-      :rules="formRules"
-      label-width="110px"
-    >
-      <el-form-item label="新审批人" prop="assigneeUserId">
-        <el-select v-model="formData.assigneeUserId" clearable style="width: 100%">
-          <el-option
-            v-for="item in userList"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="转派理由" prop="reason">
-        <el-input v-model="formData.reason" clearable placeholder="请输入转派理由" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </el-dialog>
-</template>
-<script lang="ts" setup>
-import { onMounted, provide, ref, getCurrentInstance, reactive, watch, unref,nextTick } from 'vue'
-import { ElMessage } from 'element-plus'
-import { getUserSimpleList } from '@/api/user-boot/user'
-import { transferTask } from '@/api/bpm-boot/task'
-
-defineOptions({ name: 'TaskTransferForm' })
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const formLoading = ref(false) // 表单的加载中
-const formData = ref({
-  id: '',
-  assigneeUserId: undefined,
-  reason: ''
-})
-const formRules = ref({
-  assigneeUserId: [{ required: true, message: '新审批人不能为空', trigger: 'change' }],
-  reason: [{ required: true, message: '转派理由不能为空', trigger: 'blur' }]
-})
-
-const formRef = ref() // 表单 Ref
-const userList = ref<any[]>([]) // 用户列表
-
-/** 打开弹窗 */
-const open = async (id: string) => {
-  dialogVisible.value = true
-  resetForm()
-  formData.value.id = id
-  // 获得用户列表
-  await getUserSimpleList().then(res => {
-    userList.value = res.data
-  })
-}
-defineExpose({ open }) // 提供 openModal 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  if (!formRef) return
-  const valid = await formRef.value.validate()
-  if (!valid) return
-  // 提交请求
-  formLoading.value = true
-  try {
-    await transferTask(formData.value)
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: '',
-    assigneeUserId: undefined,
-    reason: ''
-  }
-  formRef.value?.resetFields()
-}
-</script>
+<template>
+  <el-dialog v-model="dialogVisible" title="转派任务" width="500">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="110px"
+    >
+      <el-form-item label="新审批人" prop="assigneeUserId">
+        <el-select v-model="formData.assigneeUserId" clearable style="width: 100%" filterable>
+          <el-option
+            v-for="item in userList"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="转派理由" prop="reason">
+        <el-input v-model="formData.reason" clearable placeholder="请输入转派理由" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </el-dialog>
+</template>
+<script lang="ts" setup>
+import { onMounted, provide, ref, getCurrentInstance, reactive, watch, unref,nextTick } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getUserSimpleList } from '@/api/user-boot/user'
+import { transferTask } from '@/api/bpm-boot/task'
+
+defineOptions({ name: 'TaskTransferForm' })
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中
+const formData = ref({
+  id: '',
+  assigneeUserId: undefined,
+  reason: ''
+})
+const formRules = ref({
+  assigneeUserId: [{ required: true, message: '新审批人不能为空', trigger: 'change' }],
+  reason: [{ required: true, message: '转派理由不能为空', trigger: 'blur' }]
+})
+
+const formRef = ref() // 表单 Ref
+const userList = ref<any[]>([]) // 用户列表
+
+/** 打开弹窗 */
+const open = async (id: string) => {
+  dialogVisible.value = true
+  resetForm()
+  formData.value.id = id
+  // 获得用户列表
+  await getUserSimpleList().then(res => {
+    userList.value = res.data
+  })
+}
+defineExpose({ open }) // 提供 openModal 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    await transferTask(formData.value)
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: '',
+    assigneeUserId: undefined,
+    reason: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/modelManage/form.vue b/src/views/system/modelManage/form.vue
index 15a7e38a..fbab98b1 100644
--- a/src/views/system/modelManage/form.vue
+++ b/src/views/system/modelManage/form.vue
@@ -1,81 +1,81 @@
-<template>
-    <el-dialog draggable width="400px" v-model="dialogVisible" :title="title">
-        <el-form :inline="false" :model="form" label-width="auto" class="form-one" :rules="rules" ref="formRef">
-            <el-form-item label="型号名称" prop="name">
-                <el-input
-                    v-model.trim="form.name"
-                    clearable
-                    maxlength="32"
-                    show-word-limit
-                    placeholder="请输入型号名称"
-                />
-            </el-form-item>
-            <el-form-item label="关联icd" prop="icdId">
-                <el-select v-model="form.icdId" placeholder="选择关联icd">
-                    <el-option v-for="item in options" filterable :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="dialogVisible = false">取消</el-button>
-                <el-button type="primary" @click="submit">确认</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, inject, onMounted } from 'vue'
-import { reactive } from 'vue'
-import { getIcdList } from '@/api/device-boot/icd'
-import { addDevType, updateDevType } from '@/api/device-boot/modelManage'
-import { UploadInstance, UploadProps, UploadRawFile, ElMessage, genFileId } from 'element-plus'
-const emit = defineEmits(['submit'])
-const dialogVisible = ref(false)
-const title = ref('')
-const formRef = ref()
-const form = reactive<anyObj>({
-    name: '',
-    icdId: '',
-    id:''
-})
-const options: any = ref([])
-const rules = {
-    icdId: [{ required: true, message: '请选择关联icd', trigger: 'change' }],
-    name: [{ required: true, message: '请输入型号名称', trigger: 'blur' }]
-}
-
-const open = (text: string, data?: anyObj) => {
-    getIcdList().then(res => {
-        options.value = res.data
-    })
-    form.icdId = data?.icdId
-    form.name = data?.name
-    form.id = data?.id
-    title.value = text
-    dialogVisible.value = true
-}
-
-onMounted(() => {})
-const submit = () => {
-    formRef.value.validate(async (valid: boolean) => {
-        if (valid) {
-            if (title.value == '新增终端型号') {
-                addDevType(form).then(res => {
-                    ElMessage.success('新增成功')
-                    dialogVisible.value = false
-                    emit('submit')
-                })
-            } else {
-                updateDevType(form).then(res => {
-                    ElMessage.success('编辑成功')
-                    dialogVisible.value = false
-                    emit('submit')
-                })
-            }
-        }
-    })
-}
-
-defineExpose({ open })
-</script>
+<template>
+    <el-dialog draggable width="400px" v-model="dialogVisible" :title="title">
+        <el-form :inline="false" :model="form" label-width="auto" class="form-one" :rules="rules" ref="formRef">
+            <el-form-item label="型号名称" prop="name">
+                <el-input
+                    v-model.trim="form.name"
+                    clearable
+                    maxlength="32"
+                    show-word-limit
+                    placeholder="请输入型号名称"
+                />
+            </el-form-item>
+            <el-form-item label="关联icd" prop="icdId">
+                <el-select v-model="form.icdId" placeholder="选择关联icd" filterable>
+                    <el-option v-for="item in options" filterable :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject, onMounted } from 'vue'
+import { reactive } from 'vue'
+import { getIcdList } from '@/api/device-boot/icd'
+import { addDevType, updateDevType } from '@/api/device-boot/modelManage'
+import { UploadInstance, UploadProps, UploadRawFile, ElMessage, genFileId } from 'element-plus'
+const emit = defineEmits(['submit'])
+const dialogVisible = ref(false)
+const title = ref('')
+const formRef = ref()
+const form = reactive<anyObj>({
+    name: '',
+    icdId: '',
+    id:''
+})
+const options: any = ref([])
+const rules = {
+    icdId: [{ required: true, message: '请选择关联icd', trigger: 'change' }],
+    name: [{ required: true, message: '请输入型号名称', trigger: 'blur' }]
+}
+
+const open = (text: string, data?: anyObj) => {
+    getIcdList().then(res => {
+        options.value = res.data
+    })
+    form.icdId = data?.icdId
+    form.name = data?.name
+    form.id = data?.id
+    title.value = text
+    dialogVisible.value = true
+}
+
+onMounted(() => {})
+const submit = () => {
+    formRef.value.validate(async (valid: boolean) => {
+        if (valid) {
+            if (title.value == '新增终端型号') {
+                addDevType(form).then(res => {
+                    ElMessage.success('新增成功')
+                    dialogVisible.value = false
+                    emit('submit')
+                })
+            } else {
+                updateDevType(form).then(res => {
+                    ElMessage.success('编辑成功')
+                    dialogVisible.value = false
+                    emit('submit')
+                })
+            }
+        }
+    })
+}
+
+defineExpose({ open })
+</script>
diff --git a/src/views/system/reportForms/form.vue b/src/views/system/reportForms/form.vue
index dbafa61d..0fd7d0a0 100644
--- a/src/views/system/reportForms/form.vue
+++ b/src/views/system/reportForms/form.vue
@@ -1,124 +1,124 @@
-<template>
-    <el-dialog draggable :title="title" v-model="formVisible" width="30%" :before-close="closeDialog">
-        <el-form :model="formdata" label-width="100px" :rules="rules" ref="ruleForm">
-            <el-form-item label="模板名称" prop="name">
-                <el-input placeholder="模板名称" v-model="formdata.name" style="width: 100%" maxlength="32" show-word-limit @input="handleInput"></el-input>
-            </el-form-item>
-            <el-form-item label="部门" prop="deptId">
-                <Area
-                    v-model="formdata.deptId"
-                    style="width: 100%"
-                    collapse-tags
-                    :props="{ multiple: true, label: 'name', value: 'id', emitPath: false }"
-                />
-            </el-form-item>
-
-            <el-form-item label="模板类型" prop="reportType">
-                <el-select style="width: 100%" v-model="formdata.reportType" placeholder="请选择模板类型">
-                    <el-option
-                        v-for="item in classificationData"
-                        :key="item.id"
-                        :label="item.label"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="报表类型" prop="reportForm">
-                <el-select style="width: 100%" v-model="formdata.reportForm" placeholder="请选择报表类型">
-                    <el-option
-                        v-for="item in reportFormList"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <el-button @click="closeDialog">取 消</el-button>
-            <el-button type="primary" @click="preservation">确 定</el-button>
-        </template>
-    </el-dialog>
-</template>
-<script setup lang="ts">
-import Area from '@/components/form/area/index.vue'
-import { getCustomReportTemplateById } from '@/api/harmonic-boot/luckyexcel'
-import { ref, reactive } from 'vue'
-const emit = defineEmits(['submitForm'])
-const title = ref('')
-const list = ref({})
-const ruleForm = ref()
-const formVisible = ref(false)
-const classificationData = [
-    {
-        label: '电能质量报表类型',
-        id: '1'
-    },
-    {
-        label: '用能报表类型',
-        id: '2'
-    }
-]
-const reportFormList = [
-    {
-        value: '1',
-        label: '分析报表'
-    },
-    {
-        value: '2',
-        label: '统计报表'
-    },
-    {
-        value: '3',
-        label: '自定义报表'
-    }
-]
-const rules = {
-    name: [{ required: true, message: '请输入模板名称', trigger: 'blur' }],
-    deptId: [{ required: true, message: '请选择部门', trigger: 'change' }],
-    reportType: [{ required: true, message: '请选择模板类型', trigger: 'change' }],
-    reportForm: [{ required: true, message: '请选择报表类型', trigger: 'change' }]
-}
-const formdata = ref({
-    name: '',
-    deptId: [],
-    reportType: '',
-    reportForm: ''
-})
-// 确定
-const preservation = () => {
-    ruleForm.value.validate((valid: boolean) => {
-        if (valid) {
-            emit('submitForm', formdata.value, title.value)
-            formVisible.value = false
-        }
-    })
-}
-
-// 关闭
-const closeDialog = () => {
-    formVisible.value = false
-}
-const open = (text: string, row?: any) => {
-    title.value = text
-    if (row.id) {
-        getCustomReportTemplateById({ id: row.id }).then(res => {
-            formdata.value = res.data
-            formdata.value.deptId = res.data.valueTitle.split(',')
-        })
-    }
-
-    formVisible.value = true
-}
-
-const handleInput = (value: string) => {
-    // 过滤空格
-    const filteredValue = value.replace(/\s/g, '')
-    if (filteredValue !== value) {
-        formdata.value.name = filteredValue
-    }
-}
-
-defineExpose({ open })
-</script>
-<style lang="scss" scoped></style>
+<template>
+    <el-dialog draggable :title="title" v-model="formVisible" width="30%" :before-close="closeDialog">
+        <el-form :model="formdata" label-width="100px" :rules="rules" ref="ruleForm">
+            <el-form-item label="模板名称" prop="name">
+                <el-input placeholder="模板名称" v-model="formdata.name" style="width: 100%" maxlength="32" show-word-limit @input="handleInput"></el-input>
+            </el-form-item>
+            <el-form-item label="部门" prop="deptId">
+                <Area
+                    v-model="formdata.deptId"
+                    style="width: 100%"
+                    collapse-tags
+                    :props="{ multiple: true, label: 'name', value: 'id', emitPath: false }"
+                />
+            </el-form-item>
+
+            <el-form-item label="模板类型" prop="reportType">
+                <el-select style="width: 100%" v-model="formdata.reportType" placeholder="请选择模板类型" filterable>
+                    <el-option
+                        v-for="item in classificationData"
+                        :key="item.id"
+                        :label="item.label"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="报表类型" prop="reportForm">
+                <el-select style="width: 100%" v-model="formdata.reportForm" placeholder="请选择报表类型" filterable>
+                    <el-option
+                        v-for="item in reportFormList"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <el-button @click="closeDialog">取 消</el-button>
+            <el-button type="primary" @click="preservation">确 定</el-button>
+        </template>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import Area from '@/components/form/area/index.vue'
+import { getCustomReportTemplateById } from '@/api/harmonic-boot/luckyexcel'
+import { ref, reactive } from 'vue'
+const emit = defineEmits(['submitForm'])
+const title = ref('')
+const list = ref({})
+const ruleForm = ref()
+const formVisible = ref(false)
+const classificationData = [
+    {
+        label: '电能质量报表类型',
+        id: '1'
+    },
+    {
+        label: '用能报表类型',
+        id: '2'
+    }
+]
+const reportFormList = [
+    {
+        value: '1',
+        label: '分析报表'
+    },
+    {
+        value: '2',
+        label: '统计报表'
+    },
+    {
+        value: '3',
+        label: '自定义报表'
+    }
+]
+const rules = {
+    name: [{ required: true, message: '请输入模板名称', trigger: 'blur' }],
+    deptId: [{ required: true, message: '请选择部门', trigger: 'change' }],
+    reportType: [{ required: true, message: '请选择模板类型', trigger: 'change' }],
+    reportForm: [{ required: true, message: '请选择报表类型', trigger: 'change' }]
+}
+const formdata = ref({
+    name: '',
+    deptId: [],
+    reportType: '',
+    reportForm: ''
+})
+// 确定
+const preservation = () => {
+    ruleForm.value.validate((valid: boolean) => {
+        if (valid) {
+            emit('submitForm', formdata.value, title.value)
+            formVisible.value = false
+        }
+    })
+}
+
+// 关闭
+const closeDialog = () => {
+    formVisible.value = false
+}
+const open = (text: string, row?: any) => {
+    title.value = text
+    if (row.id) {
+        getCustomReportTemplateById({ id: row.id }).then(res => {
+            formdata.value = res.data
+            formdata.value.deptId = res.data.valueTitle.split(',')
+        })
+    }
+
+    formVisible.value = true
+}
+
+const handleInput = (value: string) => {
+    // 过滤空格
+    const filteredValue = value.replace(/\s/g, '')
+    if (filteredValue !== value) {
+        formdata.value.name = filteredValue
+    }
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/views/system/scheduledTasks/index.vue b/src/views/system/scheduledTasks/index.vue
index f2edba52..729435f5 100644
--- a/src/views/system/scheduledTasks/index.vue
+++ b/src/views/system/scheduledTasks/index.vue
@@ -8,7 +8,7 @@
                             placeholder="请输入任务名称" />
                     </el-form-item>
                     <el-form-item label="任务状态:">
-                        <el-select v-model="tableStore.table.params.searchState" clearable placeholder="请选择任务状态">
+                        <el-select v-model="tableStore.table.params.searchState" clearable placeholder="请选择任务状态" filterable>
                             <el-option label="运行" :value="1"></el-option>
                             <el-option label="停止" :value="2"></el-option>
                         </el-select>
diff --git a/src/views/system/strategyManage/index.vue b/src/views/system/strategyManage/index.vue
index a59d0e4c..f7080a53 100644
--- a/src/views/system/strategyManage/index.vue
+++ b/src/views/system/strategyManage/index.vue
@@ -132,7 +132,7 @@
          <el-dialog v-model="systemDialogVisible" :title=sysTitle width="500px">
                     <el-form ref="sysFormRef" :model="sysForm" :rules="sysRules" label-width="auto">
                          <el-form-item label="系统类型:" prop="type">
-                    <el-select v-model="sysForm.type" placeholder="请选择系统类型" style="width: 100%">
+                    <el-select v-model="sysForm.type" placeholder="请选择系统类型" style="width: 100%" filterable>
                        <el-option label="省级系统" value="0"></el-option>
                        <el-option label="企业系统" value="1"></el-option>
                        <el-option label="数据中心" value="2"></el-option>
@@ -167,6 +167,7 @@
                         :disabled="flagtyoe == 'add' ? false : true"
                         placeholder="请选择"
                         style="width: 100%"
+                        filterable
                     >
                         <el-option label="未激活" value="0"></el-option>
                          <el-option label="已激活" value="1"></el-option>
diff --git a/src/views/system/subject/form/index.vue b/src/views/system/subject/form/index.vue
index 9c539271..73d1c726 100644
--- a/src/views/system/subject/form/index.vue
+++ b/src/views/system/subject/form/index.vue
@@ -7,7 +7,7 @@
                     <el-input v-model.trim="configStore.name" placeholder="请输入主题名称" maxlength="32" show-word-limit />
                 </el-form-item>
                 <el-form-item label="后台页面切换动画" prop="mainAnimation">
-                    <el-select v-model="configStore.mainAnimation">
+                    <el-select v-model="configStore.mainAnimation" filterable>
                         <el-option label="slide-right" value="slide-right"></el-option>
                         <el-option label="slide-left" value="slide-left"></el-option>
                         <el-option label="el-fade-in-linear" value="el-fade-in-linear"></el-option>
diff --git a/src/views/system/version/index.vue b/src/views/system/version/index.vue
index bbd6f787..23aec491 100644
--- a/src/views/system/version/index.vue
+++ b/src/views/system/version/index.vue
@@ -1,122 +1,122 @@
-<template>
-    <div class="default-main">
-        <TableHeader :showReset="false">
-            <template #select>
-                <!-- <el-radio-group v-model.trim="tableStore.table.params.versionType" @change="tableStore.index()">
-                    <el-radio-button label="web" value="WEB" />
-                    <el-radio-button label="app" value="APP" />
-
-                </el-radio-group> -->
-            </template>
-            <template #operation>
-                <el-button type="primary" icon="el-icon-Plus" @click="addMenu">新增版本</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" />
-        <el-dialog width="600px" v-model.trim="dialogVisible" title="新增版本">
-            <el-form :inline="false" :model="form" label-width="auto" class="form-one">
-                <el-form-item label="版本号">
-                    <el-input
-                        maxlength="32"
-                        show-word-limit
-                        v-model.trim="form.appVersion"
-                        placeholder="请输入版本号"
-                    />
-                </el-form-item>
-                <el-form-item label="整改内容">
-                    <el-input
-                        maxlength="300"
-                        type="textarea"
-                        show-word-limit
-                        v-model.trim="form.content"
-                        placeholder="请输入整改内容"
-                    />
-                </el-form-item>
-                <el-form-item label="发布类型">
-                    <el-select v-model.trim="form.sev" placeholder="请选择发布类型">
-                        <el-option label="优化" :value="0" />
-                        <el-option label="bug调整" :value="1" />
-                    </el-select>
-                </el-form-item>
-            </el-form>
-
-            <template #footer>
-                <span class="dialog-footer">
-                    <el-button @click="dialogVisible = false">取消</el-button>
-                    <el-button type="primary" @click="submit">确认</el-button>
-                </span>
-            </template>
-        </el-dialog>
-    </div>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage } from 'element-plus'
-import { addVersion } from '@/api/systerm'
-import router from '@/router/index'
-const dialogVisible = ref(false)
-const form = ref({
-    appVersion: '',
-    content: '',
-    versionType: 'WEB',
-    sev: ''
-})
-const tableStore = new TableStore({
-    url: '/system-boot/appVersion/getAllData',
-    method: 'POST',
-    showPage: false,
-    paramsPOST: true,
-    column: [
-        {
-            title: '序号',
-            width: 80,
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { title: '版本号', field: 'versionName', width: '150' },
-
-        { title: '创建时间', field: 'createTime', width: '220' },
-        {
-            title: '发布类型',
-            field: 'sev',
-            formatter: row => {
-                return row.cellValue == 0 ? '优化' : 'bug调整'
-            },
-            width: '150'
-        },
-        { title: '整改内容', field: 'content' }
-    ]
-})
-tableStore.table.params.versionType = 'WEB'
-provide('tableStore', tableStore)
-
-onMounted(async () => {
-    tableStore.index()
-    // await queryByCode('Direct_Connected_Device').then((res) => {
-    //     queryByid(res.data.id).then((res) => {
-    //         DevTypeOptions.value = res.data
-    //     })
-    // })
-    // tableStore.table.params.devType = ''
-})
-const submit = () => {
-    addVersion(form.value).then(res => {
-        ElMessage.success('新增成功')
-        tableStore.index()
-        dialogVisible.value = false
-        router.go(0)
-    })
-}
-const addMenu = () => {
-    dialogVisible.value = true
-    form.value.appVersion = tableStore.table.data[0].versionName || ''
-    form.value.content = ''
-    form.value.sev = tableStore.table.data[0].sev || 0
-    form.value.versionType = tableStore.table.data[0].versionType || 'WEB'
-}
-</script>
+<template>
+    <div class="default-main">
+        <TableHeader :showReset="false">
+            <template #select>
+                <!-- <el-radio-group v-model.trim="tableStore.table.params.versionType" @change="tableStore.index()">
+                    <el-radio-button label="web" value="WEB" />
+                    <el-radio-button label="app" value="APP" />
+
+                </el-radio-group> -->
+            </template>
+            <template #operation>
+                <el-button type="primary" icon="el-icon-Plus" @click="addMenu">新增版本</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+        <el-dialog width="600px" v-model.trim="dialogVisible" title="新增版本">
+            <el-form :inline="false" :model="form" label-width="auto" class="form-one">
+                <el-form-item label="版本号">
+                    <el-input
+                        maxlength="32"
+                        show-word-limit
+                        v-model.trim="form.appVersion"
+                        placeholder="请输入版本号"
+                    />
+                </el-form-item>
+                <el-form-item label="整改内容">
+                    <el-input
+                        maxlength="300"
+                        type="textarea"
+                        show-word-limit
+                        v-model.trim="form.content"
+                        placeholder="请输入整改内容"
+                    />
+                </el-form-item>
+                <el-form-item label="发布类型">
+                    <el-select v-model.trim="form.sev" placeholder="请选择发布类型" filterable>
+                        <el-option label="优化" :value="0" />
+                        <el-option label="bug调整" :value="1" />
+                    </el-select>
+                </el-form-item>
+            </el-form>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="dialogVisible = false">取消</el-button>
+                    <el-button type="primary" @click="submit">确认</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+import { ElMessage } from 'element-plus'
+import { addVersion } from '@/api/systerm'
+import router from '@/router/index'
+const dialogVisible = ref(false)
+const form = ref({
+    appVersion: '',
+    content: '',
+    versionType: 'WEB',
+    sev: ''
+})
+const tableStore = new TableStore({
+    url: '/system-boot/appVersion/getAllData',
+    method: 'POST',
+    showPage: false,
+    paramsPOST: true,
+    column: [
+        {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '版本号', field: 'versionName', width: '150' },
+
+        { title: '创建时间', field: 'createTime', width: '220' },
+        {
+            title: '发布类型',
+            field: 'sev',
+            formatter: row => {
+                return row.cellValue == 0 ? '优化' : 'bug调整'
+            },
+            width: '150'
+        },
+        { title: '整改内容', field: 'content' }
+    ]
+})
+tableStore.table.params.versionType = 'WEB'
+provide('tableStore', tableStore)
+
+onMounted(async () => {
+    tableStore.index()
+    // await queryByCode('Direct_Connected_Device').then((res) => {
+    //     queryByid(res.data.id).then((res) => {
+    //         DevTypeOptions.value = res.data
+    //     })
+    // })
+    // tableStore.table.params.devType = ''
+})
+const submit = () => {
+    addVersion(form.value).then(res => {
+        ElMessage.success('新增成功')
+        tableStore.index()
+        dialogVisible.value = false
+        router.go(0)
+    })
+}
+const addMenu = () => {
+    dialogVisible.value = true
+    form.value.appVersion = tableStore.table.data[0].versionName || ''
+    form.value.content = ''
+    form.value.sev = tableStore.table.data[0].sev || 0
+    form.value.versionType = tableStore.table.data[0].versionType || 'WEB'
+}
+</script>