yangjun
/
panshi_vue_new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

公司、锅炉房、换热站、设备信息、供热地图、数据大屏

This commit is contained in:
曹磊 2025-07-21 15:31:35 +08:00
parent e293aa9f83
commit 3bb2c99354
23 changed files with 292 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/assets/loginmini/style/screen.less
View File

@ -253,7 +253,7 @@ b,strong{font-weight:700}
display: table;
//display:flex;
justify-content: center;
border-radius:10px;
border-radius:4px;
font-size:0.9rem;
height:2.6rem;
line-height:2.6rem;
@ -267,7 +267,7 @@ b,strong{font-weight:700}
justify-content: center;
text-align: center;
background:url(../images/list4.png) no-repeat center;
border-radius:10px;
border-radius:4px;
font-size:0.9rem;
height:2.6rem;
line-height:2.6rem;
@ -319,7 +319,7 @@ b,strong{font-weight:700}
display: table;
justify-content: center;
background:url(../images/list1.png) no-repeat center;
border-radius:10px;
border-radius:4px;
font-size:0.9rem;
height:2.6rem;
line-height:2.6rem;
@ -332,7 +332,7 @@ b,strong{font-weight:700}
justify-content: center;
text-align: center;
background:url(../images/list4.png) no-repeat center;
border-radius:10px;
border-radius:4px;
font-size:0.9rem;
height:2.6rem;
line-height:2.6rem;
@ -505,7 +505,7 @@ outline:none;
display: table;
//display:flex;
justify-content: center;
border-radius:10px;
border-radius:4px;
font-size:1.2rem;
height:2.8rem;
line-height:2.8rem;
@ -519,7 +519,7 @@ outline:none;
justify-content: center;
text-align: center;
background:url(../images/list4.png) no-repeat center;
border-radius:10px;
border-radius:4px;
font-size:1.2rem;
height:2.8rem;
line-height:2.8rem;
@ -533,7 +533,7 @@ outline:none;
display: table;
justify-content: center;
background:url(../images/list1.png) no-repeat center;
border-radius:10px;
border-radius:4px;
font-size:1.2rem;
height:2.8rem;
line-height:2.8rem;
@ -546,7 +546,7 @@ outline:none;
justify-content: center;
text-align: center;
background:url(../images/list4.png) no-repeat center;
border-radius:10px;
border-radius:4px;
font-size:1.2rem;
height:2.8rem;
line-height:2.8rem;
@ -631,6 +631,7 @@ outline:none;
display: table;
//display:flex;
justify-content: center;
border-radius:4px;
font-size:0.9rem;
height:2.6rem;
line-height:2.6rem;
@ -644,6 +645,7 @@ outline:none;
justify-content: center;
text-align: center;
background:url(../images/list4.png) no-repeat center;
border-radius:4px;
font-size:0.9rem;
height:2.6rem;
line-height:2.6rem;
@ -657,6 +659,7 @@ outline:none;
display: table;
justify-content: center;
background:url(../images/list1.png) no-repeat center;
border-radius:4px;
font-size:0.9rem;
height:2.6rem;
line-height:2.6rem;
@ -669,7 +672,7 @@ outline:none;
justify-content: center;
text-align: center;
background:url(../images/list4.png) no-repeat center;
border-radius:10px;
border-radius:4px;
font-size:0.9rem;
height:2.6rem;
line-height:2.6rem;

8
src/views/base/company/components/ThermalcompanyForm.vue
View File

@ -21,7 +21,7 @@
</a-col>
<a-col :span="12">
<a-form-item label="电话" v-bind="validateInfos.companyPhone" id="ThermalcompanyForm-companyPhone" name="companyPhone">
<a-input-number v-model:value="formData.companyPhone" placeholder="请输入电话" style="width: 390px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.companyPhone" placeholder="请输入电话" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
@ -64,12 +64,12 @@
<a-date-picker placeholder="请选择成立时间" v-model:value="formData.setupTime" value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-col :span="12">
<a-form-item label="公司地址" v-bind="validateInfos.companyAddress" id="ThermalcompanyForm-companyAddress" name="companyAddress">
<a-textarea v-model:value="formData.companyAddress" placeholder="请输入公司地址" allow-clear :rows="2"></a-textarea>
<a-textarea v-model:value="formData.companyAddress" placeholder="请输入公司地址" allow-clear :rows="4"></a-textarea>
</a-form-item>
</a-col>
<a-col :span="24">
<a-col :span="12">
<a-form-item label="供热区域" v-bind="validateInfos.heatArea" id="ThermalcompanyForm-heatArea" name="heatArea">
<a-textarea v-model:value="formData.heatArea" placeholder="请输入供热区域" allow-clear :rows="4"></a-textarea>
</a-form-item>

