26 Commits

Author SHA1 Message Date
505139cfe2 Merge branch 'dev-report' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-10-10 22:44:57 +08:00
6246d46d53 Merge branch 'dev-report' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-10-09 22:23:47 +08:00
98a5d374a4 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-09-28 18:00:22 +08:00
dd049320f6 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-09-23 21:45:29 +08:00
696e96a0c0 Merge remote-tracking branch 'origin/main' into dev-cl 2024-09-22 16:08:37 +08:00
ee770b9e60 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-09-18 23:08:40 +08:00
6908183a36 Merge branch 'dev-cjl' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-09-11 23:01:08 +08:00
af9bcb7024 Merge branch 'dev-cjl' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-09-08 14:26:43 +08:00
5c6c3df4d0 Merge branch 'dev-cjl' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-09-05 22:31:59 +08:00
acdcc670de Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-09-05 22:31:44 +08:00
9472c5ea56 Merge branch 'dev-cjl' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-29 22:20:26 +08:00
4f150b0912 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-28 22:04:46 +08:00
f76d6dce66 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-27 23:04:20 +08:00
dd4bdb0786 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-26 22:00:11 +08:00
477a279867 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-23 22:26:44 +08:00
c87637cc78 Merge branch 'dev-cjl' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-20 23:52:46 +08:00
a544840679 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-16 12:47:36 +08:00
247c6ed4a0 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-13 21:43:40 +08:00
769c901954 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-10 13:21:15 +08:00
18bfc7d353 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-06 22:05:52 +08:00
fb6b341242 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-06 19:27:40 +08:00
fea69da8ed Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-04 14:15:30 +08:00
125f6f28ad Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-02 21:02:44 +08:00
39cddaa8e0 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-07-31 21:11:55 +08:00
ffd15e2433 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-07-30 21:32:07 +08:00
2bebd0480e 本地启动 2024-07-13 11:30:36 +08:00
3 changed files with 3 additions and 7 deletions

View File

@@ -4,7 +4,7 @@ VITE_NODE_ENV=development
VITE_DEV=true VITE_DEV=true
# 请求路径 # 请求路径
VITE_BASE_URL='http://118.31.23.45:48080' VITE_BASE_URL='http://localhost:48080'
# VITE_BASE_URL='http://114.55.169.15:48080' # VITE_BASE_URL='http://114.55.169.15:48080'
# 上传路径 # 上传路径

View File

@@ -47,7 +47,7 @@ const props = defineProps({
// fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg'] // fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: propTypes.array.def([]), fileType: propTypes.array.def([]),
accept: propTypes.string.def('*'), accept: propTypes.string.def('*'),
fileSize: propTypes.number.def(100), // 大小限制(MB) fileSize: propTypes.number.def(5), // 大小限制(MB)
limit: propTypes.number.def(5), // 数量限制 limit: propTypes.number.def(5), // 数量限制
autoUpload: propTypes.bool.def(true), // 自动上传 autoUpload: propTypes.bool.def(true), // 自动上传
drag: propTypes.bool.def(false), // 拖拽上传 drag: propTypes.bool.def(false), // 拖拽上传

View File

@@ -64,7 +64,6 @@
<script setup name="ChannelPeriod"> <script setup name="ChannelPeriod">
import { getPeriodList } from '@/api/home/reportChannel' import { getPeriodList } from '@/api/home/reportChannel'
import { removeNullField } from '@/utils' import { removeNullField } from '@/utils'
import { formatDate } from '@/utils/formatTime'
const props = defineProps({ const props = defineProps({
sourceOptions: { sourceOptions: {
@@ -90,18 +89,15 @@ const searchRules = {
onMounted(() => { onMounted(() => {
getOptions() getOptions()
handleReset() handleReset()
handleSearch()
}) })
const searchForm = ref({}) const searchForm = ref({})
function handleReset() { function handleReset() {
const date = new Date()
date.setDate(1)
searchForm.value = { searchForm.value = {
sourceId: undefined, sourceId: undefined,
periodNumber: 30, periodNumber: 30,
consultDate: [formatDate(date), formatDate(new Date())] consultDate: []
} }
} }