Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -3411,7 +3411,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         }
         String fieldStr = fieldSb.substring(0, fieldSb.length() - 1);
 
-        String field = " osf.id,bdl.serial_number,bdl.title,bdl.title_en,bdl.state,osf.file_name,osf.connect_id," + fieldStr
+        String field = " osf.id,bdl.id as \"buss_document_library_id\",bdl.serial_number,bdl.title,bdl.title_en,bdl.state,osf.file_name,osf.connect_id," + fieldStr
                 + " from oss_file osf join buss_document_library bdl" + join.toString();
 
         //查询条件

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

@@ -1191,4 +1191,5 @@ module.exports = {
   Fileuploaded:'File uploaded, please wait',
   uploadedbyyourself:'You can only delete files and data uploaded by yourself',
   Fileuploaded:'File uploading, please wait',
+  doNotHavePermissionDeleteData:'Do not have permission to delete this data,'
 }

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

@@ -1194,4 +1194,105 @@ module.exports = {
   onlyFilesUploaded:'只能上传.docx、.doc文件',
   uploadedbyyourself:'只能删除自己上传的文件数据',
   Fileuploaded:'文件上传中，请稍后',
+  English: '英文',
+  requiredParametersEmpty: '必填参数不能为空',
+  theResponsiblePersonAndDeadlineClank: '的责任人、截止时间不能为空',
+  bringInTheProjectInterface: '带入工程接口人',
+  theCurrentListSaved: '当前列表数据已全部提交，无法进行暂存',
+  defaultTemplate: '默认模板',
+  newRequestCommentListTemplate: '新征求意见清单模板',
+  NewReleasedStandardTemplate: '新发布标准模板',
+  pleaseSelectStandard: '请选择标准',
+  theResponsiblePersonEmpty: '的责任人不能为空',
+  theDeadlineEmpty: '的截止时间不能为空',
+  theDeliveryTypeCannotBeEmpty: '的交付物类型不能为空',
+  For: '针对于',
+  markedRejection: '标注的驳回意见',
+  RegulationListConfirmationTask: '清单确认任务',
+  RegulationListConfirmationNotification: '清单确认通知',
+  RegulationTaskConfirmation: '任务确认任务',
+  DesignComplianceTask: '设计符合性任务',
+  PreHomoTask: 'Pre-Homo任务',
+  ValidationTask: '验证符合性任务',
+  DesignComplianceNotification: '设计符合性通知',
+  PreHomoNotification: 'Pre-Homo通知',
+  ValidationComplianceNotification: '验证符合性通知',
+  RegulationTaskConfirmationNotification: '任务确认通知',
+  evaluationMethod: '评估方式',
+  uploadRelevantMaterials: '相关资料上传',
+  RelevantMaterials: '相关资料',
+  processBackground: '流程背景',
+  selectedStandard: '所选标准',
+  standardDecompositionDocument: '带入标准分解单',
+  pleaseSelectStandardFirst: '请先选择标准',
+  evaluatorFeedback: '评估人反馈',
+  nameTechnicalDocument: '技术文件名称',
+  chapter: '章节',
+  problemDescription: '问题说明',
+  filingExternalOpinions: '对外意见归档',
+  initiateProcessForCurrentStandard: '针对当前标准发起流程',
+  engineerFeedbackResults: '工程师反馈结果',
+  fileExport: '文件导出',
+  feedbackTime: '反馈时间',
+  regulatoryTechnologyAssessmentProcess: '法规技术评估流程',
+  feedbackEvaluation: '反馈评估',
+  clauseEvaluation: '条款评估',
+  standardDocuments: '标准文件',
+  pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估方式或评估人',
+  reviewComments: '审核意见',
+  PleaseCompleteList: '请补全列表中符合性结果',
+  sponsorFeedback: '发起人反馈',
+  processNumber: '流程编号',
+  processName: '流程名称',
+  feedbackResults: '反馈结果',
+  theDoesNotSupportPreview: '当前文件格式不支持预览',
+  releaseSituation: '发布情况',
+  comparisonResults: '对比结果',
+  Published: '已发布',
+  initiateComparison: '发起对比',
+  translationLanguage: '翻译语言',
+  translationResults: '翻译结果',
+  conversionTime: '转换时间',
+  category: '类别',
+  RegulatoryProcessEvaluationResults: '法规流程评估结果',
+  ViewConformanceResults: '查看符合性结果',
+  CommentsCollectionResultsForReference: '意见收集结果参考',
+  TechnicalEvaluationResultsForReference: '技术评估结果参考',
+  ComplianceConfirmationRecord: '符合性确认记录',
+  complianceConfirmation: '符合性确认',
+  Deriveconformanceresults: '导出符合性结果',
+  Regulatorycompliancekanban: '法规符合性看板',
+  noComparisonDocumentSelected: '未选择对比文档',
+  RemarkInfo: '备注信息',
+  initiateDocumentComparison: '发起文档对比',
+  comparativeComments: '对比评论',
+  viewTheComparisonResults: '查看对比结果',
+  addFullTextComment: '添加全文评论',
+  turnOffAutomaticMatching: '关闭自动匹配',
+  exportComparisonReport: '导出对比报告',
+  comparisonDifferenceComment: '对比差异评论',
+  fullTextComments: '全文评论',
+  fileDeclaration: '文件说明',
+  FileForDetails: '文件详情',
+  Converting: '转换中',
+  convertNetwork: '转换完成',
+  convertFailed: '转换失败',
+  standardData: '标准数据',
+  Theorganization: '组织机构',
+  Addingfolder: '新增文件夹',
+  Addingsubfolders: '新增子文件夹',
+  Editfolder: '编辑文件夹',
+  Deletefolders: '删除文件夹',
+  Foldername: '文件夹名称',
+  Folderpermissions: '文件夹权限',
+  Folderorder: '文件夹顺序',
+  Downloadprivileges: '下载权限',
+  Openpersonnel: '开放人员',
+  originalText: '原文',
+  translatedText: '译文',
+  Administrativeprivileges: '管理权限',
+  Checkthepermissions: '查看权限',
+  onlyFilesUploaded: '只能上传.docx、.doc文件',
+  uploadedbyyourself: '只能删除自己上传的文件数据',
+  doNotHavePermissionDeleteData: '没有权限删除此数据'
 }

jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue

@@ -257,7 +257,9 @@
                 serialNumber: this.selectedRowKeysRecord[0].serial_number,
                 title: this.selectedRowKeysRecord[0].title,
                 fileName: this.selectedRowKeysRecord[0].file_name,
-                textStatus: this.selectedRowKeysRecord[0].text_info_id
+                textStatus: this.selectedRowKeysRecord[0].text_info_id,
+                sourceFileId:this.selectedRowKeysRecord[0].id,
+                bussDocumentLibraryId:this.selectedRowKeysRecord[0].buss_document_library_id
               }
               this.confirmLoading = true
               postAction('/docTranslation/docTranslationEO/add', query).then((res) => {

jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue

@@ -16,52 +16,11 @@
               {{$t('originalText')}}
             </div>
             <div class="detail-text">
-              汽车用LED前照灯
+              <iframe :src="detailUrlLeft"
-
+                      ref="iframeLeft"
-              1 范围
+                      sandbox="allow-same-origin allow-scripts"
-
+                      id="iframe-left"
-              本标准规定了汽车用LED光源/模块或含有LED光源/模块的前照灯配光性能、光色、温度循环等试验方法和检验规则等，
+                      class="detail-text-iframe" frameborder="0"></iframe>
-              本标准适用于M、N类汽车使用的LED前照灯、或主要由LED光源或LED模块形成远光或近光的LED前照灯。
-
-              2 规范性引用文件
-
-              下列文件中的条款，通过本标准的引用而成为本标准的条款，凡是注日期的引用文件，其随后所有的修改单（不包括勘误的内容）或修订版均不适用于本标准，然而,鼓励根据本标准达成协议的各方研究是否可使用这些文件的最新版本。凡是不注日期的引用文件，其最新版本适用于本标准.
-              GB 4599—2007 汽车用灯丝灯泡前照灯
-              GB 4785 汽车及挂车外部照明和光信号装置的安装规定
-              GB/T 7922 照明光源颜色的测量方法
-              GB 15766.1 道路机动车辆灯丝灯泡 尺寸、光电性能要求
-
-              3 术语和定义
-
-              GB 4599—2007和GB 4785中确立的，以及下列术语和定义适用于本标准占
-              3. 1
-              目标光通量： objective luminous flux
-              可更换光源或光源模块光通量的设计值。
-              3.2
-              光源失效 failure of light source
-              LED或LED模块在正常使用条件下，一个或多个LED失去发光功能、变暗、色度超标、或出现闪烁的现象。
-              3.3
-              LED 模块 LED module
-              仅含有LED的光源模块。
-
-              4 前照灯的不同型式
-
-              在以下主要方面有差异的前照灯：
-              ——商品名称或商标；
-              ——光学系统的特性；
-              ——通过反射、折射、吸收和/或工作时的变形，改变光学效果的部件；
-              ——提供的光束种类（近光，远光或远、近光）；
-              ——配光镜及其涂层的材料；
-
-
-              ——LED光源/模块类型和参数（电压、功率、光通量、色度、显色性九
-              5 要求
-              5.1 一般要求
-              5.1. 1 LED前照灯应设计和制造成在正常使用条件下，即使受到振动，仍能保证满足使用要求和符合本标准规定。
-              5.1.2 LED前照灯应具有良好的散热性，防止LED光源热堆积，LED前照灯即使在低温凝冻的环境下仍能正常工作，
-              5.1.3 LED前照灯应具有良好的电磁兼容性能。
-              5.1.4 当前照灯装有LED光源或LED模块时其性能均应满足本标准要求；当LED前照灯中装有灯丝灯泡或HID光源实现远光或近光功能时，其配光性能和检测应分别满足其相应标准的要求，
-              5.1.5 前照灯应具有光束调整装置，当近光灯和远光灯形成一组合体，并各自装有LED光源/模块、灯丝灯泡（或灯光组）时，调整装置应能对它们分别进行调整,这些要求不适用于远光灯和近光灯不能单独调节的前照灯，
             </div>
           </div>
           <div class="detail-content-right">
@@ -69,64 +28,7 @@
               {{$t('translatedText')}}
             </div>
             <div class="detail-text">
-              LED headlamp for automobile
+              <iframe :src="detailUrlRight" class="detail-text-iframe" frameborder="0"></iframe>
-              one Range
-              This standard specifies the test methods and inspection rules for light distribution performance, light
-              color, temperature cycle, etc. of automotive LED light source / module or headlamp containing LED light
-              source / module,
-              This standard is applicable to LED headlamps used by M and N vehicles, or LED headlamps that mainly form
-              high beam or low beam by LED light source or LED module.
-              two Normative references
-              The provisions in the following documents become the provisions of this standard through the reference of
-              this standard. For dated references, all subsequent amendments (excluding the contents of Corrigendum) or
-              revisions are not applicable to this standard. However, parties to agreements based on this standard are
-              encouraged to study whether the latest versions of these documents can be used. For undated references,
-              the latest edition is applicable to this standard
-              GB 4599—2007 Automotive filament bulb headlamps
-              GB 4785 Provisions for the installation of exterior lighting and light signalling devices for automobiles
-              and trailers
-              GB/T 7922 Methods of measuring the color of lighting sources
-              GB 15766.1 Requirements for dimensions and photoelectric performance of filament bulbs for road motor
-              vehicles
-              three Terms and definitions
-              The terms and definitions established in GB 4599-2007 and GB 4785 and the following terms and definitions
-              are applicable to this standard
-              3. 1
-              Objective luminous flux
-              Design value of luminous flux of replaceable light source or light source module.
-              three point two
-              Failure of light source
-              Under normal use conditions of LED or LED module, one or more LEDs lose light-emitting function, darken,
-              chromaticity exceeds the standard, or flicker.
-              three point three
-              LED module
-              Light source module with led only.
-              four Different types of headlamps
-              Headlamps that differ in the following main respects:
-              ——Trade name or trademark;
-              ——Characteristics of optical system;
-              ——Components that change the optical effect through reflection, refraction, absorption and / or
-              deformation during operation;
-              ——Type of beam provided (low beam, high beam or high beam and low beam);
-              ——Materials of lens and its coating;
-              ——LED light source / module type and parameters (voltage, power, luminous flux, chromaticity, color
-              rendering IX
-              five requirement
-              five point one general requirements
-              5.1. one The LED headlamp shall be designed and manufactured to ensure that it can meet the use
-              requirements and comply with the provisions of this standard even if it is vibrated under normal
-              conditions of use.
-              5.1.2 The LED headlamp shall have good heat dissipation to prevent thermal accumulation of LED light
-              source. The LED headlamp can work normally even in the low-temperature freezing environment,
-              5.1.3 LED headlamp shall have good electromagnetic compatibility performance.
-              5.1.4 When the headlamp is equipped with LED light source or LED module, its performance shall meet the
-              requirements of this standard; When the LED headlamp is equipped with filament bulb or HID light source to
-              realize the function of high beam or low beam, its Photometric Performance and detection shall meet the
-              requirements of corresponding standards respectively,
-              5.1.5 The headlamp shall have a beam adjustment device. When the dipped beam and the high beam form a
-              combination and each is equipped with an LED light source / module and a filament bulb (or light group),
-              the adjustment device shall be able to adjust them respectively. These requirements do not apply to
-              headlamps where the high beam and the low beam cannot be adjusted separately,
             </div>
           </div>
         </div>
@@ -136,18 +38,42 @@
 </template>
 
 <script>
+  import { Base64 } from 'js-base64'
+
   export default {
     name: 'documentTranslationResults',
     data() {
-      return {}
+      return {
+        detailUrlLeft: '',
+        detailUrlRight: '',
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        fileQuery: {}
+      }
     },
     mounted() {
+      this.fileQuery = this.$route.query
+      this.onlinePreview()
+      setTimeout(() => {
+        this.$nextTick(() => {
+          this.$refs.iframeLeft.contentWindow.document.body.style = 'background-color:#fff'
+          console.log(this.$refs.iframeLeft.contentWindow.document.body.style.backgroundColor)
+        })
+      }, 2000)
+
     },
     methods: {
       Fallback() {
         this.$router.push({
           path: '/documentTranslation'
         })
+      },
+      onlinePreview() {
+        let fileName = this.fileQuery.fileName
+        let index1 = fileName.lastIndexOf('.')
+        let index2 = fileName.length
+        let fileSuffix = fileName.substring(index1, index2)
+        this.detailUrlLeft = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.sourceFileId + fileSuffix)
+        this.detailUrlRight = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.targetFileId + fileSuffix)
       }
     }
   }
@@ -225,10 +151,22 @@
     font-size: 14px;
     font-weight: 400;
     color: #040B29;
+    height: calc(100vh - 230px);
   }
 
   .page {
     text-align: right;
     margin-top: 20px;
   }
