From e21d49c4ca73b9ac061a46091ce9b3a5973df61f Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 10 Sep 2025 08:49:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97=EF=BC=8C?= =?UTF-8?q?=E9=83=8A=E5=8E=BF=E6=94=B9=E6=88=90=E4=B9=A1=E9=95=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 +- index.html | 8 +-- src/components/chart/LineMultiZdy.vue | 4 +- src/views/analysisrule/AnalysisRuleListJx.vue | 4 +- src/views/base/company/Thermalcompany.data.ts | 68 +++++++++++++++++++ .../base/company/ThermalcompanyListJx.vue | 6 +- src/views/base/heatsource/Heatsource.data.ts | 2 +- .../base/heatsource/HeatsourceListJx.vue | 2 +- src/views/base/simconfig/SimconfigListJx.vue | 8 +-- .../simconfig/components/SimconfigJxForm.vue | 4 +- .../BlWaterFlowConfigListJx.vue | 8 +-- src/views/dashboard/Analysis/index.vue | 18 ++--- .../heating/gwrljc/HeatanalysisListJx.vue | 2 +- .../heatanalysis/HeatanalysisListJx.vue | 8 +-- .../components/HeatanalysisModal.vue | 2 +- .../heating/heatanalysis/components/ZxtJX.vue | 2 +- .../history/HeatanalysisHistoryListJx.vue | 2 +- .../heating/report/HeatanalysisListJx.vue | 2 +- src/views/heating/yunwei/index.vue | 2 +- src/views/screen/Dashboard.vue | 16 ++--- .../screen/components/HeatanalysisList.vue | 6 +- src/views/screen/components/ZxtJX.vue | 2 +- src/views/screen/screen.vue | 2 +- src/views/staticList/GlfghsjxList.vue | 4 +- src/views/staticList/GlfghsjxListHistory.vue | 6 +- src/views/staticList/GlfrlljxList.vue | 4 +- src/views/staticList/GlfrlljxListHistory.vue | 6 +- src/views/staticList/GlfslljxList.vue | 4 +- src/views/staticList/GlfslljxListHistory.vue | 6 +- src/views/staticList/GlfyljxList.vue | 4 +- src/views/staticList/GlfyljxListHistory.vue | 6 +- src/views/system/loginmini/MiniLogin.vue | 3 + src/views/temperature/app/index.vue | 4 +- .../temperature/report/TemperatureList.vue | 8 +-- 34 files changed, 154 insertions(+), 83 deletions(-) diff --git a/.env.production b/.env.production index f355372..8cc62d9 100644 --- a/.env.production +++ b/.env.production @@ -13,10 +13,10 @@ VITE_BUILD_COMPRESS = 'gzip' VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false #后台接口父地址(必填) -VITE_GLOB_API_URL=/jeecgboot +VITE_GLOB_API_URL=/api #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://127.0.0.1:8080/jeecg-boot +VITE_GLOB_DOMAIN_URL=http://127.0.0.1:8050/jeecg-boot # 接口父路径前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/index.html b/index.html index 1ad2b78..df9d580 100644 --- a/index.html +++ b/index.html @@ -166,12 +166,12 @@ - + - --> diff --git a/src/components/chart/LineMultiZdy.vue b/src/components/chart/LineMultiZdy.vue index 47e2797..7102962 100644 --- a/src/components/chart/LineMultiZdy.vue +++ b/src/components/chart/LineMultiZdy.vue @@ -37,7 +37,7 @@ function sortByTime(arr: any[]) { } function splitByRegion(data: any[]) { const city = data.filter(d => String(d.regionType).includes('城区')); - const county = data.filter(d => String(d.regionType).includes('郊县')); + const county = data.filter(d => String(d.regionType).includes('乡镇')); return { city: sortByTime(city), county: sortByTime(county) }; } function buildXAxis(records: any[], key = 'view028') { @@ -71,7 +71,7 @@ function prepareOptions(records: any[]) { const countySW = county.map((r: any) => safeNum(r.view035)); const countyHW = county.map((r: any) => safeNum(r.view036)); countyOption = { - title: { text: '郊县供/回水温度【实时】', left: 'center', top: 10 }, + title: { text: '乡镇供/回水温度【实时】', left: 'center', top: 10 }, tooltip: { trigger: 'axis' }, legend: { top: 36, left: 'center' }, grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true }, diff --git a/src/views/analysisrule/AnalysisRuleListJx.vue b/src/views/analysisrule/AnalysisRuleListJx.vue index b616777..5022718 100644 --- a/src/views/analysisrule/AnalysisRuleListJx.vue +++ b/src/views/analysisrule/AnalysisRuleListJx.vue @@ -137,7 +137,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ fixed: 'right', }, beforeFetch: async (params) => { - queryParam.regionType = '郊县' + queryParam.regionType = '乡镇' return Object.assign(params, queryParam); }, }, @@ -181,7 +181,7 @@ function handleSuperQuery(params) { */ function handleAdd() { registerModal.value.disableSubmit = false; - registerModal.value.add({regionType:'郊县'}); + registerModal.value.add({regionType:'乡镇'}); } /** diff --git a/src/views/base/company/Thermalcompany.data.ts b/src/views/base/company/Thermalcompany.data.ts index cf769a5..323fc2c 100644 --- a/src/views/base/company/Thermalcompany.data.ts +++ b/src/views/base/company/Thermalcompany.data.ts @@ -41,10 +41,78 @@ export const columns: BasicColumn[] = [ dataIndex: 'companyAddress' }, ]; +//列表数据 +export const columnsJx: BasicColumn[] = [ + { + title: '序号', + align:"center", + dataIndex: 'id' + }, + { + title: '公司名称', + align:"center", + dataIndex: 'companyJxName' + }, + { + title: '乡镇名称', + align:"center", + dataIndex: 'companyName' + }, + { + title: '公司类型', + align:"center", + dataIndex: 'companyType_dictText' + }, + { + title: '锅炉房个数', + align:"center", + dataIndex: 'boilerHouse' + }, + { + title: '换热站个数', + align:"center", + dataIndex: 'barterHeat' + }, + { + title: '电话', + align:"center", + dataIndex: 'companyPhone' + }, + { + title: '公司地址', + align:"center", + dataIndex: 'companyAddress' + }, +]; //查询数据 export const searchFormSchema: FormSchema[] = [ { label: "公司名称", + field: 'companyJxName', + component: 'Input', + //colProps: {span: 6}, + }, + { + label: "乡镇名称", + field: 'companyName', + component: 'Input', + //colProps: {span: 6}, + }, + { + label: "公司类型", + field: 'companyType', + component: 'JSelectMultiple', + componentProps:{ + dictCode:"h_company_type" + }, + //colProps: {span: 6}, + }, +]; + +//查询数据 +export const searchForm2Schema: FormSchema[] = [ + { + label: "公司名称", field: 'companyName', component: 'Input', //colProps: {span: 6}, diff --git a/src/views/base/company/ThermalcompanyListJx.vue b/src/views/base/company/ThermalcompanyListJx.vue index 16a1075..606abb2 100644 --- a/src/views/base/company/ThermalcompanyListJx.vue +++ b/src/views/base/company/ThermalcompanyListJx.vue @@ -39,7 +39,7 @@ import {BasicTable, useTable, TableAction} from '/@/components/Table'; import { useListPage } from '/@/hooks/system/useListPage' import ThermalcompanyModal from './components/ThermalcompanyModal.vue' - import {columns, searchFormSchema} from './Thermalcompany.data'; + import {columnsJx, searchFormSchema} from './Thermalcompany.data'; import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './Thermalcompany.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import { useUserStore } from '/@/store/modules/user'; @@ -56,7 +56,7 @@ column: 'id', order: 'asc', }, - columns, + columns:columnsJx, canResize:false, formConfig: { //labelWidth: 120, @@ -73,7 +73,7 @@ fixed:'right' }, beforeFetch: (params) => { - queryParam.regionType = '郊县' + queryParam.regionType = '乡镇' return Object.assign(params, queryParam); }, }, diff --git a/src/views/base/heatsource/Heatsource.data.ts b/src/views/base/heatsource/Heatsource.data.ts index ef21c7e..9a7396d 100644 --- a/src/views/base/heatsource/Heatsource.data.ts +++ b/src/views/base/heatsource/Heatsource.data.ts @@ -82,7 +82,7 @@ export const searchFormSchemaJx: FormSchema[] = [ field: 'companyId', component: 'JSelectMultiple', componentProps:{ - dictCode:"bl_thermalcompany,company_name,id,del_flag = '0' and region_type = '郊县'" + dictCode:"bl_thermalcompany,company_name,id,del_flag = '0' and region_type = '乡镇'" }, //colProps: {span: 6}, }, diff --git a/src/views/base/heatsource/HeatsourceListJx.vue b/src/views/base/heatsource/HeatsourceListJx.vue index 7b4b767..524f053 100644 --- a/src/views/base/heatsource/HeatsourceListJx.vue +++ b/src/views/base/heatsource/HeatsourceListJx.vue @@ -74,7 +74,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ fixed: 'right' }, beforeFetch: (params) => { - queryParam.regionType = '郊县' + queryParam.regionType = '乡镇' return Object.assign(params, queryParam); }, }, diff --git a/src/views/base/simconfig/SimconfigListJx.vue b/src/views/base/simconfig/SimconfigListJx.vue index 02c3898..91a7551 100644 --- a/src/views/base/simconfig/SimconfigListJx.vue +++ b/src/views/base/simconfig/SimconfigListJx.vue @@ -125,7 +125,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ fixed: 'right' }, beforeFetch: (params) => { - queryParam.value.regionType = '郊县' + queryParam.value.regionType = '乡镇' return Object.assign(params, queryParam.value); }, }, @@ -235,13 +235,13 @@ function searchReset() { const thermalcompany = ref(); async function getThermalcompany() { - let params = {regionType:'郊县'}; + let params = {regionType:'乡镇'}; thermalcompany.value = await companylist(params); } const heatsource = ref(); async function getHeatsource() { - let params = {regionType:'郊县'}; + let params = {regionType:'乡镇'}; heatsource.value = await heatsourcelist(params); } @@ -251,7 +251,7 @@ async function getHeatsource() { // } async function handleChange1(record) { - let params = { companyCompanyId: record,regionType:'郊县' }; + let params = { companyCompanyId: record,regionType:'乡镇' }; heatsource.value = await heatsourcelist(params); // heatsourcestation.value = []; queryParam.value.sourceSourceId = ''; diff --git a/src/views/base/simconfig/components/SimconfigJxForm.vue b/src/views/base/simconfig/components/SimconfigJxForm.vue index 4281b2e..403fd17 100644 --- a/src/views/base/simconfig/components/SimconfigJxForm.vue +++ b/src/views/base/simconfig/components/SimconfigJxForm.vue @@ -193,13 +193,13 @@ const thermalcompany = ref(); async function getThermalcompany(){ - let params = {regionType:'郊县'}; + let params = {regionType:'乡镇'}; thermalcompany.value = await companylist(params); } const heatsource = ref(); async function getHeatsource(){ - let params = {regionType:'郊县'}; + let params = {regionType:'乡镇'}; heatsource.value = await heatsourcelist(params); } diff --git a/src/views/base/waterFlowConfig/BlWaterFlowConfigListJx.vue b/src/views/base/waterFlowConfig/BlWaterFlowConfigListJx.vue index 14300f2..80c69cc 100644 --- a/src/views/base/waterFlowConfig/BlWaterFlowConfigListJx.vue +++ b/src/views/base/waterFlowConfig/BlWaterFlowConfigListJx.vue @@ -13,13 +13,13 @@ - + - + + diff --git a/src/views/heating/heatanalysis/components/ZxtJX.vue b/src/views/heating/heatanalysis/components/ZxtJX.vue index cbc621b..dab1f1f 100644 --- a/src/views/heating/heatanalysis/components/ZxtJX.vue +++ b/src/views/heating/heatanalysis/components/ZxtJX.vue @@ -176,7 +176,7 @@ function init(record_: any) { const params = { pageNo: 1, pageSize: -1, - regionType: '郊县', + regionType: '乡镇', view001: record_.view001, view002: record_.view002, view004: -1, diff --git a/src/views/heating/history/HeatanalysisHistoryListJx.vue b/src/views/heating/history/HeatanalysisHistoryListJx.vue index d1be0ac..14e5aaa 100644 --- a/src/views/heating/history/HeatanalysisHistoryListJx.vue +++ b/src/views/heating/history/HeatanalysisHistoryListJx.vue @@ -102,7 +102,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ fullScreen: false, }, beforeFetch: (params) => { - queryParam.value.regionType = '郊县' + queryParam.value.regionType = '乡镇' params.column = '', params.order = '';//新生成的默认不带排序 return Object.assign(params, queryParam.value); }, diff --git a/src/views/heating/report/HeatanalysisListJx.vue b/src/views/heating/report/HeatanalysisListJx.vue index 5dfce5e..181526a 100644 --- a/src/views/heating/report/HeatanalysisListJx.vue +++ b/src/views/heating/report/HeatanalysisListJx.vue @@ -150,7 +150,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ fullScreen: false, }, beforeFetch: (params) => { - queryParam.value.regionType = '郊县' + queryParam.value.regionType = '乡镇' params.column = '', params.order = '';//新生成的默认不带排序 return Object.assign(params, queryParam.value); }, diff --git a/src/views/heating/yunwei/index.vue b/src/views/heating/yunwei/index.vue index 2aadc9d..cb6b74a 100644 --- a/src/views/heating/yunwei/index.vue +++ b/src/views/heating/yunwei/index.vue @@ -38,7 +38,7 @@ 全部 城区 - 郊县 + 乡镇 diff --git a/src/views/screen/Dashboard.vue b/src/views/screen/Dashboard.vue index 152c83a..09fad60 100644 --- a/src/views/screen/Dashboard.vue +++ b/src/views/screen/Dashboard.vue @@ -110,14 +110,14 @@
{{ jxsl }}
-
郊县总数
+
乡镇总数
-
+
-
+
{{ jxglfsl }}
-
郊县锅炉房总数
+
乡镇锅炉房总数
@@ -125,7 +125,7 @@
icon - 郊县瞬时热量【实时】 + 乡镇瞬时热量【实时】
@@ -134,7 +134,7 @@
icon - 郊县瞬时流量【实时】 + 乡镇瞬时流量【实时】
@@ -144,7 +144,7 @@
icon - 郊县供回水温度【实时】 + 乡镇供回水温度【实时】
@@ -443,7 +443,7 @@ function updateChartLine() { }, true); } -// area-6 郊县柱状图 +// area-6 乡镇柱状图 function updateChartCounty() { if (!chartCounty) return; diff --git a/src/views/screen/components/HeatanalysisList.vue b/src/views/screen/components/HeatanalysisList.vue index f3bea73..8f0dc1c 100644 --- a/src/views/screen/components/HeatanalysisList.vue +++ b/src/views/screen/components/HeatanalysisList.vue @@ -19,13 +19,13 @@ {{ item.view004Name!=null?item.view004Name:item.view002Name }} {{ item.datatime }} - {{ item.view032 }} + {{ item.view032 }} {{ item.view005 }} {{ item.view006 }} {{ item.view009 }} {{ item.view010 }} - {{ item.view035 }} - {{ item.view036 }} + {{ item.view035 }} + {{ item.view036 }} diff --git a/src/views/screen/components/ZxtJX.vue b/src/views/screen/components/ZxtJX.vue index 039ee9c..db17acf 100644 --- a/src/views/screen/components/ZxtJX.vue +++ b/src/views/screen/components/ZxtJX.vue @@ -198,7 +198,7 @@ function init(record_: any) { const params = { pageNo: 1, pageSize: -1, - regionType: '郊县', + regionType: '乡镇', view001: record_.view001, view002: record_.view002, startDate: formatDateTime(start), diff --git a/src/views/screen/screen.vue b/src/views/screen/screen.vue index 420dde1..7a4ba2c 100644 --- a/src/views/screen/screen.vue +++ b/src/views/screen/screen.vue @@ -92,7 +92,7 @@ async function getHistoryList(){ value1 = Number(list[i].view005); value2 = Number(list[i].view006); } - if(list[i].regionType =='郊县'){ + if(list[i].regionType =='乡镇'){ value1 = Number(list[i].view035); value2 = Number(list[i].view036); } diff --git a/src/views/staticList/GlfghsjxList.vue b/src/views/staticList/GlfghsjxList.vue index 80faba4..5b1ed6c 100644 --- a/src/views/staticList/GlfghsjxList.vue +++ b/src/views/staticList/GlfghsjxList.vue @@ -29,7 +29,7 @@ function sortByTime(arr: any[]) { } function splitByRegion(data: any[]) { - const city = data.filter(d => String(d.regionType).includes('郊县')); + const city = data.filter(d => String(d.regionType).includes('乡镇')); return { city: sortByTime(city) }; } function buildXAxis(records: any[], key = 'view028') { @@ -49,7 +49,7 @@ function prepareOptions(records: any[]) { const citySW = city.map((r: any) => safeNum(r.view035)); const cityHW = city.map((r: any) => safeNum(r.view036)); cityOption = { - title: { text: '郊县锅炉房供/回水温度', left: 'center', top: 10 }, + title: { text: '乡镇锅炉房供/回水温度', left: 'center', top: 10 }, tooltip: { trigger: 'axis' }, legend: { top: 36, left: 'center' }, grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true }, diff --git a/src/views/staticList/GlfghsjxListHistory.vue b/src/views/staticList/GlfghsjxListHistory.vue index 88f8f65..e6f6283 100644 --- a/src/views/staticList/GlfghsjxListHistory.vue +++ b/src/views/staticList/GlfghsjxListHistory.vue @@ -51,14 +51,14 @@ function sortByTime(arr: any[]) { const heatsource = ref(); async function getHeatsource(){ - heatsource.value = await heatsourcelist({regionType: '郊县'}); + heatsource.value = await heatsourcelist({regionType: '乡镇'}); } async function handleChange(){ loadData(); } function splitByRegion(data: any[]) { - const city = data.filter(d => String(d.regionType).includes('郊县')); + const city = data.filter(d => String(d.regionType).includes('乡镇')); return { city: sortByTime(city) }; } function buildXAxis(records: any[], key = 'view028') { @@ -75,7 +75,7 @@ function prepareOptions(records: any[]) { const citySW = city.map((r: any) => safeNum(r.view005)); const cityHW = city.map((r: any) => safeNum(r.view006)); cityOption = { - title: { text: '郊县锅炉房历史供/回水温度', left: 'center', top: 10 }, + title: { text: '乡镇锅炉房历史供/回水温度', left: 'center', top: 10 }, tooltip: { trigger: 'axis' }, legend: { top: 36, left: 'center' }, grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true }, diff --git a/src/views/staticList/GlfrlljxList.vue b/src/views/staticList/GlfrlljxList.vue index abc5019..a6b4213 100644 --- a/src/views/staticList/GlfrlljxList.vue +++ b/src/views/staticList/GlfrlljxList.vue @@ -29,7 +29,7 @@ function sortByTime(arr: any[]) { } function splitByRegion(data: any[]) { - const city = data.filter(d => String(d.regionType).includes('郊县')); + const city = data.filter(d => String(d.regionType).includes('乡镇')); return { city: sortByTime(city) }; } function buildXAxis(records: any[], key = 'view028') { @@ -48,7 +48,7 @@ function prepareOptions(records: any[]) { console.log("🚀 ~ prepareOptions ~ cityX:", cityX) const citySW = city.map((r: any) => safeNum(r.view037)); cityOption = { - title: { text: '郊县锅炉房热流量', left: 'center', top: 10 }, + title: { text: '乡镇锅炉房热流量', left: 'center', top: 10 }, tooltip: { trigger: 'axis' }, legend: { top: 36, left: 'center' }, grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true }, diff --git a/src/views/staticList/GlfrlljxListHistory.vue b/src/views/staticList/GlfrlljxListHistory.vue index a4353f7..1be109d 100644 --- a/src/views/staticList/GlfrlljxListHistory.vue +++ b/src/views/staticList/GlfrlljxListHistory.vue @@ -51,14 +51,14 @@ function sortByTime(arr: any[]) { const heatsource = ref(); async function getHeatsource(){ - heatsource.value = await heatsourcelist({regionType: '郊县'}); + heatsource.value = await heatsourcelist({regionType: '乡镇'}); } async function handleChange(){ loadData(); } function splitByRegion(data: any[]) { - const city = data.filter(d => String(d.regionType).includes('郊县')); + const city = data.filter(d => String(d.regionType).includes('乡镇')); return { city: sortByTime(city) }; } function buildXAxis(records: any[], key = 'view028') { @@ -74,7 +74,7 @@ function prepareOptions(records: any[]) { const cityX = buildXAxis(city, 'datatime'); const citySW = city.map((r: any) => safeNum(r.view037)); cityOption = { - title: { text: '郊县锅炉房历史热流量', left: 'center', top: 10 }, + title: { text: '乡镇锅炉房历史热流量', left: 'center', top: 10 }, tooltip: { trigger: 'axis' }, legend: { top: 36, left: 'center' }, grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true }, diff --git a/src/views/staticList/GlfslljxList.vue b/src/views/staticList/GlfslljxList.vue index fe878c4..133293a 100644 --- a/src/views/staticList/GlfslljxList.vue +++ b/src/views/staticList/GlfslljxList.vue @@ -29,7 +29,7 @@ function sortByTime(arr: any[]) { } function splitByRegion(data: any[]) { - const city = data.filter(d => String(d.regionType).includes('郊县')); + const city = data.filter(d => String(d.regionType).includes('乡镇')); return { city: sortByTime(city) }; } function buildXAxis(records: any[], key = 'view028') { @@ -48,7 +48,7 @@ function prepareOptions(records: any[]) { console.log("🚀 ~ prepareOptions ~ cityX:", cityX) const citySW = city.map((r: any) => safeNum(r.view041)); cityOption = { - title: { text: '郊县锅炉房水流量', left: 'center', top: 10 }, + title: { text: '乡镇锅炉房水流量', left: 'center', top: 10 }, tooltip: { trigger: 'axis' }, legend: { top: 36, left: 'center' }, grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true }, diff --git a/src/views/staticList/GlfslljxListHistory.vue b/src/views/staticList/GlfslljxListHistory.vue index e1baac4..4ebe8bb 100644 --- a/src/views/staticList/GlfslljxListHistory.vue +++ b/src/views/staticList/GlfslljxListHistory.vue @@ -51,14 +51,14 @@ function sortByTime(arr: any[]) { const heatsource = ref(); async function getHeatsource(){ - heatsource.value = await heatsourcelist({regionType: '郊县'}); + heatsource.value = await heatsourcelist({regionType: '乡镇'}); } async function handleChange(){ loadData(); } function splitByRegion(data: any[]) { - const city = data.filter(d => String(d.regionType).includes('郊县')); + const city = data.filter(d => String(d.regionType).includes('乡镇')); return { city: sortByTime(city) }; } function buildXAxis(records: any[], key = 'view028') { @@ -74,7 +74,7 @@ function prepareOptions(records: any[]) { const cityX = buildXAxis(city, 'datatime'); const citySW = city.map((r: any) => safeNum(r.view037)); cityOption = { - title: { text: '郊县锅炉房历史水流量', left: 'center', top: 10 }, + title: { text: '乡镇锅炉房历史水流量', left: 'center', top: 10 }, tooltip: { trigger: 'axis' }, legend: { top: 36, left: 'center' }, grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true }, diff --git a/src/views/staticList/GlfyljxList.vue b/src/views/staticList/GlfyljxList.vue index ff1b81e..2b83ec2 100644 --- a/src/views/staticList/GlfyljxList.vue +++ b/src/views/staticList/GlfyljxList.vue @@ -29,7 +29,7 @@ function sortByTime(arr: any[]) { } function splitByRegion(data: any[]) { - const city = data.filter(d => String(d.regionType).includes('郊县')); + const city = data.filter(d => String(d.regionType).includes('乡镇')); return { city: sortByTime(city) }; } function buildXAxis(records: any[], key = 'view028') { @@ -49,7 +49,7 @@ function prepareOptions(records: any[]) { const citySW = city.map((r: any) => safeNum(r.view007)); const cityHW = city.map((r: any) => safeNum(r.view008)); cityOption = { - title: { text: '郊县锅炉房供/回水压力', left: 'center', top: 10 }, + title: { text: '乡镇锅炉房供/回水压力', left: 'center', top: 10 }, tooltip: { trigger: 'axis' }, legend: { top: 36, left: 'center' }, grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true }, diff --git a/src/views/staticList/GlfyljxListHistory.vue b/src/views/staticList/GlfyljxListHistory.vue index 3a66c53..819099a 100644 --- a/src/views/staticList/GlfyljxListHistory.vue +++ b/src/views/staticList/GlfyljxListHistory.vue @@ -51,14 +51,14 @@ function sortByTime(arr: any[]) { const heatsource = ref(); async function getHeatsource(){ - heatsource.value = await heatsourcelist({regionType: '郊县'}); + heatsource.value = await heatsourcelist({regionType: '乡镇'}); } async function handleChange(){ loadData(); } function splitByRegion(data: any[]) { - const city = data.filter(d => String(d.regionType).includes('郊县')); + const city = data.filter(d => String(d.regionType).includes('乡镇')); return { city: sortByTime(city) }; } function buildXAxis(records: any[], key = 'view028') { @@ -75,7 +75,7 @@ function prepareOptions(records: any[]) { const citySW = city.map((r: any) => safeNum(r.view007)); const cityHW = city.map((r: any) => safeNum(r.view008)); cityOption = { - title: { text: '郊县锅炉房历史供/回水压力', left: 'center', top: 10 }, + title: { text: '乡镇锅炉房历史供/回水压力', left: 'center', top: 10 }, tooltip: { trigger: 'axis' }, legend: { top: 36, left: 'center' }, grid: { left: '6%', right: '4%', bottom: 70, top: 70, containLabel: true }, diff --git a/src/views/system/loginmini/MiniLogin.vue b/src/views/system/loginmini/MiniLogin.vue index 281df82..46ef334 100644 --- a/src/views/system/loginmini/MiniLogin.vue +++ b/src/views/system/loginmini/MiniLogin.vue @@ -24,6 +24,9 @@
+
diff --git a/src/views/temperature/app/index.vue b/src/views/temperature/app/index.vue index 7f1489f..be74660 100644 --- a/src/views/temperature/app/index.vue +++ b/src/views/temperature/app/index.vue @@ -89,7 +89,7 @@ onMounted(() => {