xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-09-17 19:06:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

时间范围选择增加默认选项

Browse Source
This commit is contained in:
zhuoda 2022-11-06 22:09:46 +08:00
parent cd10a2d1b8
commit b811d79b34
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
smart-admin-web/javascript-ant-design-vue3/src/main.js
View File

@ -29,15 +29,16 @@ import { getTokenFromCookie } from '/@/utils/cookie-util';
/*
* -------------------- ※ 着重 解释说明下这里的初始化逻辑 begin ※ --------------------
* -------------------- ※ 着重 解释说明下main.js的初始化逻辑 begin ※ --------------------
*
* 1、很多框架都是 直接调用vue方法，创建vue实例，然后挂载路由router、状态管理store等等，但是关于router这块是有问题的；
* 2、现在大部分路由都是从后台返回的，直接挂载，这个时候前端是没有从后端请求到所有路由的，所以只能写到路由拦截器里，这也很绕很不清晰；
* 比如做法流程应该是：
* 1、在main.js里很多框架都是 直接调用初始化的vue方法，创建vue实例，然后挂载路由router、状态管理store等等，但是关于router这块是有问题的；
* 2、因为现在大部分路由都是从后端接口返回的，如若直接初始化挂载路由，这时前端还没有从后端请求路由的数据，所以只能写到路由拦截器里，这样很绕很不清晰；
* 正确的做法流程应该是：
* 2.1）如果存在登录信息，则先ajax请求用户的所有路由，然后加载，再去创建vue实例和挂载路由
* 2.2）如果不存在路由信息，则创建vue实例和挂载路由（此时的路由应该只有login页面，因为用户拥有哪些路由是登录之后才知道的）
*
* -------------------- ※ 着重 解释说明下这里的初始化逻辑 end ※ --------------------
* 3、以上，在main.js里两个方法，一个是 获取登录信息getLoginInfo，另一个初始化vue: initVue，在最下的if操作里
*
* -------------------- ※ 着重 解释说明下main.js的初始化逻辑 end ※ --------------------
*/
/**

3
smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-list.vue
View File

@ -16,7 +16,7 @@
<a-form-item label="创建时间" class="smart-query-form-item">
<a-space direction="vertical" :size="12">
<a-range-picker v-model:value="searchDate" @change="dateChange" />
<a-range-picker v-model:value="searchDate" :ranges="defaultTimeRanges" @change="dateChange" />
</a-space>
</a-form-item>
@ -108,6 +108,7 @@
import { useRouter } from 'vue-router';
import EnterpriseOperate from './components/enterprise-operate-modal.vue';
import { smartSentry } from '/@/lib/smart-sentry';
import { defaultTimeRanges } from '/@/lib/default-time-ranges';
import TableOperator from '/@/components/support/table-operator/index.vue';
import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';

10
smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-list.vue
View File

@ -36,11 +36,11 @@
</a-form-item>
<a-form-item label="发布时间" class="smart-query-form-item">
<a-range-picker v-model:value="publishDate" @change="publishDateChange" style="width: 220px" />
<a-range-picker v-model:value="publishDate" :ranges="defaultTimeRanges" @change="publishDateChange" style="width: 220px" />
</a-form-item>
<a-form-item label="创建时间" class="smart-query-form-item">
<a-range-picker v-model:value="createDate" @change="createDateChange" style="width: 220px" />
<a-range-picker v-model:value="createDate" :ranges="defaultTimeRanges" @change="createDateChange" style="width: 220px" />
</a-form-item>
<a-form-item class="smart-query-form-item smart-margin-left10">
@ -73,8 +73,8 @@
</a-button>
</div>
<div class="smart-table-setting-block">
<TableOperator v-model="tableColumns" :tableId="TABLE_ID_CONST.BUSINESS.OA.NOTICE" :refresh="queryNoticeList" />
</div>
<TableOperator v-model="tableColumns" :tableId="TABLE_ID_CONST.BUSINESS.OA.NOTICE" :refresh="queryNoticeList" />
</div>
</a-row>
<a-table
@ -136,10 +136,10 @@
import SmartBooleanSelect from '/@/components/framework/boolean-select/index.vue';
import { noticeApi } from '/@/api/business/oa/notice-api';
import NoticeFormDrawer from './components/notice-form-drawer.vue';
import { defaultTimeRanges } from '/@/lib/default-time-ranges';
import { smartSentry } from '/@/lib/smart-sentry';
import TableOperator from '/@/components/support/table-operator/index.vue';
import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
const queryFormState = {
noticeTypeId: undefined, //分类

3
smart-admin-web/javascript-ant-design-vue3/src/views/support/help-doc/management/components/help-doc-list.vue
View File

@ -15,7 +15,7 @@
</a-form-item>
<a-form-item label="创建时间" class="smart-query-form-item">
<a-range-picker v-model:value="createDate" @change="createDateChange" style="width: 220px" />
<a-range-picker :ranges="defaultTimeRanges" v-model:value="createDate" @change="createDateChange" style="width: 220px" />
</a-form-item>
<a-form-item class="smart-query-form-item smart-margin-left10">
@ -105,6 +105,7 @@
import { PAGE_SIZE, PAGE_SIZE_OPTIONS } from '/@/constants/common-const';
import { smartSentry } from '/@/lib/smart-sentry';
import TableOperator from '/@/components/support/table-operator/index.vue';
import { defaultTimeRanges } from '/@/lib/default-time-ranges';
import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
const props = defineProps({