diff --git a/ui/dasadmin/src/views/backend/WindBlower/index.vue b/ui/dasadmin/src/views/backend/WindBlower/index.vue
index 9f3ae1be..d7e998bd 100644
--- a/ui/dasadmin/src/views/backend/WindBlower/index.vue
+++ b/ui/dasadmin/src/views/backend/WindBlower/index.vue
@@ -209,7 +209,7 @@
{{ realTimeDataForSingle.monthprodenergy }}
- 万kWh
+ kWh
月发电量
@@ -221,7 +221,7 @@
{{ realTimeDataForSingle.yearprodenergy }}
- 万kWh
+ kWh
年发电量
@@ -233,7 +233,7 @@
{{ realTimeDataForSingle.ikwhoverall }}
- 万kWh
+ kWh
总发电量
diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
index ef5185a2..af2d389c 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
@@ -69,7 +69,7 @@
- 查询
+ 查询
@@ -301,6 +301,7 @@ watch(
}
)
+const loading = ref(false)
const searchFormRef = ref()
const lineChartVisible = ref(false)
const searchInfo = reactive({
@@ -337,6 +338,7 @@ const shortcuts = [
const getChartData = () => {
searchFormRef.value?.validate((valid) => {
if (valid) {
+ loading.value = true
getRealValueRangeReq({
startTime: dayjs(seachOptions.datePickerValue[0]).valueOf(),
endTime: dayjs(seachOptions.datePickerValue[1]).valueOf(),
@@ -482,6 +484,7 @@ const initChart = (data: { values: number[]; times: number[] }) => {
],
}
chartInstance.setOption(option)
+ loading.value = false
}
const closeLineChart = () => {
diff --git a/ui/dasadmin/src/views/backend/logRecord/index.vue b/ui/dasadmin/src/views/backend/logRecord/index.vue
index 5fc6e2ce..8a1430cf 100644
--- a/ui/dasadmin/src/views/backend/logRecord/index.vue
+++ b/ui/dasadmin/src/views/backend/logRecord/index.vue
@@ -48,7 +48,7 @@
-
+
@@ -56,8 +56,8 @@
- 查看
- 下载
+ 查看
+ 下载
@@ -66,10 +66,10 @@