diff --git a/smart-admin-web/javascript-ant-design-vue3/src/main.js b/smart-admin-web/javascript-ant-design-vue3/src/main.js index 5f0fcfbf..1f861e4c 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/main.js +++ b/smart-admin-web/javascript-ant-design-vue3/src/main.js @@ -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 ※ -------------------- */ /** diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-list.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-list.vue index f43b1b73..e3c73ac0 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-list.vue +++ b/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/enterprise/enterprise-list.vue @@ -16,7 +16,7 @@ - + @@ -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'; diff --git a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-list.vue b/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-list.vue index 6b3ddb3c..e9ba8d5d 100644 --- a/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-list.vue +++ b/smart-admin-web/javascript-ant-design-vue3/src/views/business/oa/notice/notice-list.vue @@ -36,11 +36,11 @@ - + - + @@ -73,8 +73,8 @@
- -
+ + - + @@ -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({