From 2101dc60333a39cfa80b33689f2267fd211314e8 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 25 May 2022 10:45:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/layouts/TabLayout.vue |  1 -
 jero-web/src/views/dashboard/Analysis.vue     | 31 +++++++------
 .../dashboard/components/customContent.vue    |  2 -
 .../dashboard/components/documentDynamics.vue | 43 ++++++++++---------
 .../components/monthlyReportRegulations.vue   |  2 +-
 .../src/views/dashboard/components/myList.vue |  2 +-
 .../src/views/dashboard/components/myNews.vue |  2 +-
 .../src/views/dashboard/customContentList.vue |  9 ++--
 .../documentTools/searchCenter/index.vue      |  8 ++++
 .../components/certificationDirectoryAdd.vue  |  2 +-
 jero-web/src/views/system/MessageDetails.vue  | 18 +++++---
 .../src/views/system/UserAnnouncementList.vue |  2 +-
 12 files changed, 70 insertions(+), 52 deletions(-)

diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue
index e4681ca78..e76180cd4 100644
--- a/jero-web/src/components/layouts/TabLayout.vue
+++ b/jero-web/src/components/layouts/TabLayout.vue
@@ -95,7 +95,6 @@
           this.$route.path == '/handshakeProcess' ||
           this.$route.path == '/historicalVersion' ||
           this.$route.path == '/dashboard/analysis' ||
-          this.$route.path == '/customContentList' ||
           this.$route.path == '/processDetails') {
           return false
         } else {
diff --git a/jero-web/src/views/dashboard/Analysis.vue b/jero-web/src/views/dashboard/Analysis.vue
index acaf903a3..0a10c5667 100644
--- a/jero-web/src/views/dashboard/Analysis.vue
+++ b/jero-web/src/views/dashboard/Analysis.vue
@@ -57,7 +57,14 @@
     },
     methods: {
       onSearch(value) {
-        console.log(value)
+        if (value) {
+          this.$router.push({
+            path: '/docTools/searchCenter',
+            query: {
+              selectValue:value
+            }
+          })
+        }
       }
     }
   }
