Merge branch 'master' of http://192.168.1.22:3000/frontend/admin-sjzx

src/components/table/fieldRender/index.vue

@@ -127,7 +127,7 @@
                             :key="item.text"
                             :command="item"
                             :style="{
-                                color: item.type === 'primary' ? 'var(--el-color-primary)' : 'var(--el-color-danger'
+                                color: item.type === 'primary' ? 'var(--el-color-primary)' : 'var(--el-color-danger)'
                             }"
                         >
                             {{ item.text }}

src/components/table/header/index.vue

@@ -158,10 +158,13 @@ const onResetForm = () => {
 const setDatePicker = (list: any) => {
     datePickerRef.value.setTimeOptions(list)
 }
+const setInterval = (val: any) => {
+    datePickerRef.value.setInterval(val)
+}
 
-defineExpose({ onComSearch, areaRef, setDatePicker ,datePickerRef})
+defineExpose({ onComSearch, areaRef, setDatePicker ,setInterval,datePickerRef})
 </script>
-
+ 
 <style scoped lang="scss">
 .table-header {
     position: relative;