合并分支 'feature_dev_20221025_message' 到 'dev_2nd_period_test'

Feature dev 20221025 message

查看合并请求 laws-nio/laws-weilai!220

jero-web/src/components/tools/HeaderNotice.vue

@@ -15,7 +15,10 @@
               <a-list-item :key="index" v-for="(record, index) in announcement1" v-if="index <= 4">
                 <div style="margin-left: 5%;width: 80%;">
                   <p style="overflow: hidden; text-overflow: ellipsis;white-space: nowrap;color:#00B3BE">
-                    <a :title="record.msgContent" @click="showAnnouncement(record)">{{ record.msgContent }}</a>
+                    <a :title="language == 'zh-cn'?record.msgContentCn:record.msgContent"
+                       @click="showAnnouncement(record)">
+                      {{ language == 'zh-cn'?record.msgContentCn:record.msgContent }}
+                    </a>
                   </p>
                 </div>
               </a-list-item>
@@ -50,6 +53,7 @@
     data() {
       return {
         loadding: false,
+        language: '',
         url: {
           listCementByUser: '/sys/sysAnnouncementSend/getMessageUnreadList',
           editCementSend: '/sys/sysAnnouncementSend/editByAnntIdAndUserId',
@@ -91,6 +95,7 @@
     },
     created() {
       this.loadData()
+      this.language = localStorage.getItem('language') || ''
       // this.initWebSocket()
       if (store.getters.userInfo) {
         this.$socketPublic.dispatch('webSocketInit')//初始化ws
@@ -139,7 +144,11 @@
       showAnnouncement(record) {
         getAction(this.url.readAllMsg, { ids: record.id }).then((res) => {
         })
-        localStorage.setItem('msgContent', record.msgContent)
+        if (this.language == 'zh-cn') {
+          localStorage.setItem('msgContent', record.msgContentCn)
+        } else {
+          localStorage.setItem('msgContent', record.msgContent)
+        }
         this.$router.push({
           path: '/isps/userAnnouncement',
           query: {