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

View File

@ -12,8 +12,8 @@
</a-col>
<a-col :span="24" class="left2">
<div class="glfslClass">
<span style="margin-left:12px;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 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>
</div>
</a-col>
@ -123,84 +123,91 @@ function getStaticOne(){
const staticParam = document.querySelector('.staticOne') as HTMLElement;
chartOne = echarts.init(staticParam);
chartOne.setOption({
xAxis: {
type: 'category',
data: names,
axisLine: {
lineStyle: {
color: 'rgba(255, 255, 255, 0.6)'
xAxis: {
type: 'category',
data: names,
axisLine: {
lineStyle: {
color: 'rgba(255, 255, 255, 0.6)'
}
},
axisLabel: {
color: 'rgba(255, 255, 255, 0.8)',
fontSize: 12,
// interval: 0
},
axisTick: {
show: false
}
},
axisLabel: {
color: 'rgba(255, 255, 255, 0.8)',
fontSize: 12,
// interval: 0
},
axisTick: {
show: false
}
},
yAxis: {
type: 'value',
name: '(m³/h)',
nameTextStyle: {
color: 'rgba(255, 255, 255, 0.7)',
fontSize: 12,
padding: [0, 0, 0, 10]
},
min: 0,
interval: 100,
axisLine: {
show: true,
lineStyle: {
color: 'rgba(255, 255, 255, 0.6)'
yAxis: {
type: 'value',
name: '(m³/h)',
nameTextStyle: {
color: 'rgba(255, 255, 255, 0.7)',
fontSize: 12,
padding: [0, 0, 0, 10]
},
min: 0,
interval: 100,
axisLine: {
show: true,
lineStyle: {
color: 'rgba(255, 255, 255, 0.6)'
}
},
axisLabel: {
color: 'rgba(255, 255, 255, 0.8)',
fontSize: 12,
formatter: function(value) {
return value;
}
},
splitLine: {
lineStyle: {
color: 'rgba(255, 255, 255, 0.1)',
type: 'dashed'
}
}
},
axisLabel: {
color: 'rgba(255, 255, 255, 0.8)',
fontSize: 12,
formatter: function(value) {
return value;
series: [{
name: '水流量',
type: 'bar',
data: dataSource,
barWidth: '25%',
itemStyle: {
borderRadius: [4, 4, 0, 0],
opacity: 0.8
},
// label: {
// show: true,
// position: 'top',
// color: '#fff',
// fontSize: 12,
// fontWeight: 'bold',
// formatter: function(params) {
// return params.value;
// }
// }
}],
tooltip: {
trigger: 'axis',
backgroundColor: 'rgba(0, 0, 0, 0.7)',
borderColor: 'rgba(255, 255, 255, 0.4)',
textStyle: {
color: '#fff'
},
formatter: function (params) {
return `时间: ${params[0].name}<br/>水流量: ${params[0].value} m³/h`;
}
},
splitLine: {
lineStyle: {
color: 'rgba(255, 255, 255, 0.1)',
type: 'dashed'
}
}
},
series: [{
name: '水流量',
type: 'bar',
data: dataSource,
barWidth: '25%',
itemStyle: {
borderRadius: [4, 4, 0, 0],
opacity: 0.8
grid: {
left: '8%',
right: '4%',
bottom: '3%',
top: '60px',
containLabel: true
},
// label: {
// show: true,
// position: 'top',
// color: '#fff',
// fontSize: 12,
// fontWeight: 'bold',
// formatter: function(params) {
// return params.value;
// }
// }
}],
tooltip: {
trigger: 'axis',
backgroundColor: 'rgba(0, 0, 0, 0.7)',
borderColor: 'rgba(255, 255, 255, 0.4)',
textStyle: {
color: '#fff'
},
formatter: function(params) {
return `时间: ${params[0].name}<br/>水流量: ${params[0].value} m³/h`;
}
}
}, true)
// -------- tooltip 5 --------
@ -789,7 +796,6 @@ function getStaticFive(){
yAxis: {
type: 'value',
min: 0,
interval: 5,
axisLine: {
show: true,
lineStyle: {
@ -1207,8 +1213,10 @@ onBeforeUnmount(() => {
.glf-to-right {
color: #66b1e1;
cursor:pointer;
margin-right: 20px;
}
.glfSelect{
color: #a3d1f0;
font-size: 16px;
}
</style>

View File

@ -12,14 +12,14 @@
</a-col>
<a-col :span="24" class="left2">
<div class="glfslClass">
<span style="margin-left:36px;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 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>
</div>
</a-col>
<a-col :span="24" class="left3">
<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>
</div>
@ -29,15 +29,15 @@
<a-col :span="10" class="divCenter">
<a-row style="margin-top: 8vh;">
<a-col :span="24" class="center1" >
<div class="glfghswdClass" style="padding-top:1.5vh;">
<span style="margin-left: 8vh;font-size:16px;" class="left-to-right">锅炉房供回水温度</span>
<div class="glfghswdClass" style="padding-top:1.2vh;">
<span style="margin-left: 9vh;font-size:16px;" class="left-to-right">锅炉房供回水温度</span>
<div class="staticTwo">
</div>
</div>
</a-col>
<a-col :span="24" class="center2" >
<div class="glfghsylClass" style="padding-top:1.5vh;">
<span style="margin-left: 8vh;font-size:16px;" class="left-to-right">锅炉房供回水压力</span>
<div class="glfghsylClass" style="padding-top:1.2vh;">
<span style="margin-left: 9vh;font-size:16px;" class="left-to-right">锅炉房供回水压力</span>
<div class="staticThree">
</div>
</div>
@ -49,21 +49,21 @@
<a-row>
<a-col :span="24" class="right1">
<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>
</div>
</a-col>
<a-col :span="24" class="right2">
<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>
</div>
</a-col>
<a-col :span="24" class="right3">
<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>
</div>
@ -123,84 +123,91 @@ function getStaticOne(){
const staticParam = document.querySelector('.staticOne') as HTMLElement;
chartOne = echarts.init(staticParam);
chartOne.setOption({
xAxis: {
type: 'category',
data: names,
axisLine: {
lineStyle: {
color: 'rgba(255, 255, 255, 0.6)'
xAxis: {
type: 'category',
data: names,
axisLine: {
lineStyle: {
color: 'rgba(255, 255, 255, 0.6)'
}
},
axisLabel: {
color: 'rgba(255, 255, 255, 0.8)',
fontSize: 12,
// interval: 0
},
axisTick: {
show: false
}
},
axisLabel: {
color: 'rgba(255, 255, 255, 0.8)',
fontSize: 12,
// interval: 0
},
axisTick: {
show: false
}
},
yAxis: {
type: 'value',
name: '(m³/h)',
nameTextStyle: {
color: 'rgba(255, 255, 255, 0.7)',
fontSize: 12,
padding: [0, 0, 0, 10]
},
min: 0,
interval: 100,
axisLine: {
show: true,
lineStyle: {
color: 'rgba(255, 255, 255, 0.6)'
yAxis: {
type: 'value',
name: '(m³/h)',
nameTextStyle: {
color: 'rgba(255, 255, 255, 0.7)',
fontSize: 12,
padding: [0, 0, 0, 10]
},
min: 0,
interval: 100,
axisLine: {
show: true,
lineStyle: {
color: 'rgba(255, 255, 255, 0.6)'
}
},
axisLabel: {
color: 'rgba(255, 255, 255, 0.8)',
fontSize: 12,
formatter: function(value) {
return value;
}
},
splitLine: {
lineStyle: {
color: 'rgba(255, 255, 255, 0.1)',
type: 'dashed'
}
}
},
axisLabel: {
color: 'rgba(255, 255, 255, 0.8)',
fontSize: 12,
formatter: function(value) {
return value;
series: [{
name: '水流量',
type: 'bar',
data: dataSource,
barWidth: '25%',
itemStyle: {
borderRadius: [4, 4, 0, 0],
opacity: 0.8
},
// label: {
// show: true,
// position: 'top',
// color: '#fff',
// fontSize: 12,
// fontWeight: 'bold',
// formatter: function(params) {
// return params.value;
// }
// }
}],
tooltip: {
trigger: 'axis',
backgroundColor: 'rgba(0, 0, 0, 0.7)',
borderColor: 'rgba(255, 255, 255, 0.4)',
textStyle: {
color: '#fff'
},
formatter: function(params) {
return `时间: ${params[0].name}<br/>水流量: ${params[0].value} m³/h`;
}
},
splitLine: {
lineStyle: {
color: 'rgba(255, 255, 255, 0.1)',
type: 'dashed'
}
}
},
series: [{
name: '水流量',
type: 'bar',
data: dataSource,
barWidth: '25%',
itemStyle: {
borderRadius: [4, 4, 0, 0],
opacity: 0.8
grid: {
left: '8%',
right: '4%',
bottom: '3%',
top: '60px',
containLabel: true
},
// label: {
// show: true,
// position: 'top',
// color: '#fff',
// fontSize: 12,
// fontWeight: 'bold',
// formatter: function(params) {
// return params.value;
// }
// }
}],
tooltip: {
trigger: 'axis',
backgroundColor: 'rgba(0, 0, 0, 0.7)',
borderColor: 'rgba(255, 255, 255, 0.4)',
textStyle: {
color: '#fff'
},
formatter: function(params) {
return `时间: ${params[0].name}<br/>水流量: ${params[0].value} m³/h`;
}
}
}, true)
// -------- tooltip 5 --------
@ -1234,8 +1241,10 @@ onBeforeUnmount(() => {
.glf-to-right {
color: #66b1e1;
cursor:pointer;
margin-right: 20px;
}
.glfSelect{
color: #a3d1f0;
font-size: 20px;
}
</style>

View File

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

View File

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

View File

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

View File

@ -12,7 +12,7 @@
</a-select>
</a-col>
<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 :span="24" >
<div ref="cityChartRef" style="width: 100%; height: 600px;"></div>

View File

@ -12,7 +12,7 @@
</a-select>
</a-col>
<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 :span="24" >
<div ref="cityChartRef" style="width: 100%; height: 600px;"></div>
@ -34,7 +34,7 @@ const { userInfo } = useUserStore();
const disabledDate = (current) => {
const minDate = dayjs('2025-09-01', 'YYYY-MM-DD'); //
const currentMonth = dayjs().startOf('month'); // 2025-09-01
// 2025-08
return (
current.isBefore(minDate, 'month') || // 2025-08

View File

@ -12,7 +12,7 @@
</a-select>
</a-col>
<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 :span="24" >
<div ref="cityChartRef" style="width: 100%; height: 600px;"></div>
@ -40,7 +40,7 @@ const queryParam = ref<any>({sourceId: userInfo.sourceId});
const disabledDate = (current) => {
const minDate = dayjs('2025-09-01', 'YYYY-MM-DD'); //
const currentMonth = dayjs().startOf('month'); // 2025-09-01
// 2025-08
return (
current.isBefore(minDate, 'month') || // 2025-08

View File

@ -12,7 +12,7 @@
</a-select>
</a-col>
<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 :span="24" >
<div ref="cityChartRef" style="width: 100%; height: 600px;"></div>
@ -34,7 +34,7 @@ const { userInfo } = useUserStore();
const disabledDate = (current) => {
const minDate = dayjs('2025-09-01', 'YYYY-MM-DD'); //
const currentMonth = dayjs().startOf('month'); // 2025-09-01
// 2025-08
return (
current.isBefore(minDate, 'month') || // 2025-08