diff --git a/ui/dasadmin/src/views/backend/WindBlower/index.vue b/ui/dasadmin/src/views/backend/WindBlower/index.vue
index 0aafa8c0..fd7af3ab 100644
--- a/ui/dasadmin/src/views/backend/WindBlower/index.vue
+++ b/ui/dasadmin/src/views/backend/WindBlower/index.vue
@@ -1258,14 +1258,16 @@ const getThisDayChartDataForMinute = () => {
const len = val.iWindDirection.length
const result: number[] = new Array(16).fill(0)
val.iWindDirection.forEach((item: number) => {
- item = item < 0 ? 360 + item : item > 360 ? 360 : item
- if (item === 0) {
- result[0] += 1
- } else {
- const divisor = Math.ceil(item / 22.5) - 1
- result[divisor] += 1
+ if (typeof item === 'number') {
+ item = item < 0 ? 360 + item : item > 360 ? 360 : item
+ if (item === 0) {
+ result[0] += 1
+ } else {
+ const divisor = Math.ceil(item / 22.5) - 1
+ result[divisor] += 1
+ }
}
- })
+ })
const percent = result.map((item) => Math.floor((item / len) * 100000) / 1000)
frequencyData.value = percent
resolve(true)
diff --git a/ui/dasadmin/src/views/backend/logConfiguration/index.vue b/ui/dasadmin/src/views/backend/logConfiguration/index.vue
index e912d57c..b51eaa61 100644
--- a/ui/dasadmin/src/views/backend/logConfiguration/index.vue
+++ b/ui/dasadmin/src/views/backend/logConfiguration/index.vue
@@ -6,7 +6,7 @@
-
+
@@ -25,9 +25,10 @@
-
保存
-
取消
-
编辑
+
+ 保存
+ 取消
+
删除
@@ -41,10 +42,10 @@
-
+
-
+
@@ -105,16 +106,17 @@ const submitlogForm = (data: { loggerName: string; level: string } | null) => {
const closeLogForm = () => {
logDialogVisible.value = false
}
-const originLevel = ref('')
+const beforeRowData = ref<{ loggerName: string; level: string; hasEdit: boolean }>()
const editLevel = (data: { loggerName: string; level: string; hasEdit: boolean }) => {
- originLevel.value = data.level
+ beforeRowData.value && (beforeRowData.value.hasEdit = false)
+ beforeRowData.value = data
data.hasEdit = true
}
const submitLevel = (data: { loggerName: string; level: string; hasEdit: boolean }) => {
submitlogForm({ loggerName: data.loggerName, level: data.level })
}
const cancelLevel = (data: { loggerName: string; level: string; hasEdit: boolean }) => {
- data.level = originLevel.value
+ data.level = beforeRowData.value!.level
data.hasEdit = false
}
const addLogConfiguration = () => {
@@ -151,8 +153,9 @@ const getLogList = () => {
hasEdit: false,
}
})
- tableData.value = data
+ // tableData.value = data
originTableData = data
+ change()
}
})
}
@@ -186,14 +189,14 @@ getLogList()
width: 100%;
height: 100%;
.el-select {
- width: 200px;
+ width: 100px;
}
&:deep(.el-select__wrapper) {
- width: 200x;
+ width: 100x;
}
.logTableOperate {
display: flex;
- justify-content: right;
+ justify-content: center;
width: 100%;
.el-button {
margin-left: 0;