fix: 测试问题修改

src/layout/components/appHeader/index.vue

@@ -195,7 +195,7 @@ onMounted(() => {
         <span class="user-set-main">
           <!-- <img class="head" :src="userAvatar" :style="avatarsStyle" /> -->
           <el-avatar :size="36" :src="downloadFile(headPicId)" />
-          <p>{{ `欢迎您，${userName}` }}</p>
+          <p class="ml-2">{{ `欢迎您，${userName}` }}</p>
           <el-icon><CaretBottom /></el-icon>
         </span>
         <template #dropdown>
@@ -256,6 +256,9 @@ onMounted(() => {
       .actived {
         background: rgba(0, 82, 217, 0.1);
         color: #0052d9;
+        .meun_item {
+          color: #0052d9;
+        }
       }
     }
     .user-set {

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,

src/views/businessManagement/statisticAnalysis/index.vue

@@ -46,7 +46,7 @@ const dataList = ref([]);
             </div>
             <div style="background: #fff3ea" class="content-list-item">
               <span style="color: rgba(255, 126, 44, 0.8)" class="title"
-                >全部知识</span
+                >本月新增</span
               >
               <span style="color: #ff7e2c" class="num">75,485</span>
               <span class="desc"
@@ -56,7 +56,7 @@ const dataList = ref([]);
             </div>
             <div style="background: #e7f6ff" class="content-list-item">
               <span style="color: rgba(14, 162, 255, 0.8)" class="title"
-                >全部知识</span
+                >本周撤回</span
               >
               <span style="color: #0ea2ff" class="num">75,485</span>
               <span class="desc"
@@ -66,7 +66,7 @@ const dataList = ref([]);
             </div>
             <div style="background: #f2f1ff" class="content-list-item">
               <span style="color: rgba(120, 112, 247, 0.8)" class="title"
-                >全部知识</span
+                >今日新增</span
               >
               <span style="color: #7870f7" class="num">75,485</span>
               <span class="desc"

src/views/knowledgeCentre/approval/index.vue

@@ -26,7 +26,10 @@ const seachForm = reactive({
   baseId: "",
   publishDateBegin: "",
   publishDateEnd: "",
-  time: []
+  submitDateBegin: "",
+  submitDateEnd: "",
+  time: [],
+  submitDate: []
 });
 const flowTypeList = ref([
   {
@@ -110,8 +113,12 @@ const columns: TableColumnList = [
     prop: "submitDeptName"
   },
   {
-    label: "最新时间",
+    label: "发布日期",
-    prop: "diseaseName"
+    prop: "publishDate"
+  },
+  {
+    label: "报送日期",
+    prop: "submitDate"
   },
   {
     label: "操作",
@@ -130,6 +137,13 @@ const getData = async () => {
     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(() => {
               </el-select> </el-form-item
           ></el-col>
           <el-col :span="8">
-            <el-form-item label="发文时间">
+            <el-form-item label="发布日期">
               <el-date-picker
                 start-placeholder="开始时间"
                 end-placeholder="结束时间"
-                format="YYYY-MM-DD HH:mm:ss"
+                format="YYYY-MM-DD"
                 v-model="seachForm.time"
-                type="datetimerange"
+                type="daterange"
-                value-format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD"
                 placeholder="请选择"
                 size="large" /></el-form-item
           ></el-col>

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(() => {
         <div class="Editortext">
           <WangEditor ref="refWangEditor" />
         </div>
-        <div class="main-card">
+        <div class="main-card" style="padding-bottom: 0">
           <el-row>
             <el-col :span="24">
               <el-form-item label="摘要" prop="excerpt">
@@ -291,7 +297,7 @@ onMounted(() => {
             </div>
           </el-form-item>
         </div>
-        <div class="main-card">
+        <div class="main-card" style="padding-bottom: 0">
           <el-row>
             <el-col :span="24">
               <el-form-item label="发文部门" prop="publishDeptId">
@@ -425,6 +431,10 @@ onMounted(() => {
     </el-scrollbar>
 
     <div class="footer-content">
+      <div class="back" @click="goBack">
+        <img :src="backImg" alt="" />
+        <span>返回正文</span>
+      </div>
       <el-button
         @click="save(2, ruleFormRef)"
         size="large"
@@ -512,6 +522,7 @@ onMounted(() => {
     flex-direction: row-reverse;
     padding: 24px;
     margin-top: 16px;
+    position: relative;
     .normal_btn {
       width: 150px;
       height: 50px;
@@ -530,6 +541,20 @@ onMounted(() => {
       color: #999999;
       cursor: pointer;
     }
+    .back {
+      position: absolute;
+      left: 80px;
+      display: flex;
+      font-size: 16px;
+      align-items: center;
+      color: #999999;
+      cursor: pointer;
+      img {
+        width: 50px;
+        height: 50px;
+        margin-right: 16px;
+      }
+    }
   }
   .Editortext {
     background: #ffffff;

src/views/knowledgeCentre/submission/index.vue

@@ -31,7 +31,10 @@ const seachForm = reactive({
   baseId: "",
   publishDateBegin: "",
   publishDateEnd: "",
-  time: []
+  submitDateBegin: "",
+  submitDateEnd: "",
+  time: [],
+  submitDate: []
 });
 const statusList = [
   {
@@ -96,7 +99,7 @@ const tabList = ref([
   },
   {
     title: "通过",
-    id: "4"
+    id: "2"
   },
   {
     title: "失效",
@@ -151,8 +154,12 @@ const columns: TableColumnList = [
     prop: "submitDeptName"
   },
   {
-    label: "最新时间",
+    label: "发布日期",
-    prop: "updateTime"
+    prop: "publishDate"
+  },
+  {
+    label: "报送日期",
+    prop: "submitDate"
   },
   {
     label: "操作",
@@ -182,10 +189,18 @@ const getData = async () => {
     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,
-    ...seachForm
+    ...seachForm,
+    time: undefined
   };
   const res: any = await queryKnowledgePage(params);
   dataList.value = res.data.records;
@@ -280,6 +295,7 @@ const withdrawOk = async (id, val) => {
   }
 };
 onActivated(() => {
+  seachForm.status = "";
   search();
 });
 onMounted(() => {
@@ -338,20 +354,49 @@ onMounted(() => {
           ></el-col>
         </el-row>
         <el-row>
+          <el-col :span="8"
+            ><el-form-item label="报送人部门">
+              <el-select
+                size="large"
+                style="width: 100%"
+                filterable
+                v-model="seachForm.submittedDeptId"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in departmentList"
+                  :key="item.id"
+                  :label="item.deptName"
+                  :value="item.id"
+                />
+              </el-select> </el-form-item
+          ></el-col>
           <el-col :span="8">
-            <el-form-item label="发文时间">
+            <el-form-item label="发布日期">
               <el-date-picker
                 style="width: 100%"
                 start-placeholder="开始时间"
                 end-placeholder="结束时间"
-                format="YYYY-MM-DD HH:mm:ss"
+                format="YYYY-MM-DD"
                 v-model="seachForm.time"
-                type="datetimerange"
+                type="daterange"
-                value-format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择"
+                size="large" /></el-form-item
+          ></el-col>
+          <el-col :span="8">
+            <el-form-item label="报送日期">
+              <el-date-picker
+                style="width: 100%"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                format="YYYY-MM-DD"
+                v-model="seachForm.submitDate"
+                type="daterange"
+                value-format="YYYY-MM-DD"
                 placeholder="请选择"
                 size="large" /></el-form-item
           ></el-col>
-
           <el-button size="large" class="ml-8" @click="search" type="primary"
             >搜索</el-button
           >