合并分支 'feature_dev_20221025_message' 到 'dev_2nd_period_test'

Feature dev 20221025 message

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

jero-web/src/views/dashboard/components/myNews.vue

@@ -11,8 +11,8 @@
       <div class="myNews-box-content-box" v-for="(item,index) in dataSource" :key="index" @click="magClick(item)">
         <img src="../../../assets/wdxx.png" alt="">
         <div class="content-box">
-          <div class="top" :title="item.msgContent">
-            {{item.msgContent}}
+          <div class="top" :title="language == 'zh-cn'?item.msgContentCn:item.msgContent">
+            {{language == 'zh-cn'?item.msgContentCn:item.msgContent}}
           </div>
           <div class="botton">
             {{item.sendTime}}
@@ -44,11 +44,13 @@
         loading: false,
         pageNo: 1,
         pageSize: 4,
-        dataSource: []
+        dataSource: [],
+        language: ''
       }
     },
     mounted() {
       this.getList()
+      this.language = localStorage.getItem('language') || ''
     },
     methods: {
       getList() {
@@ -69,7 +71,11 @@
       magClick(row) {
         getAction(this.url.readAllMsg, { ids: row.id }).then((res) => {
         })
-        localStorage.setItem('msgContent', row.msgContent)
+        if (this.language == 'zh-cn'){
+          localStorage.setItem('msgContent', row.msgContentCn)
+        }else{
+          localStorage.setItem('msgContent', row.msgContent)
+        }
         this.$router.push({
           path: '/isps/userAnnouncement',
           query: {

jero-web/src/views/system/UserAnnouncementList.vue

@@ -71,8 +71,9 @@
       @change="handleTableChange">
       <span slot="msgTitile" slot-scope="text,scope">
 <!--         @click="msgContentClick(scope)"-->
-           <a :style="{'color':scope.readFlag == 0 ? 'red':'#00A0E9'}" :title="text">
-             {{text}}
+           <a :style="{'color':scope.readFlag == 0 ? 'red':'#00A0E9'}"
+              :title="language == 'zh-cn' ? scope.msgContentCn : scope.msgContent">
+             {{language == 'zh-cn' ? scope.msgContentCn : scope.msgContent}}
            </a>
       </span>
       <span slot="msgCategory" slot-scope="text,scope">
@@ -82,7 +83,7 @@
            </span>
       </span>
       <p slot="expandedRowRender" slot-scope="record" style="margin: 0;padding-left: 58px;">
-        <span v-html="record.msgContentInfo">
+        <span v-html="language == 'zh-cn' ? record.msgContentInfoCn : record.msgContentInfo">
         </span>
       </p>
     </a-table>
@@ -163,10 +164,10 @@
             dataIndex: 'sendTime'
           },
           {
-            title:'',
+            title: '',
             align: 'left',
             ellipsis: true,
-            width: 50,
+            width: 50
           }
         ],
         url: {
@@ -177,7 +178,8 @@
         },
         loading: false,
         openPath: '',
-        formData: ''
+        formData: '',
+        language: ''
       }
     },
     watch: {
@@ -186,16 +188,25 @@
         this.loadData()
       }
     },
+    mounted() {
+      this.language = localStorage.getItem('language') || ''
+    },
     methods: {
       expandIcon(props) {
         if (props.expanded) {
-          return <a-icon type='down' onClick={e => {
-            props.onExpand(props.record, e);
-          }}/>;
+          return <a-icon type = 'down'onClick = { e=>
+          {
+            props.onExpand(props.record, e)
+          }
+        }
+          />;
         } else {
-          return <a-icon type='right' onClick={e => {
-            props.onExpand(props.record, e);
-          }}/>;
+          return <a-icon type = 'right' onClick = { e =>
+          {
+            props.onExpand(props.record, e)
+          }
+        }
+          />;
         }
       },
       getQueryParams() {
@@ -359,8 +370,9 @@
     height: 38px;
     /*margin-top: 2px;*/
   }
-  ::v-deep .ant-table .ant-table-row-indent + .ant-table-row-expand-icon{
-     margin-right: 0;
+
+  ::v-deep .ant-table .ant-table-row-indent + .ant-table-row-expand-icon {
+    margin-right: 0;
   }
 </style>
 <style>