合并分支 'fix_bug_first_stage' 到 'master'

修改禅道已知bug

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

jero-web/src/common/lang/en-us.js

@@ -570,7 +570,7 @@ module.exports = {
   batSetting: 'Batch Setting',
   selectDirectoryTerms: 'Please Select the directory location to add terms',
   StandardBreakdown: 'Standard Breakdown',
-  OnlyWordItem: 'Non GSO file type, PDF file cannot be split',
+  OnlyWordItem: 'Only the GSO file type can split PDF files. Please re select the file',
   OnlyWord: 'Only word files can be imported',
   labelAreaDeleted: 'If it is deleted, all label items under the display area will be deleted',
   searchInResults: 'Search in results',

jero-web/src/common/lang/zh-cn.js

@@ -576,7 +576,7 @@ module.exports = {
   documentSplitTemplate: '文档拆分模板',
   batSetting: '批量设置',
   selectDirectoryTerms: '请选择添加条款的目录位置',
-  OnlyWordItem: '非GSO文件类型,不能拆分pdf文件',
+  OnlyWordItem: '只有GSO文件类型，才能拆分pdf文件，请重新选择文件',
   OnlyWord: '只能导入word文件',
   labelAreaDeleted: '若进行删除，则该展示区域下标签项都将被删除',
   StandardBreakdown: '标准分解单',

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

@@ -15,7 +15,7 @@
               <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="record.titile" @click="showAnnouncement(record)">{{ record.titile }}</a>
                   </p>
                 </div>
               </a-list-item>

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="item.titile">
+            {{item.titile}}
           </div>
           <div class="botton">
             {{item.sendTime}}