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

ui/dasadmin/src/components/upload/index.vue

@@ -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: () => {},

ui/dasadmin/src/views/backend/WindBlower/index.vue

@@ -1259,8 +1259,12 @@ 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
+                if (item === 0) {
-                result[divisor] += 1
+                    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

ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue

@@ -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>