@@ -66,7 +73,7 @@
   .box {
     width: 100%;
     height: 100%;
-    padding: 32px;
+    padding: 10px 20px 8px 20px;
     box-sizing: border-box;
 
     .header-search {
@@ -85,9 +92,9 @@
 
     .content-header {
       width: 100%;
-      height: 120px;
-      margin-top: 24px;
-      padding: 24px;
+      height: 112px;
+      margin-top: 10px;
+      padding: 20px;
       box-sizing: border-box;
       border: 1px solid #CED0D8;
       border-radius: 4px;
@@ -95,11 +102,11 @@
 
     .content-content {
       width: 100%;
-      height: 306px;
-      padding: 30px 25px 25px 25px;
+      height: 280px;
+      padding: 20px 24px;
       box-sizing: border-box;
       border: 1px solid #CED0D8;
-      margin-top: 20px;
+      margin-top: 10px;
     }
 
     .content-footer {
@@ -108,12 +115,12 @@
       width: 100%;
 
       .content-footer-box {
-        width: calc(33.3% - 14px);
-        height: 412px;
+        width: calc(33.3% - 7px);
+        height: 400px;
         border: 1px solid #CED0D8;
-        padding: 30px 24px 24px 24px;
+        padding: 20px 24px;
         box-sizing: border-box;
-        margin-top: 20px;
+        margin-top: 10px;
       }
     }
   }
diff --git a/jero-web/src/views/dashboard/components/customContent.vue b/jero-web/src/views/dashboard/components/customContent.vue
index 850a76df2..1e80de53c 100644
--- a/jero-web/src/views/dashboard/components/customContent.vue
+++ b/jero-web/src/views/dashboard/components/customContent.vue
@@ -143,7 +143,6 @@
 
       .text {
         font-size: 16px;
-        font-family: Blue Sky Noto;
         font-weight: 400;
         color: #040B29;
         margin-top: 8px;
@@ -176,7 +175,6 @@
 
       .text {
         font-size: 16px;
-        font-family: Blue Sky Noto;
         font-weight: 400;
         color: #040B29;
         margin-top: 8px;
diff --git a/jero-web/src/views/dashboard/components/documentDynamics.vue b/jero-web/src/views/dashboard/components/documentDynamics.vue
index 487bfa134..eb9d495d5 100644
--- a/jero-web/src/views/dashboard/components/documentDynamics.vue
+++ b/jero-web/src/views/dashboard/components/documentDynamics.vue
@@ -3,7 +3,7 @@
     <div class="header-text">
       <div class="header-text-left">{{this.$t('documentDynamics')}}</div>
       <div class="header-text-right" @click="moreClick">
-        {{$t('more')}}
+        more
         <img src="../../../assets/gengduo.png" alt="">
       </div>
     </div>
@@ -13,13 +13,13 @@
            @click="magClick(item)">
         <div class="yuan"></div>
         <div class="text">{{item.msgContent}}</div>
-<!--        <img src="../../../assets/new.png" alt="">-->
+        <!--        <img src="../../../assets/new.png" alt="">-->
         <div class="time">{{item.createTime}}</div>
       </div>
       <div class="solid"></div>
     </div>
     <div v-else style="height: 240px;position: relative">
-          <JNoData />
+      <JNoData/>
     </div>
     <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
   </div>
@@ -27,24 +27,25 @@
 
 <script>
   import { getAction, putAction, deleteAction } from '@/api/manage'
+
   export default {
     name: 'documentDynamics',
-    data(){
-       return{
-         pageSize: 8,
-         pageNo: 1,
-         dataSource: [],
-         loading:false,
-         url: {
-           list: '/home/homeDocumentDynamicEO/page',
-           readAllMsg: 'sys/sysAnnouncementSend/read'
-         },
-       }
+    data() {
+      return {
+        pageSize: 8,
+        pageNo: 1,
+        dataSource: [],
+        loading: false,
+        url: {
+          list: '/home/homeDocumentDynamicEO/page',
+          readAllMsg: 'sys/sysAnnouncementSend/read'
+        }
+      }
     },
     mounted() {
       this.getList()
     },
-    methods:{
+    methods: {
       getList() {
         let query = {
           pageNo: this.pageNo,
@@ -61,8 +62,7 @@
         })
       },
       magClick(row) {
-        getAction(this.url.readAllMsg, { ids: row.id }).then((res) => {
-        })
+        row.isCustomContentList = true
         this.$router.push({
           path: '/system/MessageDetails',
           query: row
@@ -73,13 +73,14 @@
           path: '/customContentList'
         })
       }
-    },
+    }
   }
 </script>
 
 <style scoped lang="less">
   .documentDynamics-box {
     width: 100%;
+    position: relative;
 
     .header-text {
       width: 100%;
@@ -110,16 +111,16 @@
 
       .solid {
         width: 1px;
-        height: 210px;
+        height: 200px;
         background: #EFF1F3;
         position: absolute;
         left: 50%;
-        top: 120px;
+        top: 100px;
         transform: translate(-50%, -50%);
       }
 
       .documentDynamics-text {
-        height: 51px;
+        height: 49px;
         width: calc(50% - 20px);
         line-height: 51px;
         border-bottom: 1px solid #EFF1F3;
diff --git a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
index e2ef1f339..09e08872a 100644
--- a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
+++ b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
@@ -3,7 +3,7 @@
     <div class="header-text">
       <div class="header-text-left">{{this.$t('monthlyReportRegulations')}}</div>
       <div class="header-text-right">
-        {{$t('more')}}
+        more
         <img src="../../../assets/gengduo.png" alt="">
       </div>
     </div>
diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue
index 6c873ba01..2aae52750 100644
--- a/jero-web/src/views/dashboard/components/myList.vue
+++ b/jero-web/src/views/dashboard/components/myList.vue
@@ -3,7 +3,7 @@
     <div class="header-text">
       <div class="header-text-left">{{this.$t('myList')}}</div>
       <div class="header-text-right" @click="moreClick">
-        {{$t('more')}}
+        more
         <img src="../../../assets/gengduo.png" alt="">
       </div>
     </div>
diff --git a/jero-web/src/views/dashboard/components/myNews.vue b/jero-web/src/views/dashboard/components/myNews.vue
index 9ea1396c0..5194e94e7 100644
--- a/jero-web/src/views/dashboard/components/myNews.vue
+++ b/jero-web/src/views/dashboard/components/myNews.vue
@@ -3,7 +3,7 @@
     <div class="header-text">
       <div class="header-text-left">{{this.$t('myNews')}}</div>
       <div class="header-text-right" @click="moreClick">
-        {{$t('more')}}
+        more
         <img src="../../../assets/gengduo.png" alt="">
       </div>
     </div>
diff --git a/jero-web/src/views/dashboard/customContentList.vue b/jero-web/src/views/dashboard/customContentList.vue
index d32189063..4f227fe91 100644
--- a/jero-web/src/views/dashboard/customContentList.vue
+++ b/jero-web/src/views/dashboard/customContentList.vue
@@ -75,7 +75,7 @@
             title: this.$t('NotificationTime'),
             align: 'center',
             width: 200,
-            dataIndex: 'sendTime'
+            dataIndex: 'createTime'
           }
         ],
         url: {
@@ -92,8 +92,7 @@
         this.selectedRowKeys = value
       },
       msgContentClick(row) {
-        getAction(this.url.readAllMsg, { ids: row.id }).then((res) => {
-        })
+        row.isCustomContentList = true
         this.$router.push({
           path: '/system/MessageDetails',
           query: row
@@ -106,13 +105,13 @@
             content: that.$t('ConfirmBatchDeletion'),
             onOk: function() {
               let selectedRowKeys = JSON.parse(JSON.stringify(that.selectedRowKeys))
-              deleteAction(that.url.deleteUrl, { ids: selectedRowKeys.join(',') }).then((res) => {
+              getAction(that.url.deleteUrl, { ids: selectedRowKeys.join(',') }).then((res) => {
                 if (res.success) {
                   that.selectedRowKeys = []
                   that.$message.success(that.$t('OperationSuccessful'))
                   that.loadData()
                 } else {
-                  that.$message.success(that.$t('operationFailed'))
+                  that.$message.warning(that.$t('operationFailed'))
                 }
               })
             }
diff --git a/jero-web/src/views/documentTools/searchCenter/index.vue b/jero-web/src/views/documentTools/searchCenter/index.vue
index 797999522..c309e26c2 100644
--- a/jero-web/src/views/documentTools/searchCenter/index.vue
+++ b/jero-web/src/views/documentTools/searchCenter/index.vue
@@ -92,6 +92,14 @@
     },
     mounted() {
       this.getCondition()
+      if (this.$route.query.selectValue) {
+        this.selectValueTwo = this.$route.query.selectValue
+        this.$nextTick(() => {
+          if (this.$refs.wholeRef) {
+            this.$refs.wholeRef.searchData(this.selectValueTwo)
+          }
+        })
+      }
     },
     methods: {
       callback(key) {
diff --git a/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue b/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue
index 03f2e2dd6..00c162004 100644
--- a/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue
+++ b/jero-web/src/views/projectManagement/components/certificationDirectoryAdd.vue
@@ -154,7 +154,7 @@
       },
       handleSubmit() {
         if (!this.formInline.directoryName && !this.formInline.lot && !this.formInline.directoryFile &&
-          !this.formInline.experimentFile && !this.detectionReportLocation.lot && !this.formInline.explainInfo) {
+          !this.formInline.experimentFile && !this.formInline.detectionReportLocation && !this.formInline.explainInfo) {
           this.$message.warning(this.$t('dataCannotEmpty'))
         } else {
           let Action
diff --git a/jero-web/src/views/system/MessageDetails.vue b/jero-web/src/views/system/MessageDetails.vue
index cc50cb3c6..a9b866dfe 100644
--- a/jero-web/src/views/system/MessageDetails.vue
+++ b/jero-web/src/views/system/MessageDetails.vue
@@ -6,11 +6,11 @@
         {{this.$route.query.msgContent}}
       </span>
       <span class="box-header-right-text">
-        {{$t('NotificationTime')}}: {{this.$route.query.sendTime}}
+        {{$t('NotificationTime')}}: {{this.$route.query.sendTime || this.$route.query.createTime}}
       </span>
     </div>
-    <div class="box-content"  v-html="this.$route.query.msgContentInfo">
-<!--      {{this.$route.query.msgContentInfo}}-->
+    <div class="box-content" v-html="this.$route.query.msgContentInfo">
+      <!--      {{this.$route.query.msgContentInfo}}-->
     </div>
   </div>
 </template>
@@ -20,9 +20,15 @@
     name: 'MessageDetails',
     methods: {
       iconClick() {
-        this.$router.push({
-          path: '/isps/userAnnouncement'
-        })
+        if (this.$route.query.isCustomContentList) {
+          this.$router.push({
+            path: '/customContentList'
+          })
+        } else {
+          this.$router.push({
+            path: '/isps/userAnnouncement'
+          })
+        }
       }
     }
   }
diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue
index 34f963452..c3a8ed208 100644
--- a/jero-web/src/views/system/UserAnnouncementList.vue
+++ b/jero-web/src/views/system/UserAnnouncementList.vue
@@ -201,7 +201,7 @@
                   that.$message.success(that.$t('OperationSuccessful'))
                   that.loadData()
                 } else {
-                  that.$message.success(that.$t('operationFailed'))
+                  that.$message.warning(that.$t('operationFailed'))
                 }
               })
             }