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

This commit is contained in:
yuping
2022-12-26 09:10:33 +08:00
3 changed files with 6 additions and 2 deletions

View File

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

View File

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

View File

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