42
src/views/base/heatsource/components/HeatsourceForm.vue
View File

@ -21,7 +21,7 @@
</a-col>
<a-col :span="12">
<a-form-item label="联系电话" v-bind="validateInfos.sourcePhone" id="HeatsourceForm-sourcePhone" name="sourcePhone">
<a-input-number v-model:value="formData.sourcePhone" placeholder="请输入联系电话" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.sourcePhone" placeholder="请输入联系电话" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
@ -41,102 +41,102 @@
</a-col>
<a-col :span="12">
<a-form-item label="锅炉数量(台)" v-bind="validateInfos.boilernum" id="HeatsourceForm-boilernum" name="boilernum">
<a-input-number v-model:value="formData.boilernum" placeholder="请输入锅炉数量" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.boilernum" placeholder="请输入锅炉数量" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="供水温度下限(℃)" v-bind="validateInfos.wdgoDown" id="HeatsourceForm-wdgoDown" name="wdgoDown">
<a-input-number v-model:value="formData.wdgoDown" placeholder="请输入供水温度下限" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.wdgoDown" placeholder="请输入供水温度下限" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="供水温度上限(℃)" v-bind="validateInfos.wdgoUp" id="HeatsourceForm-wdgoUp" name="wdgoUp">
<a-input-number v-model:value="formData.wdgoUp" placeholder="请输入供水温度上限" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.wdgoUp" placeholder="请输入供水温度上限" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="回水温度下限(℃)" v-bind="validateInfos.wdcomeDown" id="HeatsourceForm-wdcomeDown" name="wdcomeDown">
<a-input-number v-model:value="formData.wdcomeDown" placeholder="请输入回水温度下限" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.wdcomeDown" placeholder="请输入回水温度下限" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="回水温度上限(℃)" v-bind="validateInfos.wdcomeUp" id="HeatsourceForm-wdcomeUp" name="wdcomeUp">
<a-input-number v-model:value="formData.wdcomeUp" placeholder="请输入回水温度上限" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.wdcomeUp" placeholder="请输入回水温度上限" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="供水压力下限(MPa)" v-bind="validateInfos.ylgoDown" id="HeatsourceForm-ylgoDown" name="ylgoDown">
<a-input-number v-model:value="formData.ylgoDown" placeholder="请输入供水压力下限" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.ylgoDown" placeholder="请输入供水压力下限" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="供水压力上限(MPa)" v-bind="validateInfos.ylgoUp" id="HeatsourceForm-ylgoUp" name="ylgoUp">
<a-input-number v-model:value="formData.ylgoUp" placeholder="请输入供水压力上限" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.ylgoUp" placeholder="请输入供水压力上限" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="回水压力下限(MPa)" v-bind="validateInfos.ylcomeDown" id="HeatsourceForm-ylcomeDown" name="ylcomeDown">
<a-input-number v-model:value="formData.ylcomeDown" placeholder="请输入回水压力下限" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.ylcomeDown" placeholder="请输入回水压力下限" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="回水压力上限(MPa)" v-bind="validateInfos.ylcomeUp" id="HeatsourceForm-ylcomeUp" name="ylcomeUp">
<a-input-number v-model:value="formData.ylcomeUp" placeholder="请输入回水压力上限" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.ylcomeUp" placeholder="请输入回水压力上限" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="一次网(km)" v-bind="validateInfos.onenet" id="HeatsourceForm-onenet" name="onenet">
<a-input-number v-model:value="formData.onenet" placeholder="请输入一次网" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.onenet" placeholder="请输入一次网" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="二次网(km)" v-bind="validateInfos.secondarynet" id="HeatsourceForm-secondarynet" name="secondarynet">
<a-input-number v-model:value="formData.secondarynet" placeholder="请输入二次网" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.secondarynet" placeholder="请输入二次网" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="供热面积(万㎡)" v-bind="validateInfos.heatingArea" id="HeatsourceForm-heatingArea" name="heatingArea">
<a-input-number v-model:value="formData.heatingArea" placeholder="请输入供热面积" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.heatingArea" placeholder="请输入供热面积" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="住宅面积(万㎡)" v-bind="validateInfos.residentialArea" id="HeatsourceForm-residentialArea" name="residentialArea">
<a-input-number v-model:value="formData.residentialArea" placeholder="请输入住宅面积" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.residentialArea" placeholder="请输入住宅面积" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="非住宅面积(万㎡)" v-bind="validateInfos.noresidentialArea" id="HeatsourceForm-noresidentialArea" name="noresidentialArea">
<a-input-number v-model:value="formData.noresidentialArea" placeholder="请输入非住宅面积" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.noresidentialArea" placeholder="请输入非住宅面积" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="年用水量(t)" v-bind="validateInfos.yearwater" id="HeatsourceForm-yearwater" name="yearwater">
<a-input-number v-model:value="formData.yearwater" placeholder="请输入年用水量" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.yearwater" placeholder="请输入年用水量" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="现储煤量(t)" v-bind="validateInfos.nowcoal" id="HeatsourceForm-nowcoal" name="nowcoal">
<a-input-number v-model:value="formData.nowcoal" placeholder="请输入现储煤量" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.nowcoal" placeholder="请输入现储煤量" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="年用煤量(t)" v-bind="validateInfos.yearcoal" id="HeatsourceForm-yearcoal" name="yearcoal">
<a-input-number v-model:value="formData.yearcoal" placeholder="请输入年用煤量" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.yearcoal" placeholder="请输入年用煤量" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="年用电量(万kwh)" v-bind="validateInfos.yearelectricity" id="HeatsourceForm-yearelectricity" name="yearelectricity">
<a-input-number v-model:value="formData.yearelectricity" placeholder="请输入年用电量" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.yearelectricity" placeholder="请输入年用电量" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="锅炉吨位(t)" v-bind="validateInfos.tonnage" id="HeatsourceForm-tonnage" name="tonnage">
<a-input-number v-model:value="formData.tonnage" placeholder="请输入锅炉吨位" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.tonnage" placeholder="请输入锅炉吨位" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="锅炉吨位2(t)" v-bind="validateInfos.tonnageTwo" id="HeatsourceForm-tonnageTwo" name="tonnageTwo">
<a-input-number v-model:value="formData.tonnageTwo" placeholder="请输入锅炉吨位2" style="width: 520px" allow-clear ></a-input-number>
<a-input-number v-model:value="formData.tonnageTwo" placeholder="请输入锅炉吨位2" style="width: 100%" allow-clear ></a-input-number>
</a-form-item>
</a-col>
</a-row>

