diff --git a/src/views/analysisrule/AnalysisRule.api.ts b/src/views/analysisrule/AnalysisRule.api.ts
new file mode 100644
index 0000000..dbf1a50
--- /dev/null
+++ b/src/views/analysisrule/AnalysisRule.api.ts
@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/analysisrule/analysisRule/list',
+  save='/analysisrule/analysisRule/add',
+  edit='/analysisrule/analysisRule/edit',
+  deleteOne = '/analysisrule/analysisRule/delete',
+  deleteBatch = '/analysisrule/analysisRule/deleteBatch',
+  importExcel = '/analysisrule/analysisRule/importExcel',
+  exportXls = '/analysisrule/analysisRule/exportXls',
+}
+
+/**
+ * 导出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 });
+}
diff --git a/src/views/analysisrule/AnalysisRule.data.ts b/src/views/analysisrule/AnalysisRule.data.ts
new file mode 100644
index 0000000..f3092d0
--- /dev/null
+++ b/src/views/analysisrule/AnalysisRule.data.ts
@@ -0,0 +1,64 @@
+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: '电话号',
+    align: "center",
+    dataIndex: 'sim'
+  },
+  {
+    title: '规则代码',
+    align: "center",
+    dataIndex: 'code'
+  },
+  {
+    title: '规则描述',
+    align: "center",
+    dataIndex: 'remarks'
+  },
+  {
+    title: '热力公司',
+    align: "center",
+    dataIndex: 'companyId_dictText'
+  },
+  {
+    title: '锅炉房',
+    align: "center",
+    dataIndex: 'sourceId_dictText'
+  },
+  {
+    title: '换热站',
+    align: "center",
+    dataIndex: 'stationId_dictText'
+  },
+  // {
+  //   title: '创建时间',
+  //   align: "center",
+  //   dataIndex: 'createDate',
+  //   customRender:({text}) =>{
+  //     text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+  //     return text;
+  //   },
+  // },
+  {
+    title: '地区类型',
+    align: "center",
+    dataIndex: 'regionType'
+  },
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+  sim: {title: '卡号',order: 0,view: 'text', type: 'string',},
+  code: {title: '规则代码 1 2 3 4 5 ',order: 1,view: 'text', type: 'string',},
+  remarks: {title: '规则描述 1:0141规则码 2:31字节长度 3:73字节长度 4:26字节长度 5:不解析',order: 2,view: 'text', type: 'string',},
+  companyId: {title: '热力公司ID',order: 3,view: 'number', type: 'number',dictTable: "bl_thermalcompany", dictCode: 'id', dictText: 'company_name',},
+  sourceId: {title: '锅炉房ID',order: 4,view: 'number', type: 'number',dictTable: "bl_heatsource", dictCode: 'id', dictText: 'source_name',},
+  stationId: {title: '换热站ID',order: 5,view: 'number', type: 'number',dictTable: "bl_heatsourcestation", dictCode: 'id', dictText: 'station_name',},
+  createDate: {title: '创建时间',order: 6,view: 'date', type: 'string',},
+  regionType: {title: '地区类型',order: 7,view: 'text', type: 'string',},
+};
diff --git a/src/views/analysisrule/AnalysisRuleList.vue b/src/views/analysisrule/AnalysisRuleList.vue
new file mode 100644
index 0000000..d8a2588
--- /dev/null
+++ b/src/views/analysisrule/AnalysisRuleList.vue
@@ -0,0 +1,295 @@
+<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="6">
+            <a-form-item name="sim">
+              <template #label><span title="电话号">电话号</span></template>
+              <JInput v-model:value="queryParam.sim" placeholder="请输入电话号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="companyId">
+              <template #label><span title="热力公司">热力公司</span></template>
+              <j-dict-select-tag placeholder="请选择热力公司" v-model:value="queryParam.companyId"
+                dictCode="bl_thermalcompany,company_name,id" allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="sourceId">
+              <template #label><span title="锅炉房">锅炉房</span></template>
+              <j-dict-select-tag placeholder="请选择锅炉房" v-model:value="queryParam.sourceId" :dictCode="`bl_heatsource,source_name,id ,company_id = '${queryParam.companyId || -1}' `"
+                allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="stationId">
+              <template #label><span title="换热站">换热站</span></template>
+              <j-dict-select-tag placeholder="请选择换热站" v-model:value="queryParam.stationId" :dictCode="`bl_heatsourcestation,station_name,id,source_id = '${queryParam.sourceId || -1}' `"
+                allow-clear />
+            </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-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" v-auth="'analysisrule:bl_analysis_rule:add'" @click="handleAdd"
+          preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <!-- <a-button type="primary" v-auth="'analysisrule:bl_analysis_rule:exportXls'" preIcon="ant-design:export-outlined"
+          @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" v-auth="'analysisrule:bl_analysis_rule:importExcel'"
+          preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
+        <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button v-auth="'analysisrule:bl_analysis_rule:deleteBatch'">批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown> -->
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <AnalysisRuleModal ref="registerModal" @success="handleSuccess"></AnalysisRuleModal>
+  </div>
+</template>
+
+<script lang="ts" name="analysisrule-analysisRule" setup>
+import { ref, reactive, watch } from 'vue';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { useListPage } from '/@/hooks/system/useListPage';
+import { columns, superQuerySchema } from './AnalysisRule.data';
+import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './AnalysisRule.api';
+import { downloadFile } from '/@/utils/common/renderUtils';
+import AnalysisRuleModal from './components/AnalysisRuleModal.vue'
+import { useUserStore } from '/@/store/modules/user';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
+import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
+
+const formRef = ref();
+const queryParam = reactive<any>({});
+const toggleSearchStatus = ref<boolean>(false);
+const registerModal = ref();
+const userStore = useUserStore();
+const glfDictCode = ref(`bl_heatsource,source_name,id ,1=2`)
+const hrzDictCode = ref(`bl_heatsourcestation,station_name,id,1=2`)
+watch(
+  () => queryParam.companyId,
+  (newCompanyId) => {
+    queryParam.sourceId = ''
+    queryParam.stationId = ''
+    if (!newCompanyId) {
+      glfDictCode.value = 'nu_config_service_category,category_name,id,1=2';
+    } else {
+      glfDictCode.value = `bl_heatsource,source_name,id ,company_id = ${queryParam.companyId} `;
+    }
+  }
+);
+watch(
+  () => queryParam.sourceId,
+  (newSourceId) => {
+    queryParam.stationId = ''
+    if (!newSourceId) {
+      hrzDictCode.value = `bl_heatsourcestation,station_name,id,1=2`;
+    } else {
+      hrzDictCode.value = `bl_heatsourcestation,station_name,id,company_id = ${queryParam.companyId} and source_id = ${queryParam.sourceId} `;
+    }
+  }
+);
+//注册table数据
+const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+  tableProps: {
+    title: 'bl_analysis_rule',
+    api: list,
+    columns,
+    canResize: false,
+    useSearchForm: false,
+    actionColumn: {
+      width: 120,
+      fixed: 'right',
+    },
+    beforeFetch: async (params) => {
+      queryParam.regionType = '城区'
+      return Object.assign(params, queryParam);
+    },
+  },
+  exportConfig: {
+    name: "bl_analysis_rule",
+    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,
+});
+
+// 高级查询配置
+const superQueryConfig = reactive(superQuerySchema);
+
+/**
+ * 高级查询事件
+ */
+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 getTableAction(record) {
+  return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }
+  ];
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+  ]
+}
+
+/**
+ * 查询
+ */
+function searchQuery() {
+  reload();
+}
+
+/**
+ * 重置
+ */
+function searchReset() {
+  formRef.value.resetFields();
+  selectedRowKeys.value = [];
+  //刷新数据
+  reload();
+}
+
+
+
+
+</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/analysisrule/AnalysisRuleListJx.vue b/src/views/analysisrule/AnalysisRuleListJx.vue
new file mode 100644
index 0000000..80d86ff
--- /dev/null
+++ b/src/views/analysisrule/AnalysisRuleListJx.vue
@@ -0,0 +1,295 @@
+<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="6">
+            <a-form-item name="sim">
+              <template #label><span title="电话号">电话号</span></template>
+              <JInput v-model:value="queryParam.sim" placeholder="请输入电话号"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="companyId">
+              <template #label><span title="热力公司">热力公司</span></template>
+              <j-dict-select-tag placeholder="请选择热力公司" v-model:value="queryParam.companyId"
+                dictCode="bl_thermalcompany,company_name,id" allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="sourceId">
+              <template #label><span title="锅炉房">锅炉房</span></template>
+              <j-dict-select-tag placeholder="请选择锅炉房" v-model:value="queryParam.sourceId" :dictCode="glfDictCode"
+                allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="stationId">
+              <template #label><span title="换热站">换热站</span></template>
+              <j-dict-select-tag placeholder="请选择换热站" v-model:value="queryParam.stationId" :dictCode="hrzDictCode"
+                allow-clear />
+            </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-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" v-auth="'analysisrule:bl_analysis_rule:add'" @click="handleAdd"
+          preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <!-- <a-button type="primary" v-auth="'analysisrule:bl_analysis_rule:exportXls'" preIcon="ant-design:export-outlined"
+          @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" v-auth="'analysisrule:bl_analysis_rule:importExcel'"
+          preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
+        <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button v-auth="'analysisrule:bl_analysis_rule:deleteBatch'">批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown> -->
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <AnalysisRuleModal ref="registerModal" @success="handleSuccess"></AnalysisRuleModal>
+  </div>
+</template>
+
+<script lang="ts" name="analysisrule-analysisRule" setup>
+import { ref, reactive, watch } from 'vue';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { useListPage } from '/@/hooks/system/useListPage';
+import { columns, superQuerySchema } from './AnalysisRule.data';
+import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './AnalysisRule.api';
+import { downloadFile } from '/@/utils/common/renderUtils';
+import AnalysisRuleModal from './components/AnalysisRuleModal.vue'
+import { useUserStore } from '/@/store/modules/user';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
+import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
+
+const formRef = ref();
+const queryParam = reactive<any>({});
+const toggleSearchStatus = ref<boolean>(false);
+const registerModal = ref();
+const userStore = useUserStore();
+const glfDictCode = ref(`bl_heatsource,source_name,id ,1=2`)
+const hrzDictCode = ref(`bl_heatsourcestation,station_name,id,1=2`)
+watch(
+  () => queryParam.companyId,
+  (newCompanyId) => {
+    queryParam.sourceId = ''
+    queryParam.stationId = ''
+    if (!newCompanyId) {
+      glfDictCode.value = 'nu_config_service_category,category_name,id,1=2';
+    } else {
+      glfDictCode.value = `bl_heatsource,source_name,id ,company_id = ${queryParam.companyId} `;
+    }
+  }
+);
+watch(
+  () => queryParam.sourceId,
+  (newSourceId) => {
+    queryParam.stationId = ''
+    if (!newSourceId) {
+      hrzDictCode.value = `bl_heatsourcestation,station_name,id,1=2`;
+    } else {
+      hrzDictCode.value = `bl_heatsourcestation,station_name,id,company_id = ${queryParam.companyId} and source_id = ${queryParam.sourceId} `;
+    }
+  }
+);
+//注册table数据
+const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+  tableProps: {
+    title: 'bl_analysis_rule',
+    api: list,
+    columns,
+    canResize: false,
+    useSearchForm: false,
+    actionColumn: {
+      width: 120,
+      fixed: 'right',
+    },
+    beforeFetch: async (params) => {
+      queryParam.regionType = '郊县'
+      return Object.assign(params, queryParam);
+    },
+  },
+  exportConfig: {
+    name: "bl_analysis_rule",
+    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,
+});
+
+// 高级查询配置
+const superQueryConfig = reactive(superQuerySchema);
+
+/**
+ * 高级查询事件
+ */
+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 getTableAction(record) {
+  return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }
+  ];
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+  ]
+}
+
+/**
+ * 查询
+ */
+function searchQuery() {
+  reload();
+}
+
+/**
+ * 重置
+ */
+function searchReset() {
+  formRef.value.resetFields();
+  selectedRowKeys.value = [];
+  //刷新数据
+  reload();
+}
+
+
+
+
+</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/analysisrule/components/AnalysisRuleForm.vue b/src/views/analysisrule/components/AnalysisRuleForm.vue
new file mode 100644
index 0000000..a9c7a98
--- /dev/null
+++ b/src/views/analysisrule/components/AnalysisRuleForm.vue
@@ -0,0 +1,198 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+          name="AnalysisRuleForm">
+          <a-row>
+            <a-col :span="24">
+              <a-form-item label="卡号" v-bind="validateInfos.sim" id="AnalysisRuleForm-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="规则代码" v-bind="validateInfos.code" id="AnalysisRuleForm-code" name="code">
+                <a-input v-model:value="formData.code" placeholder="请输入规则代码" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="规则描述" v-bind="validateInfos.remarks" id="AnalysisRuleForm-remarks" name="remarks">
+                <a-input v-model:value="formData.remarks" placeholder="请输入规则描述" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="热力公司" v-bind="validateInfos.companyId" id="AnalysisRuleForm-companyId"
+                name="companyId">
+                <a-input v-model:value="formData.conpanyName" placeholder="请输入热力公司" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="锅炉房" v-bind="validateInfos.sourceId" id="AnalysisRuleForm-sourceId" name="sourceId">
+                <a-input v-model:value="formData.sourceName" placeholder="请输入锅炉房" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="换热站" v-bind="validateInfos.stationId" id="AnalysisRuleForm-stationId"
+                name="stationId">
+                <a-input v-model:value="formData.stationName" placeholder="请输入换热站" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="创建时间" v-bind="validateInfos.createDate" id="AnalysisRuleForm-createDate"
+                name="createDate">
+                <a-date-picker placeholder="请选择创建时间" v-model:value="formData.createDate" value-format="YYYY-MM-DD"
+                  style="width: 100%" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="地区类型" v-bind="validateInfos.regionType" id="AnalysisRuleForm-regionType"
+                name="regionType">
+                <a-input v-model:value="formData.regionType" placeholder="请输入地区类型" 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 JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import { getValueType } from '/@/utils';
+import { saveOrUpdate } from '../AnalysisRule.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: '',
+  code: '',
+  remarks: '',
+  companyId: undefined,
+  sourceId: undefined,
+  stationId: undefined,
+  createDate: '',
+  regionType: '',
+  conpanyName: '',
+  sourceName: '',
+  stationName: '',
+});
+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({
+  regionType: [{ 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/analysisrule/components/AnalysisRuleModal.vue b/src/views/analysisrule/components/AnalysisRuleModal.vue
new file mode 100644
index 0000000..136b127
--- /dev/null
+++ b/src/views/analysisrule/components/AnalysisRuleModal.vue
@@ -0,0 +1,77 @@
+<template>
+  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <AnalysisRuleForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></AnalysisRuleForm>
+  </j-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import AnalysisRuleForm from './AnalysisRuleForm.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>