hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-10 19:36:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into manage-release

Browse Source
This commit is contained in:
yuping
2022-12-26 09:10:33 +08:00
parent a03ce1727a bec602b007
commit 450ab28b65
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -44,7 +44,7 @@ export default defineComponent({
const store = useStore(); const store = useStore();
const isLogin = ref(false); const isLogin = ref(false);
// console.log("router", router.getRoutes(), route); // console.log("router", router.getRoutes(), route);
console.log("版本1.05------------"); console.log("版本1.06------------");
const routes = computed(() => { const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink); return router.getRoutes().filter((e) => e.meta?.isLink);
}); });

1
src/components/student/CommonStudent.vue
View File

@@ -654,6 +654,7 @@ const deleteDepSelect = () => {
//重置受众 //重置受众
const resetAudienceInfo = () => { const resetAudienceInfo = () => {
audienceName.value = { keyword: "", page: 1, pageSize: 10 }; audienceName.value = { keyword: "", page: 1, pageSize: 10 };
searchStu();
}; };
//全部清除 //全部清除
// const deleteAll = () => { // const deleteAll = () => {

5
src/views/projectcenter/ProjectManage.vue
View File

@@ -45,6 +45,7 @@
</div> </div>
<div class="select addTimeBox"> <div class="select addTimeBox">
<div class="addTime">创建时间：</div> <div class="addTime">创建时间：</div>
<!--
<a-range-picker <a-range-picker
:show-time="{ format: 'HH:mm' }" :show-time="{ format: 'HH:mm' }"
:disabled-date="disabledDate" :disabled-time="disabledRangeTime" :disabled-date="disabledDate" :disabled-time="disabledRangeTime"
@@ -53,7 +54,9 @@
style="border-radius: 8px; height: 40px; margin-left: 5px" style="border-radius: 8px; height: 40px; margin-left: 5px"
:placeholder="[' 开始时间', ' 结束时间']" :placeholder="[' 开始时间', ' 结束时间']"
/> />-->
<a-range-picker v-model:value="searchParam.valueDate" style="width: 420px" format="YYYY-MM-DD" separator="至"
:placeholder="[' 开始时间', ' 结束时间']" />
</div> </div>
<div style="display: flex; margin-bottom: 20px"> <div style="display: flex; margin-bottom: 20px">
<div class="btnn btn1" @click="searchSubmit"> <div class="btnn btn1" @click="searchSubmit">