diff --git a/src/views/heating/extract/DataExtractConfig.api.ts b/src/views/heating/extract/DataExtractConfig.api.ts
new file mode 100644
index 0000000..8bf012c
--- /dev/null
+++ b/src/views/heating/extract/DataExtractConfig.api.ts
@@ -0,0 +1,84 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/heating/dataExtractConfig/list',
+  save='/heating/dataExtractConfig/add',
+  edit='/heating/dataExtractConfig/edit',
+  deleteOne = '/heating/dataExtractConfig/delete',
+  deleteBatch = '/heating/dataExtractConfig/deleteBatch',
+  importExcel = '/heating/dataExtractConfig/importExcel',
+  exportXls = '/heating/dataExtractConfig/exportXls',
+  companylist = '/heating/thermalcompany/list',
+  heatsourcelist = '/heating/heatsource/list',
+  heatsourcestationlist = '/heating/heatsourcestation/list',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
+
+export const companylist = (params) =>
+  defHttp.get({url: Api.companylist, params});
+
+export const heatsourcelist = (params) =>
+  defHttp.get({url: Api.heatsourcelist, params});
+
+export const heatsourcestationlist = (params) =>
+  defHttp.get({url: Api.heatsourcestationlist, params});
diff --git a/src/views/heating/extract/DataExtractConfig.data.ts b/src/views/heating/extract/DataExtractConfig.data.ts
new file mode 100644
index 0000000..84e0140
--- /dev/null
+++ b/src/views/heating/extract/DataExtractConfig.data.ts
@@ -0,0 +1,126 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+
+  {
+    title: 'SIM',
+    width: 100,
+    align: "center",
+    dataIndex: 'sim'
+  },
+  {
+    title: '供热公司',
+    width: 120,
+    align: "center",
+    dataIndex: 'company'
+  },
+  {
+    title: '热源站',
+    width: 120,
+    align: "center",
+    dataIndex: 'source'
+  },
+  {
+    title: '换热站',
+    align: "center",
+    dataIndex: 'station'
+  },
+  {
+    title: '一次网抽取',
+    width: 100,
+    children: [
+      {
+        title: 'SIM',
+        width: 100,
+        align: "center",
+        dataIndex: 'onePipeSim'
+      },
+      // {
+      //   title: '供热公司',
+      //   align: "center",
+      //   dataIndex: 'oneCompany'
+      // },
+      // {
+      //   title: '热源站',
+      //   align: "center",
+      //   dataIndex: 'oneSource'
+      // },
+      {
+        title: '站点',
+        align: "center",
+        dataIndex: 'oneStation'
+      },
+      {
+        title: '类型',
+        width: 100,
+        align: "center",
+        dataIndex: 'onePipeType',
+        customRender: ({ record }) =>{
+          if(record.onePipeType == '1'){
+            return '一次网'
+          }else if(record.onePipeType == '2'){
+            return '二次网'
+          }else{
+            return '无'
+          }
+        }
+      },
+    ]
+  },
+  {
+    title: '二次网抽取',
+    width: 100,
+    children: [
+      {
+        title: 'SIM',
+        width: 100,
+        align: "center",
+        dataIndex: 'twoPipeSim'
+      },
+      // {
+      //   title: '供热公司',
+      //   align: "center",
+      //   dataIndex: 'twoCompany'
+      // },
+      // {
+      //   title: '热源站',
+      //   align: "center",
+      //   dataIndex: 'twoSource'
+      // },
+      {
+        title: '站点',
+        align: "center",
+        dataIndex: 'twoStation'
+      },
+      {
+        title: '类型',
+        width: 100,
+        align: "center",
+        dataIndex: 'twoPipeType',
+        customRender: ({ record }) =>{
+          if(record.twoPipeType == '1'){
+            return '一次网'
+          }else if(record.twoPipeType == '2'){
+            return '二次网'
+          }else{
+            return '无'
+          }
+        }
+      },
+    ]
+  },
+  {
+    title: '是否生效',
+    width: 100,
+    align: "center",
+    dataIndex: 'flag',
+    customRender: ({ record }) =>{
+      return record.flag ? (record.flag == 1 ? '是' : '否') : '';
+    }
+  },
+];
+
diff --git a/src/views/heating/extract/DataExtractConfigList.vue b/src/views/heating/extract/DataExtractConfigList.vue
new file mode 100644
index 0000000..6fae6b9
--- /dev/null
+++ b/src/views/heating/extract/DataExtractConfigList.vue
@@ -0,0 +1,366 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="4">
+            <a-form-item>
+              <span title="热力公司">热力公司 </span>
+              <a-select ref="select"
+                        placeholder="请选择热力公司"
+                        v-model:value="queryParam.companyId"
+                        style="width: 150px"
+                        @focus="focus"
+                        @change="handleChange1">
+                <a-select-option :value="item.id" v-for="item in thermalcompany" :key="item.id">{{item.companyName}}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="4">
+            <a-form-item>
+              <span title="热源站">热源站 </span>
+              <a-select ref="select"
+                        placeholder="请选择热源站"
+                        v-model:value="queryParam.sourceId"
+                        style="width: 150px"
+                        @focus="focus"
+                        @change="handleChange2">
+                <a-select-option :value="item.id" v-for="item in heatsource" :key="item.id">{{item.sourceName}}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item>
+              <span title="换热站">换热站 </span>
+              <a-select ref="select"
+                        placeholder="请选择换热站"
+                        v-model:value="queryParam.stationId"
+                        style="width: 250px"
+                        @focus="focus"
+                        @change="handleChange3">
+                <a-select-option :value="item.id" v-for="item in heatsourcestation" :key="item.id">{{item.stationName}}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="4">
+            <a-form-item name="sim">
+              <span title="手机号">SIM </span>
+              <a-input style="width: 150px" placeholder="请输入手机号" v-model:value="queryParam.sim" allow-clear ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+              </a-col>
+            </span>
+          </a-col>
+          <a-col :lg="4">
+            <a-form-item name="onePipeSim">
+              <span title="一次SIM">一次SIM </span>
+              <a-input style="width: 150px" placeholder="一次网抽取SIM" v-model:value="queryParam.onePipeSim" allow-clear ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="4">
+            <a-form-item name="onePipeType">
+              <span title="一次类型">一次类型 </span>
+              <a-select ref="select"
+                        placeholder="请选择类型"
+                        v-model:value="queryParam.onePipeType"
+                        style="width: 150px">
+                <a-select-option value="">全部</a-select-option>
+                <a-select-option value="0">无</a-select-option>
+                <a-select-option value="1">一次网</a-select-option>
+                <a-select-option value="2">二次网</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="4">
+            <a-form-item name="twoPipeSim">
+              <span title="二次SIM">二次SIM </span>
+              <a-input style="width: 150px" placeholder="二次网抽取SIM" v-model:value="queryParam.twoPipeSim" allow-clear ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="4">
+            <a-form-item name="twoPipeType">
+              <span title="一次类型">二次类型 </span>
+              <a-select ref="select"
+                        placeholder="请选择类型"
+                        v-model:value="queryParam.twoPipeType"
+                        style="width: 150px">
+                <a-select-option value="">全部</a-select-option>
+                <a-select-option value="0">无</a-select-option>
+                <a-select-option value="1">一次网</a-select-option>
+                <a-select-option value="2">二次网</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="4">
+            <a-form-item name="flag">
+              <span title="生效">生效 </span>
+              <a-select ref="select"
+                        placeholder="请选择是否生效"
+                        v-model:value="queryParam.flag"
+                        style="width: 150px">
+                <a-select-option value="">全部</a-select-option>
+                <a-select-option value="1">是</a-select-option>
+                <a-select-option value="0">否</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button v-if="selectedRowKeys.length > 0" @click="batchHandleDelete" preIcon="ant-design:delete-outlined"> 删除</a-button>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <DataExtractConfigModal ref="registerModal" @success="handleSuccess"></DataExtractConfigModal>
+  </div>
+</template>
+
+<script lang="ts" name="heating-dataExtractConfig" setup>
+import {ref, reactive, onMounted} from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './DataExtractConfig.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './DataExtractConfig.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import DataExtractConfigModal from './components/DataExtractConfigModal.vue'
+  import { useUserStore } from '/@/store/modules/user';
+import {
+  companylist,
+  heatsourcelist,
+  heatsourcestationlist
+} from "@/views/heating1/Heatanalysis.api";
+
+  const formRef = ref();
+  const queryParam = reactive<any>({
+    companyId : '',
+    sourceId : '',
+    stationId : '',
+    sim : '',
+    flag: '',
+    onePipeSim : '',
+    onePipeType : '',
+    twoPipeSim : '',
+    twoPipeType : '',
+  });
+  const registerModal = ref();
+  const userStore = useUserStore();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '',
+      api: list,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      clickToRowSelect:false,
+      showIndexColumn:false,
+      tableSetting:{
+        // 是否显示刷新按钮
+        redo: false,
+        // 是否显示尺寸调整按钮
+        size: false,
+        // 是否显示字段调整按钮
+        setting: false,
+        // 是否显示全屏按钮
+        fullScreen: false,
+      },
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: async (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: "数据抽取配置",
+      url: getExportUrl,
+      params: queryParam,
+    },
+	  importConfig: {
+	    url: getImportUrl,
+	    success: handleSuccess
+	  },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs:24,
+    sm:4,
+    xl:6,
+    xxl:4
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    searchQuery();
+  }
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        },
+      }
+    ]
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+
+const thermalcompany = ref();
+async function getThermalcompany(){
+  thermalcompany.value = await companylist();
+}
+
+const heatsource = ref();
+async function getHeatsource(){
+  heatsource.value = await heatsourcelist();
+}
+
+const heatsourcestation = ref();
+async function getHeatsourcestation(){
+  heatsourcestation.value = await heatsourcestationlist();
+}
+
+async function handleChange1(record){
+  var params = {companyId:record};
+  heatsource.value = await heatsourcelist(params);
+  heatsourcestation.value = [];
+}
+async function handleChange2(record){
+  var params = {sourceId:record};
+  heatsourcestation.value = await heatsourcestationlist(params);
+}
+function handleChange3(record){
+}
+
+onMounted(() => {
+  getThermalcompany();
+  getHeatsource();
+  getHeatsourcestation();
+});
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 16px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>
diff --git a/src/views/heating/extract/components/DataExtractConfigForm.vue b/src/views/heating/extract/components/DataExtractConfigForm.vue
new file mode 100644
index 0000000..e174b2e
--- /dev/null
+++ b/src/views/heating/extract/components/DataExtractConfigForm.vue
@@ -0,0 +1,176 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="DataExtractConfigForm">
+          <a-row>
+						<a-col :span="24">
+							<a-form-item label="手机号" v-bind="validateInfos.sim" id="DataExtractConfigForm-sim" name="sim">
+								<a-input v-model:value="formData.sim" placeholder="请输入手机号"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="一次网抽取sim卡号" v-bind="validateInfos.onePipeSim" id="DataExtractConfigForm-onePipeSim" name="onePipeSim">
+								<a-input v-model:value="formData.onePipeSim" placeholder="请输入一次网抽取sim卡号"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="一次网抽取类型 0无 1一次网 2二次网" v-bind="validateInfos.onePipeType" id="DataExtractConfigForm-onePipeType" name="onePipeType">
+								<a-input v-model:value="formData.onePipeType" placeholder="请输入一次网抽取类型 0无 1一次网 2二次网"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="二次网抽取sim卡号" v-bind="validateInfos.twoPipeSim" id="DataExtractConfigForm-twoPipeSim" name="twoPipeSim">
+								<a-input v-model:value="formData.twoPipeSim" placeholder="请输入二次网抽取sim卡号"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="二次网抽取类型 0无 1一次网 2二次网" v-bind="validateInfos.twoPipeType" id="DataExtractConfigForm-twoPipeType" name="twoPipeType">
+								<a-input v-model:value="formData.twoPipeType" placeholder="请输入二次网抽取类型 0无 1一次网 2二次网"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="是否生效 0失效 1生效" v-bind="validateInfos.flag" id="DataExtractConfigForm-flag" name="flag">
+								<a-input v-model:value="formData.flag" placeholder="请输入是否生效 0失效 1生效"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../DataExtractConfig.api';
+  import { Form } from 'ant-design-vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: () => ({})},
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    sim: '',   
+    onePipeSim: '',   
+    onePipeType: '',   
+    twoPipeSim: '',   
+    twoPipeType: '',   
+    flag: '',   
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = reactive({
+    sim: [{ required: true, message: '请输入手机号!'},],
+  });
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      const tmpData = {};
+      Object.keys(formData).forEach((key) => {
+        if(record.hasOwnProperty(key)){
+          tmpData[key] = record[key]
+        }
+      })
+      //赋值
+      Object.assign(formData, tmpData);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    try {
+      // 触发表单验证
+      await validate();
+    } catch ({ errorFields }) {
+      if (errorFields) {
+        const firstField = errorFields[0];
+        if (firstField) {
+          formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+        }
+      }
+      return Promise.reject(errorFields);
+    }
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    padding: 14px;
+  }
+</style>
diff --git a/src/views/heating/extract/components/DataExtractConfigModal.vue b/src/views/heating/extract/components/DataExtractConfigModal.vue
new file mode 100644
index 0000000..e1129f6
--- /dev/null
+++ b/src/views/heating/extract/components/DataExtractConfigModal.vue
@@ -0,0 +1,77 @@
+<template>
+  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <DataExtractConfigForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></DataExtractConfigForm>
+  </j-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import DataExtractConfigForm from './DataExtractConfigForm.vue'
+  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style lang="less">
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
+<style lang="less" scoped></style>
diff --git a/src/views/heating/Heatanalysis.api.ts b/src/views/heating/heatanalysis/Heatanalysis.api.ts
similarity index 100%
rename from src/views/heating/Heatanalysis.api.ts
rename to src/views/heating/heatanalysis/Heatanalysis.api.ts
diff --git a/src/views/heating/Heatanalysis.data.ts b/src/views/heating/heatanalysis/Heatanalysis.data.ts
similarity index 100%
rename from src/views/heating/Heatanalysis.data.ts
rename to src/views/heating/heatanalysis/Heatanalysis.data.ts
diff --git a/src/views/heating/HeatanalysisList.vue b/src/views/heating/heatanalysis/HeatanalysisList.vue
similarity index 99%
rename from src/views/heating/HeatanalysisList.vue
rename to src/views/heating/heatanalysis/HeatanalysisList.vue
index 159083e..c8c9abb 100644
--- a/src/views/heating/HeatanalysisList.vue
+++ b/src/views/heating/heatanalysis/HeatanalysisList.vue
@@ -33,7 +33,7 @@
               <a-select ref="select"
                         placeholder="请选择换热站"
                         v-model:value="queryParam.view004"
-                        style="width: 150px"
+                        style="width: 250px"
                         @focus="focus"
                         @change="handleChange3">
                 <a-select-option :value="item.id" v-for="item in heatsourcestation" :key="item.id">{{item.stationName}}</a-select-option>
diff --git a/src/views/heating/HeatanalysisListModal.vue b/src/views/heating/heatanalysis/HeatanalysisListModal.vue
similarity index 100%
rename from src/views/heating/HeatanalysisListModal.vue
rename to src/views/heating/heatanalysis/HeatanalysisListModal.vue
diff --git a/src/views/heating/components/HeatanalysisForm.vue b/src/views/heating/heatanalysis/components/HeatanalysisForm.vue
similarity index 100%
rename from src/views/heating/components/HeatanalysisForm.vue
rename to src/views/heating/heatanalysis/components/HeatanalysisForm.vue
diff --git a/src/views/heating/components/HeatanalysisModal.vue b/src/views/heating/heatanalysis/components/HeatanalysisModal.vue
similarity index 100%
rename from src/views/heating/components/HeatanalysisModal.vue
rename to src/views/heating/heatanalysis/components/HeatanalysisModal.vue