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

bug调整

This commit is contained in:
曹磊 2025-12-05 14:51:14 +08:00
parent 919cfcc867
commit 50ac8eacf5
9 changed files with 198 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,8 +12,8 @@
</a-col> </a-col>
<a-col :span="24" class="left2"> <a-col :span="24" class="left2">
<div class="glfslClass"> <div class="glfslClass">
<span style="margin-left:12px;font-size:12px;"> <span style="margin-left:100px;font-size:12px;">
<span v-for="(item,index) in heatsource" :key="index" :class="`glf-to-right ${glfCount==index?'glfSelect':''}`" @click="handleCheckGlf(item)">{{item.sourceName}};<br v-if="index==1"/></span> <span v-for="(item,index) in heatsource" :key="index" :class="`glf-to-right ${glfCount==index?'glfSelect':''}`" @click="handleCheckGlf(item)">{{item.sourceName}}<br v-if="index==1"/></span>
</span> </span>
</div> </div>
</a-col> </a-col>
@ -197,10 +197,17 @@ function getStaticOne(){
textStyle: { textStyle: {
color: '#fff' color: '#fff'
}, },
formatter: function(params) { formatter: function (params) {
return `时间: ${params[0].name}<br/>水流量: ${params[0].value} m³/h`; return `时间: ${params[0].name}<br/>水流量: ${params[0].value} m³/h`;
} }
} },
grid: {
left: '8%',
right: '4%',
bottom: '3%',
top: '60px',
containLabel: true
},
}, true) }, true)
// -------- 自动轮播 tooltip（每 5 秒） -------- // -------- 自动轮播 tooltip（每 5 秒） --------
@ -789,7 +796,6 @@ function getStaticFive(){
yAxis: { yAxis: {
type: 'value', type: 'value',
min: 0, min: 0,
interval: 5,
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
@ -1207,8 +1213,10 @@ onBeforeUnmount(() => {
.glf-to-right { .glf-to-right {
color: #66b1e1; color: #66b1e1;
cursor:pointer; cursor:pointer;
margin-right: 20px;
} }
.glfSelect{ .glfSelect{
color: #a3d1f0; color: #a3d1f0;
font-size: 16px;
} }
</style> </style>

31
src/views/dashboard/Analysis/index1.vue
View File

@ -12,14 +12,14 @@
</a-col> </a-col>
<a-col :span="24" class="left2"> <a-col :span="24" class="left2">
<div class="glfslClass"> <div class="glfslClass">
<span style="margin-left:36px;font-size:16px;"> <span style="margin-left:160px;font-size:16px;">
<span v-for="(item,index) in heatsource" :key="index" :class="`glf-to-right ${glfCount==index?'glfSelect':''}`" @click="handleCheckGlf(item)">{{item.sourceName}};<br v-if="index==1"/></span> <span v-for="(item,index) in heatsource" :key="index" :class="`glf-to-right ${glfCount==index?'glfSelect':''}`" @click="handleCheckGlf(item)">{{item.sourceName}}<br v-if="index==1"/></span>
</span> </span>
</div> </div>
</a-col> </a-col>
<a-col :span="24" class="left3"> <a-col :span="24" class="left3">
<div class="glfsllClass" style="padding-top:15px;"> <div class="glfsllClass" style="padding-top:15px;">
<span style="margin-left: 7vh;font-size:16px;" class="left-to-right">锅炉房水流量</span> <span style="margin-left: 8vh;font-size:16px;" class="left-to-right">锅炉房水流量</span>
<div class="staticOne"> <div class="staticOne">
</div> </div>
</div> </div>
@ -29,15 +29,15 @@
<a-col :span="10" class="divCenter"> <a-col :span="10" class="divCenter">
<a-row style="margin-top: 8vh;"> <a-row style="margin-top: 8vh;">
<a-col :span="24" class="center1" > <a-col :span="24" class="center1" >
<div class="glfghswdClass" style="padding-top:1.5vh;"> <div class="glfghswdClass" style="padding-top:1.2vh;">
<span style="margin-left: 8vh;font-size:16px;" class="left-to-right">锅炉房供回水温度</span> <span style="margin-left: 9vh;font-size:16px;" class="left-to-right">锅炉房供回水温度</span>
<div class="staticTwo"> <div class="staticTwo">
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="24" class="center2" > <a-col :span="24" class="center2" >
<div class="glfghsylClass" style="padding-top:1.5vh;"> <div class="glfghsylClass" style="padding-top:1.2vh;">
<span style="margin-left: 8vh;font-size:16px;" class="left-to-right">锅炉房供回水压力</span> <span style="margin-left: 9vh;font-size:16px;" class="left-to-right">锅炉房供回水压力</span>
<div class="staticThree"> <div class="staticThree">
</div> </div>
</div> </div>
@ -49,21 +49,21 @@
<a-row> <a-row>
<a-col :span="24" class="right1"> <a-col :span="24" class="right1">
<div class="glfrlClass" style="padding-top:10px;"> <div class="glfrlClass" style="padding-top:10px;">
<span style="margin-left: 7vh;font-size:16px;" class="left-to-right">锅炉房热量</span> <span style="margin-left: 8vh;font-size:16px;" class="left-to-right">锅炉房热量</span>
<div class="staticFour"> <div class="staticFour">
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="24" class="right2"> <a-col :span="24" class="right2">
<div class="glfrlClass" style="padding-top:10px;"> <div class="glfrlClass" style="padding-top:10px;">
<span style="margin-left: 7vh;font-size:16px;" class="left-to-right">锅炉房累积热量</span> <span style="margin-left: 8vh;font-size:16px;" class="left-to-right">锅炉房累积热量</span>
<div class="staticFive"> <div class="staticFive">
</div> </div>
</div> </div>
</a-col> </a-col>
<a-col :span="24" class="right3"> <a-col :span="24" class="right3">
<div class="glfrlClass" style="padding-top:10px;"> <div class="glfrlClass" style="padding-top:10px;">
<span style="margin-left: 7vh;font-size:16px;" class="left-to-right">锅炉房累积水流量</span> <span style="margin-left: 8vh;font-size:16px;" class="left-to-right">锅炉房累积水流量</span>
<div class="staticSix"> <div class="staticSix">
</div> </div>
</div> </div>
@ -200,7 +200,14 @@ function getStaticOne(){
formatter: function(params) { formatter: function(params) {
return `时间: ${params[0].name}<br/>水流量: ${params[0].value} m³/h`; return `时间: ${params[0].name}<br/>水流量: ${params[0].value} m³/h`;
} }
} },
grid: {
left: '8%',
right: '4%',
bottom: '3%',
top: '60px',
containLabel: true
},
}, true) }, true)
// -------- 自动轮播 tooltip（每 5 秒） -------- // -------- 自动轮播 tooltip（每 5 秒） --------
@ -1234,8 +1241,10 @@ onBeforeUnmount(() => {
.glf-to-right { .glf-to-right {
color: #66b1e1; color: #66b1e1;
cursor:pointer; cursor:pointer;
margin-right: 20px;
} }
.glfSelect{ .glfSelect{
color: #a3d1f0; color: #a3d1f0;
font-size: 20px;
} }
</style> </style>

13
src/views/heating/heatanalysis/XzHeatanalysisList.vue
View File

@ -139,6 +139,7 @@ function handleSuccess() {
* 查询 * 查询
*/ */
function searchQuery() { function searchQuery() {
setParam();
reload(); reload();
} }
@ -150,6 +151,7 @@ function searchReset() {
selectedRowKeys.value = []; selectedRowKeys.value = [];
getHeatsource(); getHeatsource();
// getHeatsourcestation(); // getHeatsourcestation();
setParam();
//刷新数据 //刷新数据
reload(); reload();
} }
@ -190,6 +192,12 @@ function getTableAction(record) {
} }
onMounted(async() => { onMounted(async() => {
await getHeatsource(); await getHeatsource();
setParam();
reload();
// getHeatsourcestation();
});
function setParam(){
var sourceId = userInfo.sourceId; var sourceId = userInfo.sourceId;
if(sourceId){ if(sourceId){
if(sourceId.indexOf(',') > -1){ if(sourceId.indexOf(',') > -1){
@ -198,10 +206,7 @@ onMounted(async() => {
queryParam.value.view002 = parseInt(sourceId); queryParam.value.view002 = parseInt(sourceId);
} }
} }
reload(); }
// getHeatsourcestation();
});
</script> </script>

1
src/views/heating/heatanalysis/components/ZxtJX.vue
View File

@ -144,7 +144,6 @@ function initChartsOptions(records: any[]) {
type: 'category', type: 'category',
data: xAxis, data: xAxis,
boundaryGap: false, boundaryGap: false,
axisLabel: { interval: 0, formatter: (v: string) => (v ? v.replace(' ', '\n') : v) },
}, },
yAxis: { type: 'value', scale: true }, yAxis: { type: 'value', scale: true },
}; };

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