2
src/views/base/heatsource/components/HeatsourceModal.vue
View File

@ -10,7 +10,7 @@
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<number>(1600);
const width = ref<number>(1400);
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();

12
src/views/base/simconfig/SimconfigList.vue
View File

@ -1,5 +1,5 @@
<template>
<div>
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -54,7 +54,7 @@
<a-col :lg="5">
<span style="overflow: hidden" class="table-page-search-submitButtons">
<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-button preIcon="ant-design:sync-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>
@ -277,4 +277,12 @@
:deep(.ant-picker),:deep(.ant-input-number){
width: 100%;
}
:deep(.jeecg-basic-table-form-container) {
padding: 0px;
}
:deep(.ant-form-item) {
margin-bottom: 8px;
}
</style>

32
src/views/base/station/HeatsourcestationList.vue
View File

@ -1,10 +1,10 @@
<template>
<div>
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :lg="5">
<a-col :span="6">
<a-form-item label="热力公司">
<a-select ref="select"
placeholder="请选择热力公司"
@ -16,7 +16,7 @@
</a-select>
</a-form-item>
</a-col>
<a-col :lg="5">
<a-col :span="5">
<a-form-item label="热源站">
<a-select ref="select"
placeholder="请选择热源站"
@ -27,15 +27,15 @@
</a-select>
</a-form-item>
</a-col>
<a-col :lg="5">
<a-col :span="5">
<a-form-item label="换热站">
<a-input v-model:value="queryParam.stationName" placeholder="请输入换热站名称" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :lg="5">
<a-col :span="5">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<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-button preIcon="ant-design:sync-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>
@ -130,12 +130,14 @@
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
const labelCol = reactive({
xs: { span: 24 },
sm: { span: 7 },
xs:24,
sm:4,
xl:6,
xxl:4
});
const wrapperCol = reactive({
xs: { span: 24 },
sm: { span: 16 },
xs: 24,
sm: 20,
});
/**
* 新增事件
@ -239,4 +241,14 @@
:deep(.ant-picker),:deep(.ant-input-number){
width: 100%;
}
:deep(.jeecg-basic-table-form-container) {
padding: 0px;
}
:deep(.ant-form-item) {
margin-bottom: 8px;
}
</style>

8
src/views/base/station/components/HeatsourcestationForm.vue
View File

@ -10,7 +10,7 @@
<a-select ref="select"
placeholder="请选择热力公司"
v-model:value="formData.companyId"
style="width: 250px"
style="width: 100%"
@focus="focus"
@change="handleChange1">
<a-select-option :value="item.companyId" v-for="item in thermalcompany" :key="item.id">{{item.companyName}}</a-select-option>
@ -23,7 +23,7 @@
<a-select ref="select"
placeholder="请选择热源站"
v-model:value="formData.sourceId"
style="width: 250px"
style="width: 100%"
@focus="focus">
<a-select-option :value="item.sourceId" v-for="item in heatsource" :key="item.id">{{item.sourceName}}</a-select-option>
</a-select>
@ -89,9 +89,9 @@
<a-input-number v-model:value="formData.ylcomeUp" placeholder="请输入回水压力上限" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-col :span="12">
<a-form-item label="换热站地址" v-bind="validateInfos.stationAddress" id="HeatsourcestationForm-stationAddress" name="stationAddress">
<a-textarea v-model:value="formData.stationAddress" placeholder="请输入换热站地址" :rows="2"></a-textarea>
<a-textarea v-model:value="formData.stationAddress" placeholder="请输入换热站地址" :rows="4"></a-textarea>
</a-form-item>
</a-col>
</a-row>

2
src/views/base/station/components/HeatsourcestationModal.vue
View File

@ -10,7 +10,7 @@
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<number>(1600);
const width = ref<number>(1400);
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();

2
src/views/dashboard/Analysis/detail.vue
View File

@ -3,7 +3,7 @@
<div class="index-central">
<div class="index-center">
<div class="real-time-line">
<span class="real-time-title">实时数据检测</span>
<span class="real-time-title">实时数据监测</span>
<div class="real-time-heat">
<span class="real-misettl">一次网</span>
<span class="real-misettl">二次网</span>

4
src/views/dashboard/Analysis/index.vue
View File

@ -4,7 +4,7 @@
<div class="index-center">
<div style="width: 20px;height: 20px;position: absolute;cursor: pointer;" @click="showList"></div>
<div class="real-time-line">
<span class="real-time-title">实时数据检测</span>
<span class="real-time-title">实时数据监测</span>
<div style="float:right;margin-right: 50px;">
<a-switch checkedChildren="卡片" unCheckedChildren="列表" v-model:checked="twoShowType" />
</div>
@ -76,7 +76,7 @@
<div class="photoModal" ref="refModal">
<a-modal
v-model:visible="detailVisible"
width="1280px"
width="1600px"
:wrap-style="{ overflow: 'hidden' }"
:destroyOnClose="true"
:footer="null"

65
src/views/heating/extract/DataExtractConfigList.vue
View File

@ -4,9 +4,9 @@
<div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :lg="4">
<a-col :span="5">
<a-form-item>
<span title="热力公司">热力公司 </span>
<span title="热力公司">热力公司：</span>
<a-select ref="select"
placeholder="请选择热力公司"
v-model:value="queryParam.companyId"
@ -16,9 +16,9 @@
</a-select>
</a-form-item>
</a-col>
<a-col :lg="4">
<a-col :span="4">
<a-form-item>
<span title="热源站">热源站 </span>
<span title="热源站">热源站：</span>
<a-select ref="select"
placeholder="请选择热源站"
v-model:value="queryParam.sourceId"
@ -28,9 +28,9 @@
</a-select>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-col :span="6">
<a-form-item>
<span title="换热站">换热站 </span>
<span title="换热站">换热站：</span>
<a-select ref="select"
placeholder="请选择换热站"
v-model:value="queryParam.stationId"
@ -40,29 +40,29 @@
</a-select>
</a-form-item>
</a-col>
<a-col :lg="4">
<a-col :span="4">
<a-form-item name="sim">
<span title="电话号">电话号 </span>
<span title="电话号">电话号：</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">
<a-col :span="4">
<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-button preIcon="ant-design:sync-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
</a-col>
</span>
</a-col>
<a-col :lg="4">
<a-col :span="5">
<a-form-item name="onePipeSim">
<span title="一次电话号">一次电话 </span>
<span title="一次电话号">一次电话：</span>
<a-input style="width: 150px" placeholder="一次网抽取电话号" v-model:value="queryParam.onePipeSim" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :lg="4">
<a-col :span="4">
<a-form-item name="onePipeType">
<span title="一次类型">一次类型 </span>
<span title="一次类型">一类型：</span>
<a-select ref="select"
placeholder="请选择类型"
v-model:value="queryParam.onePipeType"
@ -74,15 +74,15 @@
</a-select>
</a-form-item>
</a-col>
<a-col :lg="4">
<a-col :span="6">
<a-form-item name="twoPipeSim">
<span title="二次电话号">二次电话 </span>
<span title="二次电话号">二次电话：</span>
<a-input style="width: 150px" placeholder="二次网抽取电话号" v-model:value="queryParam.twoPipeSim" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :lg="4">
<a-col :span="4">
<a-form-item name="twoPipeType">
<span title="一次类型">二次类型 </span>
<span title="一次类型">二类型：</span>
<a-select ref="select"
placeholder="请选择类型"
v-model:value="queryParam.twoPipeType"
@ -94,13 +94,13 @@
</a-select>
</a-form-item>
</a-col>
<a-col :lg="4">
<a-col :span="3">
<a-form-item name="flag">
<span title="生效">生效 </span>
<span title="生效">生效：</span>
<a-select ref="select"
placeholder="请选择是否生效"
v-model:value="queryParam.flag"
style="width: 150px">
style="width: 100px">
<a-select-option value="">全部</a-select-option>
<a-select-option value="1">是</a-select-option>
<a-select-option value="0">否</a-select-option>
@ -119,7 +119,7 @@
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :dropDownActions="getDropDownAction(record)"/>
<TableAction :actions="getTableAction(record)"/>
</template>
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
@ -255,7 +255,26 @@
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
// function getDropDownAction(record) {
// return [
// {
// label: '编辑',
// onClick: handleEdit.bind(null, record),
// }, {
// label: '删除',
// popConfirm: {
// title: '是否确认删除',
// confirm: handleDelete.bind(null, record),
// placement: 'topLeft',
// },
// }
// ]
// }
/**
* 操作栏
*/
function getTableAction(record){
return [
{
label: '编辑',

3
src/views/heating/extract/components/DataExtractConfigForm.vue
View File

@ -42,6 +42,7 @@
</a-row>
</a-col>
</a-row>
<a-divider style="margin-top: 0px;margin-bottom: 8px;" />
<a-row>
<a-col :span="24">
<a-row>
@ -101,6 +102,7 @@
</a-row>
</a-col>
</a-row>
<a-divider style="margin-top: 0px;margin-bottom: 8px;" />
<a-row>
<a-col :span="24">
<a-row>
@ -160,6 +162,7 @@
</a-row>
</a-col>
</a-row>
<a-divider style="margin-top: 0px;margin-bottom: 8px;" />
<a-row>
<a-col :span="24">
<a-row>

17
src/views/heating/heatanalysis/HeatanalysisList.vue
View File

@ -1,5 +1,5 @@
<template>
<div>
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -44,11 +44,11 @@
<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-button preIcon="ant-design:sync-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
</a-col>
</span>
</a-col>
<a-col :lg="5">
<!-- <a-col :lg="5">
<a-form-item label="一次供水温度">
<a-input placeholder="请输入一次供水温度" v-model:value="queryParam.view005"></a-input>
</a-form-item>
@ -67,7 +67,7 @@
<a-form-item label="二次回水温度">
<a-input placeholder="请输入二次回水温度" v-model:value="queryParam.view010"></a-input>
</a-form-item>
</a-col>
</a-col>-->
</a-row>
</a-form>
</div>
@ -190,7 +190,7 @@ onMounted(() => {
.jeecg-basic-table-form-container {
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
margin-bottom: 8px;
white-space: nowrap;
}
.query-group-cust{
@ -208,4 +208,11 @@ onMounted(() => {
display: none;
}
:deep(.jeecg-basic-table-form-container) {
padding: 0px;
}
:deep(.ant-form-item) {
margin-bottom: 0px;
}
</style>

14
src/views/heating/history/HeatanalysisHistoryList.vue
View File

@ -1,5 +1,5 @@
<template>
<div>
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -41,7 +41,7 @@
<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-button preIcon="ant-design:sync-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
</a-col>
</span>
</a-col>
@ -235,7 +235,7 @@ onMounted(() => {
.jeecg-basic-table-form-container {
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
margin-bottom: 8px;
white-space: nowrap;
}
.query-group-cust{
@ -253,4 +253,12 @@ onMounted(() => {
display: none;
}
:deep(.jeecg-basic-table-form-container) {
padding: 0px;
}
:deep(.ant-form-item) {
margin-bottom: 0px;
}
</style>

2
src/views/heating/mapmanagement/components/MarkinfoForm.vue
View File

@ -145,7 +145,7 @@
});
marker.id = markinfo.stationId;
marker.typeFlag = markinfo.typeFlag;
addMarker(mymap, marker, markinfo.name, markinfo.typeFlag);
addMarker(mymap, marker, markinfo.name, markinfo.description);
}
}

121
src/views/heating/report/HeatanalysisList.vue
View File

@ -1,45 +1,9 @@
<template>
<div>
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :lg="3">
<a-form-item label="类型">
<a-select ref="select"
placeholder="上报类型"
v-model:value="queryParam.reportType"
style="width: 150px">
<a-select-option value="">全部</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="3">
<a-form-item label="已抽取">
<a-select ref="select"
placeholder="是否抽取"
v-model:value="queryParam.isExtract"
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-col :lg="3">
<a-form-item label="被抽取">
<a-select ref="select"
placeholder="是否被抽取"
v-model:value="queryParam.isExtracted"
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-col :lg="4">
<a-form-item label="热力公司">
<a-select ref="select"
@ -76,31 +40,68 @@
</a-select>
</a-form-item>
</a-col>
<a-col :lg="5">
<a-form-item label="一次供水温度">
<a-input placeholder="请输入一次供水温度" v-model:value="queryParam.view005"></a-input>
</a-form-item>
</a-col>
<a-col :lg="5">
<a-form-item label="一次回水温度">
<a-input placeholder="请输入一次回水温度" v-model:value="queryParam.view006"></a-input>
</a-form-item>
</a-col>
<a-col :lg="5">
<a-form-item label="二次供水温度">
<a-input placeholder="请输入二次供水温度" v-model:value="queryParam.view009"></a-input>
</a-form-item>
</a-col>
<a-col :lg="5">
<a-form-item label="二次回水温度">
<a-input placeholder="请输入二次回水温度" v-model:value="queryParam.view010"></a-input>
<a-col :lg="4">
<a-form-item label="上报类型">
<a-select ref="select"
placeholder="上报类型"
v-model:value="queryParam.reportType"
style="width: 150px">
<a-select-option value="">全部</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">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-form-item label="是否抽取">
<a-select ref="select"
placeholder="是否抽取"
v-model:value="queryParam.isExtract"
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-col :lg="4">
<a-form-item label="是否被抽取">
<a-select ref="select"
placeholder="是否被抽取"
v-model:value="queryParam.isExtracted"
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-col :lg="5">-->
<!-- <a-form-item label="一次供水温度">-->
<!-- <a-input placeholder="请输入一次供水温度" v-model:value="queryParam.view005"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :lg="5">-->
<!-- <a-form-item label="一次回水温度">-->
<!-- <a-input placeholder="请输入一次回水温度" v-model:value="queryParam.view006"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :lg="5">-->
<!-- <a-form-item label="二次供水温度">-->
<!-- <a-input placeholder="请输入二次供水温度" v-model:value="queryParam.view009"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :lg="5">-->
<!-- <a-form-item label="二次回水温度">-->
<!-- <a-input placeholder="请输入二次回水温度" v-model:value="queryParam.view010"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :lg="4">
<span style="float: left;margin-bottom: 8px;margin-top: 12px; 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-button preIcon="ant-design:sync-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
</a-col>
</span>
</a-col>
@ -298,6 +299,12 @@ onMounted(() => {
background-color: rgb(227, 192, 32) !important;
}
:deep(.jeecg-basic-table-form-container) {
padding: 0px;
}
:deep(.ant-form-item) {
margin-bottom: 0px;
}
</style>

4
src/views/home/home.vue
View File

@ -7,7 +7,7 @@
<div style="width: 20px;height: 20px;position: absolute;cursor: pointer;" @click="showList"></div>
<div class="index-center-home">
<div class="real-time-line">
<span class="real-time-title">实时数据检测</span>
<span class="real-time-title">实时数据监测</span>
<div style="float:right;margin-right: 50px;">
<a-switch checkedChildren="卡片" unCheckedChildren="列表" v-model:checked="twoShowType" />
</div>
@ -78,7 +78,7 @@
<div class="photoModal" ref="refModal">
<a-modal
v-model:visible="detailVisible"
width="1280px"
width="1600px"
:wrap-style="{ overflow: 'hidden' }"
:destroyOnClose="true"
:footer="null"

10
src/views/screen/components/BarMulti.vue
View File

@ -15,7 +15,15 @@
const myChart = echarts.init(chartRef.value);
let option = {
tooltip : {
trigger: 'axis'
trigger: 'axis',
formatter: function(params) {
// params 是数组（当 trigger: 'axis' 时）
let res = `<div style="font-weight: bold;">${params[0].name}</div>`;
params.forEach(param => {
res += `${param.marker} ${param.seriesName}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${param.value}个<br/>`;
});
return res;
}
},
legend: {
data:legendData.value,

2
src/views/screen/components/HeatanalysisList.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="index-center-home">
<div class="real-time-line">
<span class="real-time-title">实时温度检测</span>
<span class="real-time-title">实时温度监测</span>
</div>
<div>
<table class="tableleft">

10
src/views/screen/components/LineMulti.vue
View File

@ -23,7 +23,15 @@
const myChart = echarts.init(chartRef.value);
let option = {
tooltip : {
trigger: 'axis'
trigger: 'axis',
formatter: function(params) {
// params 是数组（当 trigger: 'axis' 时）
let res = `<div style="font-weight: bold;">${params[0].name}</div>`;
params.forEach(param => {
res += `${param.marker} ${param.seriesName}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${param.value}℃<br/>`;
});
return res;
}
},
color: ['#FFBF00','#37A2FF'],
legend: {

2
src/views/system/loginmini/MiniLogin.vue
View File

@ -6,7 +6,7 @@
</div>
<div class="index-centre">
<div class="index-padd">
<div class="index-name">账号登录</div>
<div class="index-name" style="text-align: center">账号登录</div>
<div class="form-item">
<a-input id="username" :placeholder="t('sys.login.userName')" v-model:value="formData.username" />
</div>

6
src/views/temperature/report/Line.vue
View File

@ -118,7 +118,7 @@
}
//图例类型
let typeArr = Array.from(new Set(props.chartData.map((item) => item.code)));
let typeArr = Array.from(new Set(props.chartData.map((item) => item.houseName)));
//轴数据
let xAxisData = Array.from(new Set(props.chartData.map((item) => item.reportHour+":00")));
console.log(xAxisData);
@ -126,7 +126,7 @@
typeArr.forEach((type) => {
console.log(type);
let obj: any = { name: type,type: 'line', smooth: true };
const findItem: any = props.chartData.find((item: any) => item.code == type);
const findItem: any = props.chartData.find((item: any) => item.houseName == type);
if (findItem && findItem.color) {
obj.color = findItem.color;
}
@ -134,7 +134,7 @@
// update-begin-author:liusq date:2023-7-12 for: [issues/613] LineMulti 在数据不对齐时，横坐标计算错误
let data = [];
xAxisData.forEach((x) => {
let dataArr = props.chartData.filter((item) => type === item.code && item.reportHour+":00" === x);
let dataArr = props.chartData.filter((item) => type === item.houseName && item.reportHour+":00" === x);
if (dataArr && dataArr.length > 0) {
data.push(dataArr[0].roomTemp);
} else {

76
src/views/temperature/report/TemperatureList.vue
View File

@ -21,7 +21,7 @@
<Gauge :chartData="gaugeData"></Gauge>
</a-col>
<a-col :span="24" class="remark">
<div>{{code}}</div>
<div>{{houseName}}</div>
</a-col>
</a-row>
</a-col>
@ -31,7 +31,7 @@
<Gauge2 :chartData="gaugeData2"></Gauge2>
</a-col>
<a-col :span="24" class="remark">
<div>{{code2}}</div>
<div>{{houseName2}}</div>
</a-col>
</a-row>
</a-col>
@ -41,7 +41,7 @@
<Gauge3 :chartData="gaugeData3"></Gauge3>
</a-col>
<a-col :span="24" class="remark">
<div>{{code2}}</div>
<div>{{houseName3}}</div>
</a-col>
</a-row>
</a-col>
@ -51,7 +51,7 @@
<Gauge4 :chartData="gaugeData4"></Gauge4>
</a-col>
<a-col :span="24" class="remark">
<div>{{code2}}</div>
<div>{{houseName4}}</div>
</a-col>
</a-row>
</a-col>
@ -114,6 +114,10 @@ let code = ref('');
let code2 = ref('');
let code3 = ref('');
let code4 = ref('');
let houseName = ref('');
let houseName2 = ref('');
let houseName3 = ref('');
let houseName4 = ref('');
const TimeFun = () => {
setInterval(() => {
@ -130,26 +134,58 @@ const TimeFun = () => {
};
const getTempDataFn = async () => {
const resData = await findOne({"SDate": currentDate.value,"code": "867896071477072"});
gaugeData.value["title"] = "";
gaugeData.value["name"] = resData.code;
gaugeData.value["value"] = resData.roomTemp;
code.value = resData.code;
tempDate.value = resData.roomTemp;
reportTime.value = resData.reportTime;
const resData = await findOne({"SDate": currentDate.value,"code": "861877074735720"});
if(resData!=null){
// gaugeData.value["name"] = resData.code;
gaugeData.value["name"] = resData.houseName;
gaugeData.value["value"] = resData.roomTemp;
tempDate.value = resData.roomTemp;
reportTime.value = resData.reportTime;
code.value = resData.code;
houseName.value = resData.houseName;
}else{
gaugeData.value["name"] = '';
gaugeData.value["value"] = 0;
}
const resData2 = await findOne({"SDate": currentDate.value,"code": "867896075324312"});
gaugeData2.value["name"] = resData2.code;
gaugeData2.value["value"] = resData2.roomTemp;
code2.value = resData2.code;
console.log(resData2);
if(resData2!=null){
// gaugeData2.value["name"] = resData2.code;
gaugeData2.value["name"] = resData2.houseName;
gaugeData2.value["value"] = resData2.roomTemp;
reportTime.value = resData2.reportTime;
code2.value = resData2.code;
houseName2.value = resData2.houseName;
}else{
gaugeData2.value["name"] = '';
gaugeData2.value["value"] = 0;
}
const resData3 = await findOne({"SDate": currentDate.value,"code": "867896075536782"});
gaugeData3.value["name"] = resData3.code;
gaugeData3.value["value"] = resData3.roomTemp;
code3.value = resData3.code;
if(resData3!=null){
// gaugeData3.value["name"] = resData3.code;
gaugeData3.value["name"] = resData3.houseName;
gaugeData3.value["value"] = resData3.roomTemp;
reportTime.value = resData3.reportTime;
code3.value = resData3.code;
houseName3.value = resData3.houseName;
}else{
gaugeData3.value["name"] = '';
gaugeData3.value["value"] = 0;
}
const resData4 = await findOne({"SDate": currentDate.value,"code": "867896075562028"});
gaugeData4.value["name"] = resData4.code;
gaugeData4.value["value"] = resData4.roomTemp;
code4.value = resData4.code;
gaugeData4.value["title"] = "实时温度";
if(resData4!=null){
// gaugeData4.value["name"] = resData4.code;
gaugeData4.value["name"] = resData4.houseName;
gaugeData4.value["value"] = resData4.roomTemp;
reportTime.value = resData4.reportTime;
code4.value = resData4.code;
houseName4.value = resData4.houseName;
gaugeData4.value["title"] = "实时温度";
}else{
gaugeData4.value["name"] = '';
gaugeData4.value["value"] = 0;
}
};
const getTempLineFn = async () => {