From c2b2f1c1afebda38808b4a0f1fa415c37252ca05 Mon Sep 17 00:00:00 2001
From: xiangcongshuai <xiangcongshuai@supervision.ltd>
Date: Fri, 5 Jul 2024 13:59:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon.ico                            | Bin 4286 -> 1150 bytes
 src/assets/home/back.png                      | Bin 0 -> 1419 bytes
 src/layout/components/appHeader/index.vue     |   5 +-
 src/router/modules/knowledgeCentre.ts         |   4 +-
 .../statisticAnalysis/index.vue               |   6 +-
 src/views/knowledgeCentre/approval/index.vue  |  28 ++++++--
 .../submission/MainTemplate.vue               |  29 +++++++-
 .../knowledgeCentre/submission/index.vue      |  65 +++++++++++++++---
 8 files changed, 112 insertions(+), 25 deletions(-)
 create mode 100644 src/assets/home/back.png

diff --git a/public/favicon.ico b/public/favicon.ico
index fddf9ae2f155198fdd9b38cd7c59a14cf9a9a3d9..88c25555af9848136453899f93cf58adb7d8ce8c 100644
GIT binary patch
literal 1150
zcmbW1Ur1AN6vxjhddLc+=%HSO3VRHsS08*U=^->D`-4(}PeqbQ(bGf=f*w*UB8Z}l
z{ux0^phN{3wycFN$Mw(t-09rr{_4ivcJKXme!sazTSauoxo5v~exGx{=XZBTWZ_SF
zIq|)MTGkM4C8FJI9O6hW&W?z4o6B-0*L(v|%l3uMWc$}k?ES_jSUXG;#&QID%nwt~
z<Z74(^kfja7UH!bW2TWoR`Wy8Mss_BF_BD9jUd=r4S#zj60fen%%+hX>xbv&9?ZV3
zLLxlCbv1+>T~OXtV#ZN}<>UuZ!{lNJ-#7wqBSAezm}}XD)aX+zT-^udB4MJB;8yAo
zcRzvi@kWdf5bPram)gK^M(SPcJ_PkB^C#Gj6M|he2wXb=<r2a1h~RZLLLJ->#{<In
zpau4ic|I%qNZFpjcY3{KMGfDnb%?#RA~f8Nfc*kOpRG`CmErqC!LyBSKrH@3va*SE
z5{o?zQoq!|eTefg5`2EiFx30ia9$_oEs}Rn9)w{m6?pMQn;7EW%L^LRrqx&)?nP{*
z7gL>U;p`DSVRC2-mZNWeVa3ACXo%c7`IF~!m~YzwPe%n5D=}}8{rkQ)^XpER@FI|&
zwPF6uwn7b0GhzB1LFr(=oBi|cNJU0}%gUgUMXaw?@?L(vtB4QS&a+Vc&pc<cekc5G
zyWly@d=p`&m7mM{XYTEU7IplU%_rmiR(R?xlF#X1h481#`E;=_nHxRmVhwvS%RNk=
z<=@ZkDrDmBVot2ZV2BwgxirUH1bXYSaJL>Q_xqCkO2E!u%%GUX5*=a|3-h=FtT?e(
M%zSPBf8c-p5383{tpET3

literal 4286
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

diff --git a/src/assets/home/back.png b/src/assets/home/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..f51c8f8e85cd29fd3b925249cb954b2fc15535b0
GIT binary patch
literal 1419
zcmcJPSya*q6vqERASn@4Zb=<e%S=;T#tk<J6EMN8EHu~jG~-I@9L-eRcW1=hN*zq3
ztklHRGPl88GZ=IF>r|rC<aWqqGFL3e-sW*$=HdH&Z{K~m_kLN<bccQNhvfkP*hi(1
zU3dM;Hz5(bjCfz<zH5+3R|gVMFT%|O0NkERCc4LXFH{gOyr&&Xmm(Z;qu>n{&KS8b
z7l~5zN5y-(&KI~3xeJOW^}Cq!B$gLU0TTIJN!qaE(F8N?X(Hj3opyv{*x888BHNu3
z+w;Fh8gPR`h?tNu>8cy~od+!*VDE2QD-mZO0oaX(GjyF*7`DN)4xBsPz@1A;=wi$y
z!T{(o&rS5_T*C<sd>3SI&+_m}dnEatXwbXHH!N#ePcR*vV5^Bnq$FYs7WFe|wbk3h
zeN;|V{A5?T&8V{7os*Uf+ji~|EAg|0m>Bc#Ti^b*9`JHYoVsXJIa|=LG@J&u1s7Sv
zs;&Ut%3A=I@G@ux{&e-1A(<=29!snO?rBjiO?6Z;cP>154Q+GMscB<M^^Ob9OS|2X
zS6_vX-t<lSY$YbpJX|`?R<m5|P^$57l4LU3(){)f%1TuAh&g+^(v(+`YxvBF)v%VV
ziq3e;U@*?K5qeqeFjG@b{_EsY8>UKn2@pYZ^n+eIBUYnwZmh-cT#px+t`E2z8o9PX
zm}v3Et8DY0oI6ptCXpPqb{cB&m*eyEusrcmN<U*vn8sMp1zQ?3ns9rNg^qS?Jj5>$
ziGc`*Awk!)jzLq)V8b6Mq&-MuxzfRcR3s({jW5*Pi&Y=S`JQk%pkY^P(S0soi_FGH
zvdeJPOu%mjFt*_Qhk$9qZ%gazkSVJMrB36%C}tfPy6JE~fjoQgfIU{xX-)p2CCKzS
zAMW?mA>uHyNL9Bc?9;7*F;T8|;b2m5jiLy;2}3FLTb!gr%MPX&I+w!)>Zn<+Is6J$
zg-&E42CVRyziojHlYohy1Ud^!@kYg-sjCVqt%$BvK_N;qV=NW27mA%1lbg#&#$ja#
z`-;G=apvxD>ymN4zCArJ*H8|3Tk{b@fI^K`J%WES!+WI*4^UL`UTH!!r3~+tDwL-v
z;=NLYh=Fqa;(K$Oi~I>+$=A%zOrC+(<QuSa%OAq~K?RIg=0-p`(SqBoY5j`au>cXQ
z_s3}6S(oremy1B7hU91O!?|#d5y)K93ktM|YXbb^q7}<s=kYVCMzo!`PdxK`bMk~x
zO4no;m;bVX=Ya@7pA41`3_+2q<S)Uslj<G(xQ+X_%tp&UZER3FvTD_&D%h_2CTo2)
z^&GhD%i?Lf(ndw~|8blDJ_k`GNr=Zmx^4SPFXzKohi^O}qnq~=pWEqt$Dee&yG7Vc
zlF=SkhC9n(>zBkzp4A0fgC3LX;u$s4+Nsf`$Don!f+L3qi>-Lh$aci_KYQWcR;&{?
z+Bc-&lMy8`2?aVHwVtl|y&2qE;g<<SE6wu&+k5w62HBVzW}T9=8#Oy`N#=e@%d;2F
z)73pSTP-hOakN62?tyk!6?&FYK<9^WgU8@R_G-xI<<SI9|GR&L1RaY(kizdt7&?JD
z__)5(dcCw49bw7p<Mm_G$(ybjn*#>&PCh^*wQ6X*w(?1b3EdW$qEG3`W$;tmoBO|l
zAc&21Y}IL-3N`vT&;@CX%$|+CS$yfTQn8zMV$EDE4Es}#{xV4&G}gF%BIQo>T&$$u
u%#xbZn-~FLcRXk#W*V(5oR8@G;|+LEivs<P@}J-87NFYG$@L`P<bMF1EP9~;

literal 0
HcmV?d00001

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(() => {
         <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 {
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([]);
             </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"
diff --git a/src/views/knowledgeCentre/approval/index.vue b/src/views/knowledgeCentre/approval/index.vue
index 46afedf..d0a7043 100644
--- a/src/views/knowledgeCentre/approval/index.vue
+++ b/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: "最新时间",
-    prop: "diseaseName"
+    label: "发布日期",
+    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"
-                value-format="YYYY-MM-DD HH:mm:ss"
+                type="daterange"
+                value-format="YYYY-MM-DD"
                 placeholder="请选择"
                 size="large" /></el-form-item
           ></el-col>
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(() => {
         <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;
diff --git a/src/views/knowledgeCentre/submission/index.vue b/src/views/knowledgeCentre/submission/index.vue
index be75e54..9a8cfac 100644
--- a/src/views/knowledgeCentre/submission/index.vue
+++ b/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: "最新时间",
-    prop: "updateTime"
+    label: "发布日期",
+    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"
-                value-format="YYYY-MM-DD HH:mm:ss"
+                type="daterange"
+                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
           >