Merge branch 'dev_2nd_period_test' into 'feature_dev_20221010_extend'

# Conflicts:
#   jero-web/src/common/lang/en-us.js
#   jero-web/src/common/lang/zh-cn.js

jero-web/src/components/OcrTable/index.vue

@@ -21,11 +21,11 @@
 <!--             <span v-if="ol.text==$t('check')">-->
 <!--                     {{record.resultContent=='转换成功'&&record.syncState=='未同步'?ol.text:''}}-->
 <!--              </span>-->
-             <span v-if="ol.text==$t('download') && record.createBy == userData.username"
+             <span v-if="ol.text==$t('download') && (record.createBy == userData.username || administrators)"
                    v-has="'ocr:ocrRestful:downFile'">
                      {{record.resultContent=='转换成功'?ol.text:''}}
               </span>
-             <span v-if="ol.text==$t('delete') && record.createBy == userData.username" v-has="'ocr:ocrRecord:delete'">
+             <span v-if="ol.text==$t('delete') && (record.createBy == userData.username || administrators)" v-has="'ocr:ocrRecord:delete'">
                      {{ol.text}}
               </span>
            </a>
@@ -105,7 +105,8 @@
         searchParmes: {},
         loading: false,
         orderBy: '1',
-        orderByField: ''
+        orderByField: '',
+        administrators:false
       }
     },
     mounted() {
@@ -131,6 +132,14 @@
       this.getData()
       this.getTableList()
       this.userData = this.userInfo()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
     },
     beforeDestroy(){
       eventBUs.$off('searchQuery')

jero-web/src/components/SplitTable/index.vue

@@ -18,7 +18,7 @@
 <!--              <span class="text">-->
              <!--                     {{ol.text}}-->
              <!--              </span>-->
-             <span v-if="ol.text==$t('backDocument')&&record.flag==0 && record.createBy == userData.username"
+             <span v-if="ol.text==$t('backDocument') && record.flag==0 && (record.createBy == userData.username || administrators)"
                    class="text"
                    v-has="'split:sarFileSplitInfo:bind'">
                      {{ol.text}}
@@ -27,7 +27,7 @@
                     v-has="'split:sarFileSplitItems:page'">
                      {{ol.text}}
              </span>
-              <span v-if="ol.text==$t('delete') && record.createBy == userData.username"
+              <span v-if="ol.text==$t('delete') && (record.createBy == userData.username || administrators)"
                     v-has="'split:sarFileSplitInfo:delete'">
                      {{ol.text}}
              </span>
@@ -109,7 +109,8 @@
         loading: false,
         orderBy: '1',
         userData: {},
-        orderByField: ''
+        orderByField: '',
+        administrators:false,
       }
     },
     mounted() {
@@ -141,6 +142,14 @@
       this.getData()
       this.getTableList()
       this.userData = this.userInfo()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
     },
     beforeDestroy() {
       eventBUs.$off('searchQuery')

jero-web/src/components/tableCollection/index.vue

@@ -639,8 +639,7 @@
         }
         let params = {
           paramsManifestId: paramsManifestid,
-          flag: '7',
-          userType: userType
+          flag: '7'
         }
         getAction(url, params).then((res) => {
           if (res.success) {

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: {