diff --git a/src/views/ems/dzjk/sbjk/PointChart.vue b/src/views/ems/dzjk/sbjk/PointChart.vue
index 383565b..9ed023c 100644
--- a/src/views/ems/dzjk/sbjk/PointChart.vue
+++ b/src/views/ems/dzjk/sbjk/PointChart.vue
@@ -174,6 +174,48 @@ export default {
: `${inner.deviceId}`
}`,
type: "line",
+ markPoint: {
+ symbolSize: 30,
+ emphasis: {
+ disabled:false//打开 鼠标高亮
+ },
+ data: [//最大值、最小值
+ {
+ // type: 'max',
+ name: `最大值`,
+ coord:[inner.maxDate,inner.maxValue],
+ relativeTo:'coordinate',
+ label: {
+ position: "top",
+ formatter: item.dataType === 2 ? ([
+ `最大值:${inner.maxValue}`,
+ // `平均值:${inner.avgValue}`,
+ `差值:${inner.diffValue}`,
+ ]).join('\n') : ([
+ `最大值:${inner.maxValue}`,
+ // `平均值:${inner.avgValue}`,
+ ]).join('\n'),
+ },
+ },
+ {
+ // type: 'min',
+ name: `最小值`,
+ coord:[inner.minDate,inner.minValue],
+ relativeTo:'coordinate',
+ label: {
+ position: "top",
+ formatter: item.dataType === 2 ? ([
+ `最小值:${inner.minValue}`,
+ // `平均值:${inner.avgValue}`,
+ `差值:${inner.diffValue}`,
+ ]).join('\n') : ([
+ `最小值:${inner.minValue}`,
+ // `平均值:${inner.avgValue}`,
+ ]).join('\n'),
+ }
+ }
+ ]
+ },
xdata: [],
data: [],
});
@@ -200,7 +242,7 @@ export default {
trigger: "axis",
axisPointer: {
// 坐标轴指示器,坐标轴触发有效
- type: "shadow", // 默认为直线,可选为:'line' | 'shadow'
+ type: "cross", // 默认为直线,可选为:'line' | 'shadow'
},
},
textStyle: {
diff --git a/src/views/ems/site/powerTariff/index.vue b/src/views/ems/site/powerTariff/index.vue
index 89710d2..609c21e 100644
--- a/src/views/ems/site/powerTariff/index.vue
+++ b/src/views/ems/site/powerTariff/index.vue
@@ -105,8 +105,9 @@ export default {
//获取站点列表
getZdList(){
this.searchLoading=true
- getAllSites().then(response => {
+ return getAllSites().then(response => {
this.siteList = response?.data || []
+ if( this.siteList.length>0 ) this.siteId = this.siteList[0].siteId
}).finally(() => {this.searchLoading=false})
},
changeDefaultYear(){
@@ -114,7 +115,6 @@ export default {
},
getData(reset=false){
reset && this.resetTableData()
- console.log('湖区====',reset,this.tableData.length,this.tableTotal,this.pageNum);
if(!reset && this.tableData.length>=this.tableTotal) return
this.loading=true;
const date = new Date(this.defaultYear).getFullYear()
@@ -163,8 +163,10 @@ export default {
},
mounted() {
this.defaultYear = new Date()
- this.getZdList()
- this.getData(true)
+ this.loading=true
+ this.getZdList().then(()=>{
+ this.getData(true)
+ })
}
}
diff --git a/src/views/ems/site/sblb/index.vue b/src/views/ems/site/sblb/index.vue
index e0f25a9..284e1da 100644
--- a/src/views/ems/site/sblb/index.vue
+++ b/src/views/ems/site/sblb/index.vue
@@ -37,12 +37,12 @@
label="设备名称">
+ prop="categoryName"
+ label="设备类别">
+ label="在线状态">
{{$store.state.ems.communicationStatusOptions[scope.row.communicationStatus]}}
@@ -251,14 +251,19 @@ export default {
//获取站点列表
getZdList(){
this.searchLoading=true
- getAllSites().then(response => {
+ return getAllSites().then(response => {
this.siteList = response?.data || []
+ if(this.siteList.length>0) this.siteId = this.siteList[0].siteId
}).finally(() => {this.searchLoading=false})
}
},
mounted() {
- this.onReset()
- this.getZdList()
+ this.loading=true
+ this.siteId=''
+ this.pageNum =1//每次搜索从1开始搜索
+ this.getZdList().then(()=>{
+ this.getData()
+ })
}
}
diff --git a/src/views/login.vue b/src/views/login.vue
index 6f65055..e3d79fe 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -85,7 +85,7 @@
@@ -265,6 +265,7 @@ export default {
}
}
.el-login-footer {
+ z-index:2;
height: 40px;
line-height: 40px;
position: fixed;
diff --git a/src/views/register.vue b/src/views/register.vue
index 8e0d3a1..f96446c 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -95,7 +95,7 @@
@@ -276,6 +276,7 @@ export default {
}
}
.el-register-footer {
+ z-index:2;
height: 40px;
line-height: 40px;
position: fixed;