+
+  .detail-text-iframe {
+    width: 100%;
+    height: 100%;
+    border-width: 0px;
+  }
+</style>
+<style>
+  .detail-text-iframe .container {
+    display: none !important;
+  }
 </style>

jero-web/src/views/documentTools/documentTranslation/index.vue

@@ -100,6 +100,12 @@
              v-if="record.createBy == userInfoQuery.username && record.releaseCondition == 'draft'"
              @click="deleteData(record)">{{$t('delete')}}</a>
         </span>
+        <span slot="translationLanguage" slot-scope="text,record"
+              :title="record.sourceLanguage_dictText +' -- '+record.targetLanguage_dictText">
+            <span class="translationLanguageText" style="margin-top: -2px">{{record.sourceLanguage_dictText}}</span>
+            <a-icon class="translationLanguageText" type="arrow-right" style="font-size: 16px"/>
+            <span class="translationLanguageText">{{record.targetLanguage_dictText}}</span>
+        </span>
       </a-table>
       <div class="page" v-if="dataSource && dataSource.length > 0">
         <a-pagination
@@ -148,6 +154,7 @@
         pageNo: 1,
         queryParam: {},
         userInfoQuery: {},
+        selectedRowKeysRecord: [],
         columns: [
           {
             title: this.$t('standard'),
@@ -179,7 +186,8 @@
             title: this.$t('translationLanguage'),
             align: 'center',
             dataIndex: 'targetLanguage_dictText',
-            width: 170
+            width: 240,
+            scopedSlots: { customRender: 'translationLanguage' }
           },
           {
             title: this.$t('translationResults'),
@@ -269,12 +277,18 @@
           }
         })
       },
