From b2a9d385a8490f8e137eb6c5bf86b2616f05ed67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Wed, 27 Aug 2025 17:58:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/base/company/Thermalcompany.data.ts | 25 +- src/views/base/company/ThermalcompanyList.vue | 4 + .../base/company/ThermalcompanyListJx.vue | 4 + src/views/base/heatsource/Heatsource.data.ts | 48 +++- src/views/base/heatsource/HeatsourceList.vue | 6 +- .../base/heatsource/HeatsourceListJx.vue | 10 +- src/views/base/simconfig/Simconfig.data.ts | 53 +++- src/views/base/simconfig/SimconfigList.vue | 19 +- src/views/base/simconfig/SimconfigListJx.vue | 68 ++--- .../simconfig/components/SimconfigForm.vue | 17 +- .../simconfig/components/SimconfigJxForm.vue | 238 ++++++++++++++++++ .../simconfig/components/SimconfigJxModal.vue | 77 ++++++ .../base/station/Heatsourcestation.data.ts | 34 +-- .../base/station/HeatsourcestationList.vue | 8 +- .../waterFlowConfig/BlWaterFlowConfig.data.ts | 6 +- .../waterFlowConfig/BlWaterFlowConfigList.vue | 26 +- ...gList2.vue => BlWaterFlowConfigListJx.vue} | 53 ++-- .../components/BlWaterFlowConfigForm.vue | 24 +- .../heating/heatanalysis/Heatanalysis.data.ts | 104 +++++++- .../heating/heatanalysis/HeatanalysisList.vue | 16 +- .../heatanalysis/HeatanalysisListJx.vue | 56 +++-- 21 files changed, 711 insertions(+), 185 deletions(-) create mode 100644 src/views/base/simconfig/components/SimconfigJxForm.vue create mode 100644 src/views/base/simconfig/components/SimconfigJxModal.vue rename src/views/base/waterFlowConfig/{BlWaterFlowConfigList2.vue => BlWaterFlowConfigListJx.vue} (89%) diff --git a/src/views/base/company/Thermalcompany.data.ts b/src/views/base/company/Thermalcompany.data.ts index 91eb99c..cf769a5 100644 --- a/src/views/base/company/Thermalcompany.data.ts +++ b/src/views/base/company/Thermalcompany.data.ts @@ -5,6 +5,11 @@ import { render } from '/@/utils/common/renderUtils'; import { getWeekMonthQuarterYear } from '/@/utils'; //列表数据 export const columns: BasicColumn[] = [ + { + title: '序号', + align:"center", + dataIndex: 'id' + }, { title: '公司名称', align:"center", @@ -14,6 +19,16 @@ export const columns: BasicColumn[] = [ title: '公司类型', align:"center", dataIndex: 'companyType_dictText' + }, + { + title: '锅炉房个数', + align:"center", + dataIndex: 'boilerHouse' + }, + { + title: '换热站个数', + align:"center", + dataIndex: 'barterHeat' }, { title: '电话', @@ -25,16 +40,6 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'companyAddress' }, - { - title: '换热站个数', - align:"center", - dataIndex: 'barterHeat' - }, - { - title: '锅炉房个数', - align:"center", - dataIndex: 'boilerHouse' - }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ diff --git a/src/views/base/company/ThermalcompanyList.vue b/src/views/base/company/ThermalcompanyList.vue index b8e5cf8..33d9802 100644 --- a/src/views/base/company/ThermalcompanyList.vue +++ b/src/views/base/company/ThermalcompanyList.vue @@ -52,6 +52,10 @@ tableProps:{ title: '热力公司', api: list, + defSort: { + column: 'id', + order: 'asc', + }, columns, canResize:false, formConfig: { diff --git a/src/views/base/company/ThermalcompanyListJx.vue b/src/views/base/company/ThermalcompanyListJx.vue index 6e83c90..93a7cf5 100644 --- a/src/views/base/company/ThermalcompanyListJx.vue +++ b/src/views/base/company/ThermalcompanyListJx.vue @@ -52,6 +52,10 @@ tableProps:{ title: '热力公司', api: list, + defSort: { + column: 'id', + order: 'asc', + }, columns, canResize:false, formConfig: { diff --git a/src/views/base/heatsource/Heatsource.data.ts b/src/views/base/heatsource/Heatsource.data.ts index ea9f37d..427ca3a 100644 --- a/src/views/base/heatsource/Heatsource.data.ts +++ b/src/views/base/heatsource/Heatsource.data.ts @@ -5,6 +5,11 @@ import { render } from '/@/utils/common/renderUtils'; import { getWeekMonthQuarterYear } from '/@/utils'; //列表数据 export const columns: BasicColumn[] = [ + { + title: '序号', + align:"center", + dataIndex: 'id' + }, { title: '热源名称', align:"center", @@ -35,31 +40,50 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'boilerType_dictText' }, - { - title: '建设时间', - align:"center", - dataIndex: 'setupTime', - customRender:({text}) =>{ - text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text); - return text; - }, - }, + // { + // title: '建设时间', + // align:"center", + // dataIndex: 'setupTime', + // customRender:({text}) =>{ + // text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text); + // return text; + // }, + // }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ { - label: "热源名称", + label: "锅炉房", field: 'sourceName', component: 'Input', //colProps: {span: 6}, }, { - label: "所属公司", + label: "热力公司", field: 'companyId', component: 'JSelectMultiple', componentProps:{ - dictCode:"bl_thermalcompany,company_name,id" + dictCode:"bl_thermalcompany,company_name,id,del_flag = '0' and region_type = '城区'" }, //colProps: {span: 6}, }, ]; + +//查询数据 +export const searchFormSchemaJx: FormSchema[] = [ + { + label: "锅炉房", + field: 'sourceName', + component: 'Input', + //colProps: {span: 6}, + }, + { + label: "热力公司", + field: 'companyId', + component: 'JSelectMultiple', + componentProps:{ + dictCode:"bl_thermalcompany,company_name,id,del_flag = '0' and region_type = '郊县'" + }, + //colProps: {span: 6}, + }, +]; diff --git a/src/views/base/heatsource/HeatsourceList.vue b/src/views/base/heatsource/HeatsourceList.vue index 3be7855..108de63 100644 --- a/src/views/base/heatsource/HeatsourceList.vue +++ b/src/views/base/heatsource/HeatsourceList.vue @@ -51,8 +51,12 @@ const registerModal = ref(); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { - title: '热力源', + title: '锅炉房', api: list, + defSort: { + column: 'id', + order: 'asc', + }, columns, canResize: false, formConfig: { diff --git a/src/views/base/heatsource/HeatsourceListJx.vue b/src/views/base/heatsource/HeatsourceListJx.vue index de02f0d..60ff644 100644 --- a/src/views/base/heatsource/HeatsourceListJx.vue +++ b/src/views/base/heatsource/HeatsourceListJx.vue @@ -40,7 +40,7 @@ import { ref, reactive, computed, unref } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { useListPage } from '/@/hooks/system/useListPage' import HeatsourceModal from './components/HeatsourceModal.vue' -import { columns, searchFormSchema } from './Heatsource.data'; +import { columns, searchFormSchemaJx } from './Heatsource.data'; import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './Heatsource.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import { useUserStore } from '/@/store/modules/user'; @@ -51,13 +51,17 @@ const registerModal = ref(); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { - title: '热力源', + title: '锅炉房', api: list, + defSort: { + column: 'id', + order: 'asc', + }, columns, canResize: false, formConfig: { //labelWidth: 120, - schemas: searchFormSchema, + schemas: searchFormSchemaJx, autoSubmitOnEnter: true, showAdvancedButton: true, fieldMapToNumber: [ diff --git a/src/views/base/simconfig/Simconfig.data.ts b/src/views/base/simconfig/Simconfig.data.ts index ac3d98d..166a15c 100644 --- a/src/views/base/simconfig/Simconfig.data.ts +++ b/src/views/base/simconfig/Simconfig.data.ts @@ -18,17 +18,17 @@ export const columns: BasicColumn[] = [ width: 120 }, { - title: '公司名称', + title: '热力公司', align:"center", dataIndex: 'companyCompanyId_dictText' }, { - title: '热源名称', + title: '锅炉房', align:"center", dataIndex: 'sourceSourceId_dictText' }, { - title: '换热站名称', + title: '换热站', align:"center", dataIndex: 'stationStationId_dictText' }, @@ -42,7 +42,7 @@ export const columns: BasicColumn[] = [ }, }, { - title: '更改时间', + title: '更新时间', align:"center", dataIndex: 'updateDate', customRender:({text}) =>{ @@ -50,8 +50,51 @@ export const columns: BasicColumn[] = [ return text; }, }, - ]; + +export const columnsJx: BasicColumn[] = [ + { + title: '电话号', + align:"center", + dataIndex: 'sim', + width: 120 + }, + { + title: '设备号', + align:"center", + dataIndex: 'code', + width: 120 + }, + { + title: '热力公司', + align:"center", + dataIndex: 'companyCompanyId_dictText' + }, + { + title: '锅炉房', + align:"center", + dataIndex: 'sourceSourceId_dictText' + }, + { + title: '注册设备时间', + align:"center", + dataIndex: 'occurtime', + customRender:({text}) =>{ + text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text); + return text; + }, + }, + { + title: '更新时间', + align:"center", + dataIndex: 'updateDate', + customRender:({text}) =>{ + text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text); + return text; + }, + }, +]; + //查询数据 export const searchFormSchema: FormSchema[] = [ ]; diff --git a/src/views/base/simconfig/SimconfigList.vue b/src/views/base/simconfig/SimconfigList.vue index 6670d46..f5c2a75 100644 --- a/src/views/base/simconfig/SimconfigList.vue +++ b/src/views/base/simconfig/SimconfigList.vue @@ -24,8 +24,8 @@ - - + {{ item.sourceName }} @@ -105,6 +105,10 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { title: '设备信息管理', api: list, + defSort: { + column: '', + order: '', + }, columns, canResize: false, formConfig: { @@ -228,29 +232,30 @@ function searchReset() { const thermalcompany = ref(); async function getThermalcompany() { - thermalcompany.value = await companylist(); + let params = {regionType:'城区'}; + thermalcompany.value = await companylist(params); } const heatsource = ref(); async function getHeatsource() { - heatsource.value = await heatsourcelist(); + let params = {regionType:'城区'}; + heatsource.value = await heatsourcelist(params); } const heatsourcestation = ref(); async function getHeatsourcestation() { heatsourcestation.value = await heatsourcestationlist(); - heatsource.value = []; } async function handleChange1(record) { - var params = { companyCompanyId: record }; + let params = { companyCompanyId: record,regionType:'城区' }; heatsource.value = await heatsourcelist(params); heatsourcestation.value = []; queryParam.value.sourceSourceId = ''; queryParam.value.stationStationId = ''; } async function handleChange2(record) { - var params = { sourceSourceId: record }; + let params = { sourceSourceId: record }; heatsourcestation.value = await heatsourcestationlist(params); queryParam.value.stationStationId = ''; } diff --git a/src/views/base/simconfig/SimconfigListJx.vue b/src/views/base/simconfig/SimconfigListJx.vue index 0886525..b29a7c0 100644 --- a/src/views/base/simconfig/SimconfigListJx.vue +++ b/src/views/base/simconfig/SimconfigListJx.vue @@ -24,24 +24,23 @@ - - + {{ item.sourceName }} - - - - {{ item.stationName }} - - - - + + + + + + + + + 查询 @@ -82,7 +81,7 @@ - + @@ -91,8 +90,8 @@ import { ref, reactive, computed, unref, onMounted } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { useModal } from '/@/components/Modal'; import { useListPage } from '/@/hooks/system/useListPage' -import SimconfigModal from './components/SimconfigModal.vue' -import { columns, searchFormSchema } from './Simconfig.data'; +import SimconfigJxModal from './components/SimconfigJxModal.vue' +import { columnsJx, searchFormSchema } from './Simconfig.data'; import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, companylist, heatsourcelist, heatsourcestationlist } from './Simconfig.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import { useUserStore } from '/@/store/modules/user'; @@ -105,7 +104,11 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { title: '设备信息管理', api: list, - columns, + defSort: { + column: '', + order: '', + }, + columns: columnsJx, canResize: false, formConfig: { //labelWidth: 120, @@ -221,46 +224,47 @@ function searchReset() { queryParam.value = {}; selectedRowKeys.value = []; getHeatsource(); - getHeatsourcestation(); + // getHeatsourcestation(); //刷新数据 reload(); } const thermalcompany = ref(); async function getThermalcompany() { - thermalcompany.value = await companylist(); + let params = {regionType:'郊县'}; + thermalcompany.value = await companylist(params); } const heatsource = ref(); async function getHeatsource() { - heatsource.value = await heatsourcelist(); + let params = {regionType:'郊县'}; + heatsource.value = await heatsourcelist(params); } -const heatsourcestation = ref(); -async function getHeatsourcestation() { - heatsourcestation.value = await heatsourcestationlist(); - heatsource.value = []; -} +// const heatsourcestation = ref(); +// async function getHeatsourcestation() { +// heatsourcestation.value = await heatsourcestationlist(); +// } async function handleChange1(record) { - var params = { companyCompanyId: record }; + let params = { companyCompanyId: record,regionType:'郊县' }; heatsource.value = await heatsourcelist(params); - heatsourcestation.value = []; + // heatsourcestation.value = []; queryParam.value.sourceSourceId = ''; queryParam.value.stationStationId = ''; } async function handleChange2(record) { - var params = { sourceSourceId: record }; - heatsourcestation.value = await heatsourcestationlist(params); - queryParam.value.stationStationId = ''; -} -function handleChange3(record) { +// let params = { sourceSourceId: record }; +// heatsourcestation.value = await heatsourcestationlist(params); +// queryParam.value.stationStationId = ''; +// } +// function handleChange3(record) { } onMounted(() => { getThermalcompany(); getHeatsource(); - getHeatsourcestation(); + // getHeatsourcestation(); }); diff --git a/src/views/base/simconfig/components/SimconfigForm.vue b/src/views/base/simconfig/components/SimconfigForm.vue index 7abf9cf..f0bdcb3 100644 --- a/src/views/base/simconfig/components/SimconfigForm.vue +++ b/src/views/base/simconfig/components/SimconfigForm.vue @@ -20,7 +20,7 @@ - + - + @@ -95,7 +95,7 @@ sim: [{ required: true, message: '请输入电话号!'},], code: [{ required: true, message: '请输入设备号!'},], companyCompanyId: [{ required: true, message: '请选择热力公司!'},], - sourceSourceId: [{ required: true, message: '请选择热源站!'},], + sourceSourceId: [{ required: true, message: '请选择锅炉房!'},], }); const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false }); @@ -193,22 +193,23 @@ const thermalcompany = ref(); async function getThermalcompany(){ - thermalcompany.value = await companylist(); + let params = {regionType:'城区'}; + thermalcompany.value = await companylist(params); } const heatsource = ref(); async function getHeatsource(){ - heatsource.value = await heatsourcelist(); + let params = {regionType:'城区'}; + heatsource.value = await heatsourcelist(params); } const heatsourcestation = ref(); async function getHeatsourcestation(){ heatsourcestation.value = await heatsourcestationlist(); - heatsource.value = []; } async function handleChange1(record){ - var params = {companyCompanyId:record}; + var params = {companyCompanyId:record,regionType:'城区'}; heatsource.value = await heatsourcelist(params); heatsourcestation.value = []; formData.sourceSourceId = ''; diff --git a/src/views/base/simconfig/components/SimconfigJxForm.vue b/src/views/base/simconfig/components/SimconfigJxForm.vue new file mode 100644 index 0000000..2322707 --- /dev/null +++ b/src/views/base/simconfig/components/SimconfigJxForm.vue @@ -0,0 +1,238 @@ + + + + + diff --git a/src/views/base/simconfig/components/SimconfigJxModal.vue b/src/views/base/simconfig/components/SimconfigJxModal.vue new file mode 100644 index 0000000..0edb51a --- /dev/null +++ b/src/views/base/simconfig/components/SimconfigJxModal.vue @@ -0,0 +1,77 @@ + + + + + + diff --git a/src/views/base/station/Heatsourcestation.data.ts b/src/views/base/station/Heatsourcestation.data.ts index ad25f50..eaca2ba 100644 --- a/src/views/base/station/Heatsourcestation.data.ts +++ b/src/views/base/station/Heatsourcestation.data.ts @@ -5,6 +5,12 @@ import { render } from '/@/utils/common/renderUtils'; import { getWeekMonthQuarterYear } from '/@/utils'; //列表数据 export const columns: BasicColumn[] = [ + { + title: '序号', + align:"center", + dataIndex: 'id', + width: 100 + }, { title: '换热站名称', align:"center", @@ -12,16 +18,16 @@ export const columns: BasicColumn[] = [ width: 250 }, { - title: '公司', + title: '热力公司', align:"center", dataIndex: 'companyId_dictText', - width: 220 + width: 150 }, { - title: '热源', + title: '锅炉房', align:"center", dataIndex: 'sourceId_dictText', - width: 220 + width: 150 }, { title: '联系人', @@ -35,16 +41,16 @@ export const columns: BasicColumn[] = [ dataIndex: 'stationPhone', width: 120 }, - { - title: '建设时间', - align:"center", - dataIndex: 'setupTime', - customRender:({text}) =>{ - text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text); - return text; - }, - width: 120 - }, + // { + // title: '建设时间', + // align:"center", + // dataIndex: 'setupTime', + // customRender:({text}) =>{ + // text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text); + // return text; + // }, + // width: 120 + // }, { title: '换热站地址', align:"center", diff --git a/src/views/base/station/HeatsourcestationList.vue b/src/views/base/station/HeatsourcestationList.vue index 2d43ea9..bf63878 100644 --- a/src/views/base/station/HeatsourcestationList.vue +++ b/src/views/base/station/HeatsourcestationList.vue @@ -217,16 +217,18 @@ const thermalcompany = ref(); async function getThermalcompany(){ - thermalcompany.value = await companylist(); + let params = {regionType:'城区'}; + thermalcompany.value = await companylist(params); } const heatsource = ref(); async function getHeatsource(){ - heatsource.value = await heatsourcelist(); + let params = {regionType:'城区'}; + heatsource.value = await heatsourcelist(params); } async function handleChange1(record){ - var params = {companyId:record}; + let params = {companyId:record, regionType:'城区'}; heatsource.value = await heatsourcelist(params); } diff --git a/src/views/base/waterFlowConfig/BlWaterFlowConfig.data.ts b/src/views/base/waterFlowConfig/BlWaterFlowConfig.data.ts index b6bd165..fba307c 100644 --- a/src/views/base/waterFlowConfig/BlWaterFlowConfig.data.ts +++ b/src/views/base/waterFlowConfig/BlWaterFlowConfig.data.ts @@ -11,12 +11,12 @@ export const columns: BasicColumn[] = [ dataIndex: 'sn' }, { - title: '公司名称', + title: '热力公司', align: "center", dataIndex: 'companyCompanyId_dictText' }, { - title: '热源名称', + title: '锅炉房', align: "center", dataIndex: 'sourceSourceId_dictText' }, @@ -38,7 +38,7 @@ export const columns: BasicColumn[] = [ // 高级查询数据 export const superQuerySchema = { - sn: {title: 'sn',order: 0,view: 'text', type: 'string',}, + sn: {title: 'SN',order: 0,view: 'text', type: 'string',}, occurtime: {title: '注册设备时间',order: 1,view: 'date', type: 'string',}, companyCompanyId: {title: '公司名称',order: 2,view: 'number', type: 'number',dictTable: "bl_thermalcompany", dictCode: 'id', dictText: 'company_name',}, sourceSourceId: {title: '热源名称',order: 3,view: 'number', type: 'number',dictTable: "bl_heatsource", dictCode: 'id', dictText: 'source_name',}, diff --git a/src/views/base/waterFlowConfig/BlWaterFlowConfigList.vue b/src/views/base/waterFlowConfig/BlWaterFlowConfigList.vue index c12a293..061d311 100644 --- a/src/views/base/waterFlowConfig/BlWaterFlowConfigList.vue +++ b/src/views/base/waterFlowConfig/BlWaterFlowConfigList.vue @@ -12,14 +12,14 @@ - - + + - - + + @@ -135,7 +135,7 @@ registerModal.value.disableSubmit = false; registerModal.value.add({regionType:'郊县'}); } - + /** * 编辑事件 */ @@ -143,7 +143,7 @@ registerModal.value.disableSubmit = false; registerModal.value.edit(record); } - + /** * 详情 */ @@ -151,28 +151,28 @@ 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(); } - + /** * 操作栏 */ @@ -183,18 +183,7 @@ onClick: handleEdit.bind(null, record), auth: 'waterFlowConfig:bl_water_flow_config:edit' }, - ]; - } - - /** - * 下拉操作栏 - */ - function getDropDownAction(record) { - return [ { - label: '详情', - onClick: handleDetail.bind(null, record), - }, { label: '删除', popConfirm: { title: '是否确认删除', @@ -203,6 +192,18 @@ }, auth: 'waterFlowConfig:bl_water_flow_config:delete' } + ]; + } + + /** + * 下拉操作栏 + */ + function getDropDownAction(record) { + return [ + { + label: '详情', + onClick: handleDetail.bind(null, record), + }, ] } @@ -212,7 +213,7 @@ function searchQuery() { reload(); } - + /** * 重置 */ @@ -222,7 +223,7 @@ //刷新数据 reload(); } - + diff --git a/src/views/base/waterFlowConfig/components/BlWaterFlowConfigForm.vue b/src/views/base/waterFlowConfig/components/BlWaterFlowConfigForm.vue index 9157c62..0f0b869 100644 --- a/src/views/base/waterFlowConfig/components/BlWaterFlowConfigForm.vue +++ b/src/views/base/waterFlowConfig/components/BlWaterFlowConfigForm.vue @@ -5,25 +5,25 @@ - - + + - - + + - - + + -