diff --git a/public/favicon.ico b/public/favicon.ico index fddf9ae..88c2555 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/home/back.png b/src/assets/home/back.png new file mode 100644 index 0000000..f51c8f8 Binary files /dev/null and b/src/assets/home/back.png differ diff --git a/src/layout/components/appHeader/index.vue b/src/layout/components/appHeader/index.vue index 7b0a194..dc5936e 100644 --- a/src/layout/components/appHeader/index.vue +++ b/src/layout/components/appHeader/index.vue @@ -195,7 +195,7 @@ onMounted(() => { - {{ `欢迎您,${userName}` }} + {{ `欢迎您,${userName}` }} @@ -256,6 +256,9 @@ onMounted(() => { .actived { background: rgba(0, 82, 217, 0.1); color: #0052d9; + .meun_item { + color: #0052d9; + } } } .user-set { diff --git a/src/router/modules/knowledgeCentre.ts b/src/router/modules/knowledgeCentre.ts index 157bea9..4f07a87 100644 --- a/src/router/modules/knowledgeCentre.ts +++ b/src/router/modules/knowledgeCentre.ts @@ -26,7 +26,7 @@ export default { component: () => import("@/views/knowledgeCentre/submission/add/index.vue"), meta: { - title: "新增", + title: "新建报送", showLink: false, showParent: false, @@ -39,7 +39,7 @@ export default { component: () => import("@/views/knowledgeCentre/submission/edit/index.vue"), meta: { - title: "编辑", + title: "编辑报送", showLink: false, showParent: false, diff --git a/src/views/businessManagement/statisticAnalysis/index.vue b/src/views/businessManagement/statisticAnalysis/index.vue index 12aff35..f1d327d 100644 --- a/src/views/businessManagement/statisticAnalysis/index.vue +++ b/src/views/businessManagement/statisticAnalysis/index.vue @@ -46,7 +46,7 @@ const dataList = ref([]); 全部知识本月新增 75,485 全部知识本周撤回 75,485 全部知识今日新增 75,485 { seachForm.publishDateBegin = ""; seachForm.publishDateEnd = ""; } + if (seachForm.submitDate && seachForm.submitDate.length > 0) { + seachForm.submitDateBegin = seachForm.submitDate[0]; + seachForm.submitDateEnd = seachForm.submitDate[1]; + } else { + seachForm.submitDateBegin = ""; + seachForm.submitDateEnd = ""; + } const params = { pageNum: pagination.currentPage, pageSize: pagination.pageSize, @@ -317,14 +331,14 @@ onMounted(() => { - + diff --git a/src/views/knowledgeCentre/submission/MainTemplate.vue b/src/views/knowledgeCentre/submission/MainTemplate.vue index 6a05cbe..c36f0be 100644 --- a/src/views/knowledgeCentre/submission/MainTemplate.vue +++ b/src/views/knowledgeCentre/submission/MainTemplate.vue @@ -7,6 +7,9 @@ import WangEditor from "@/components/WangEditor/index.vue"; import { useKnowledgeCentreStoreHooks } from "@/store/modules/knowledgeCentre"; import { message } from "@/utils/message"; import { getUserInfo, getToken } from "@/utils/auth"; +import backImg from "@/assets/home/back.png"; +import { useRouter } from "vue-router"; +const router = useRouter(); const ruleFormRef = ref(); const formData = reactive({ operate: "", @@ -186,6 +189,9 @@ const reset = () => { refWangEditor.value.initText(""); refWangEditor.value.initTitle(""); }; +const goBack = () => { + router.push("/knowledgeCentre/submission"); +}; onMounted(() => { const obj: any = getUserInfo(); userInfo = JSON.parse(obj); @@ -225,7 +231,7 @@ onMounted(() => { - + @@ -291,7 +297,7 @@ onMounted(() => { - + @@ -425,6 +431,10 @@ onMounted(() => {
{{ `欢迎您,${userName}` }}