-      onSelectChange(value) {
+      onSelectChange(value, record) {
         this.selectedRowKeys = value
+        this.selectedRowKeysRecord = record
       },
       viewClick(row) {
         let newUrl = this.$router.resolve({
-          path: '/documentTranslationResults'
+          path: '/documentTranslationResults',
+          query: {
+            targetFileId: row.targetFileId,
+            sourceFileId: row.sourceFileId,
+            fileName: row.fileName
+          }
         })
         window.open(newUrl.href, '_blank')
       },
@@ -322,7 +336,15 @@
           this.$confirm({
             content: _this.$t('ConfirmBatchDeletion'),
             onOk() {
-              let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+              let idList = []
+              let selectedRowKeysRecord = JSON.parse(JSON.stringify(_this.selectedRowKeysRecord))
+              for (let i = 0; i < selectedRowKeysRecord.length; i++) {
+                if (selectedRowKeysRecord[i].createBy == _this.userInfo().username &&
+                  selectedRowKeysRecord[i].releaseCondition == 'draft') {
+                  idList.push(selectedRowKeysRecord[i].id)
+                }
+              }
+              if (idList.length > 0) {
                 deleteAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => {
                   if (res.success) {
                     _this.$message.success(_this.$t('OperationSuccessful'))
@@ -332,6 +354,9 @@
                     _this.$message.warning(res.message)
                   }
                 })
+              } else {
+                _this.$message.warning(_this.$t('doNotHavePermissionDeleteData'))
+              }
             }
           })
         } else {
@@ -413,4 +438,9 @@
     color: red;
     margin-right: 4px;
   }
+
+  .translationLanguageText {
+    margin-right: 4px;
+    display: inline-block;
+  }
 </style>