sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.jsspisoft.com/ry-das

Browse Source
This commit is contained in:
zhouhuang 2024-12-30 21:11:55 +08:00
commit d4588264fc
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/dasadmin/src/components/upload/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="uploadContainer" @click="upload">
<slot></slot>
<input ref="uploadRef" type="file" style="display: none" :multiple="props.multiple" @change="change" />
<input ref="uploadRef" type="file" style="display: none" :multiple="props.multiple" @change="change" :accept="props.accept"/>
</div>
</template>
@ -12,6 +12,10 @@ const props = defineProps({
type: Boolean,
default: false,
},
accept:{
type: String,
default: '*/*',
},
onChange: {
type: Function,
default: () => {},

10
ui/dasadmin/src/views/backend/WindBlower/index.vue
View File

@ -1259,9 +1259,13 @@ const getThisDayChartDataForMinute = () => {
const result: number[] = new Array(16).fill(0)
val.iWindDirection.forEach((item: number) => {
item = item < 0 ? 360 + item : item > 360 ? 360 : item
const divisor = Math.ceil(item / 22.5) - 1
result[divisor] += 1
})
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)

2
ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
View File

@ -626,7 +626,7 @@
<el-dialog v-model="attachmentDialogVisible" :title="attachmentDialogTitle" :width="800" :close-on-click-modal="false">
<div class="attachmentContainer">
<div class="header">
<CustomUpload multiple :onChange="uploadAttachment" ref="customUploadRef">
<CustomUpload multiple :onChange="uploadAttachment" ref="customUploadRef" accept="image/*">
<el-button type="primary" :loading="uploadAttachmentLoading">添加附件</el-button>
</CustomUpload>
</div>