@ -109,6 +109,7 @@ function handleSuccess() {
* 查询 * 查询
*/ */
function searchQuery() { function searchQuery() {
setParam();
reload(); reload();
} }
@ -120,6 +121,7 @@ function searchReset() {
selectedRowKeys.value = []; selectedRowKeys.value = [];
getHeatsource(); getHeatsource();
getHeatsourcestation(); getHeatsourcestation();
setParam();
//刷新数据 //刷新数据
reload(); reload();
} }
@ -188,8 +190,6 @@ onMounted(async () => {
getHeatsource(); getHeatsource();
getHeatsourcestation(); getHeatsourcestation();
watch( watch(
() => queryParam.value.SDate, () => queryParam.value.SDate,
async (newVal) => { async (newVal) => {
@ -212,8 +212,13 @@ onMounted(async () => {
{ deep: true, immediate: true } { deep: true, immediate: true }
); );
setParam();
await getHeatsource(); await getHeatsource();
reload();
});
function setParam(){
var sourceId = userInfo.sourceId; var sourceId = userInfo.sourceId;
if(sourceId){ if(sourceId){
if(sourceId.indexOf(',') > -1){ if(sourceId.indexOf(',') > -1){
@ -222,8 +227,7 @@ onMounted(async () => {
queryParam.value.view002 = parseInt(sourceId); queryParam.value.view002 = parseInt(sourceId);
} }
} }
reload(); }
});
</script> </script>

2
src/views/staticList/XzGlfghsListHistory.vue
View File

@ -12,7 +12,7 @@
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="4"> <a-col :span="4">
<a-date-picker v-model:value="queryParam.startDate" value-format="YYYY-MM" :disabledDate="disabledDate" picker="month" placeholder="请选择时间" @change="handleChange" /> <a-date-picker v-model:value="queryParam.startDate" value-format="YYYY-MM" :allowClear="false" :disabledDate="disabledDate" picker="month" placeholder="请选择时间" @change="handleChange" />
</a-col> </a-col>
<a-col :span="24" > <a-col :span="24" >
<div ref="cityChartRef" style="width: 100%; height: 600px;"></div> <div ref="cityChartRef" style="width: 100%; height: 600px;"></div>

2
src/views/staticList/XzGlfrlListHistory.vue
View File

@ -12,7 +12,7 @@
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="4"> <a-col :span="4">
<a-date-picker v-model:value="queryParam.startDate" value-format="YYYY-MM" :disabledDate="disabledDate" picker="month" placeholder="请选择时间" @change="handleChange" /> <a-date-picker v-model:value="queryParam.startDate" value-format="YYYY-MM" :allowClear="false" :disabledDate="disabledDate" picker="month" placeholder="请选择时间" @change="handleChange" />
</a-col> </a-col>
<a-col :span="24" > <a-col :span="24" >
<div ref="cityChartRef" style="width: 100%; height: 600px;"></div> <div ref="cityChartRef" style="width: 100%; height: 600px;"></div>

2
src/views/staticList/XzGlfsllListHistory.vue
View File

@ -12,7 +12,7 @@
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="4"> <a-col :span="4">
<a-date-picker v-model:value="queryParam.startDate" value-format="YYYY-MM" :disabledDate="disabledDate" picker="month" placeholder="请选择时间" @change="handleChange" /> <a-date-picker v-model:value="queryParam.startDate" value-format="YYYY-MM" :allowClear="false" :disabledDate="disabledDate" picker="month" placeholder="请选择时间" @change="handleChange" />
</a-col> </a-col>
<a-col :span="24" > <a-col :span="24" >
<div ref="cityChartRef" style="width: 100%; height: 600px;"></div> <div ref="cityChartRef" style="width: 100%; height: 600px;"></div>

2
src/views/staticList/XzGlfylListHistory.vue
View File

@ -12,7 +12,7 @@
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="4"> <a-col :span="4">
<a-date-picker v-model:value="queryParam.startDate" value-format="YYYY-MM" :disabledDate="disabledDate" picker="month" placeholder="请选择时间" @change="handleChange" /> <a-date-picker v-model:value="queryParam.startDate" value-format="YYYY-MM" :allowClear="false" :disabledDate="disabledDate" picker="month" placeholder="请选择时间" @change="handleChange" />
</a-col> </a-col>
<a-col :span="24" > <a-col :span="24" >
<div ref="cityChartRef" style="width: 100%; height: 600px;"></div> <div ref="cityChartRef" style="width: 100%; height: 600px;"></div>