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

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

@@ -1312,8 +1312,9 @@ module.exports = {
   firstLevelDirectory:'First level directory',
   deselectAll:'Deselect All',
   classification:'Classification',
-  consistentAssessment:'Consistent assessment',
+  consistentAssessment:'Consistent',
-  viewConsistentAssessment:'View Consistent Assessment',
+  viewConsistentAssessment:'View Consistent',
+  viewVarianceAssessment:'View Variance',
   viewAll:'View All',
   endProcess:'End Process',
   thereForTheCurrentlySelectedData:'There is no standard breakdown for the currently selected data',

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

@@ -1413,8 +1413,9 @@ module.exports = {
   firstLevelDirectory:'一级目录',
   deselectAll:'取消全选',
   classification:'分类',
-  consistentAssessment:'一致评估',
+  consistentAssessment:'一致',
-  viewConsistentAssessment:'查看一致评估',
+  viewConsistentAssessment:'查看一致项',
+  viewVarianceAssessment:'查看差异项',
   viewAll:'查看全部',
   endProcess:'结束流程',
   thereForTheCurrentlySelectedData:'当前所选数据暂无标准分解单',

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue

@@ -41,10 +41,10 @@
           <template v-if="toggleSearchStatus">
             <a-col :md="6" :sm="8">
               <div class="box-title-text">
-                <div class="title-text" :title="$t('collectResults')">
+                <div class="title-text" :title="$t('ProcessStatus')">
-                  <span>{{$t('collectResults')}}</span>
+                  <span>{{$t('ProcessStatus')}}</span>
                 </div>
-                <a-select :placeholder="$t('PleaseSelect')+$t('collectResults')"
+                <a-select :placeholder="$t('PleaseSelect')+$t('ProcessStatus')"
                           class="box-input"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear
@@ -187,7 +187,7 @@
             dataIndex: 'technologyTerritoryName'
           },
           {
-            title: this.$t('collectResults'),
+            title: this.$t('ProcessStatus'),
             align: 'center',
             width: 140,
             ellipsis: true,

jero-web/src/views/businessSupport/technologyAssessment/index.vue

@@ -262,6 +262,13 @@
             ellipsis: true,
             dataIndex: 'flowStatusName'
           },
+          {
+            title: this.$t('Sponsor'),
+            align: 'center',
+            width: 140,
+            ellipsis: true,
+            dataIndex: 'createBy'
+          },
           {
             title: this.$t('dateOfInitiation'),
             align: 'center',
@@ -464,8 +471,8 @@
               lawsTechnologyEvaluationId: row.id,
               standId: row.standId,
               remark: row.remark,
-              createBy:row.createBy,
+              createBy: row.createBy,
-              flowStatus:row.flowStatus
+              flowStatus: row.flowStatus
             }
           })
           window.open(newUrl.href, '_blank')
@@ -479,8 +486,8 @@
               lawsTechnologyEvaluationId: row.id,
               standId: row.standId,
               remark: row.remark,
-              createBy:row.createBy,
+              createBy: row.createBy,
-              flowStatus:row.flowStatus
+              flowStatus: row.flowStatus
             }
           })
           window.open(newUrl.href, '_blank')

jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue

@@ -9,12 +9,21 @@
           <span> {{$t('comparisonResults')}}</span>
         </div>
         <div class="doc-detail-right">
+          <div @click="viewVarianceAssessmentClick"
+               class="operator-text-text"
+               :class="{'operator-text-text-text':isVarianceOne?true:false}"
+               :title="$t('viewVarianceAssessment')">
+            <a-icon type="eye"/>
+            {{$t('viewVarianceAssessment')}}
+          </div>
           <div @click="viewConsistentAssessmentClick" class="operator-text-text"
+               :class="{'operator-text-text-text':isVarianceTwo?true:false}"
                :title="$t('viewConsistentAssessment')">
             <a-icon type="eye"/>
             {{$t('viewConsistentAssessment')}}
           </div>
           <div @click="viewAllClick" class="operator-text-text"
+               :class="{'operator-text-text-text':isVarianceThe?true:false}"
                :title="$t('viewAll')">
             <a-icon type="eye"/>
             {{$t('viewAll')}}
@@ -40,12 +49,19 @@
               <div class="detail-content-header-content-left"
                    :title="resultData.serialNumberLeft + resultData.fileNameLeft"
                    :class="{'detail-content-header-content-left-active':isDisplay}">
-                {{$t('selectedStandard')}}：{{resultData.serialNumberLeft}} {{resultData.fileNameLeft}}
+                {{$t('selectedStandard')}}：{{resultData.serialNumberLeft}}
+                <span style="cursor: pointer"
+                      @click="fileClick(resultData.fileNameLeft,resultData.fileIdLeft)">{{resultData.fileNameLeft}}</span>
               </div>
               <div class="detail-content-header-content-content"
                    :title="resultData.serialNumberRight + resultData.fileNameRight"
                    :class="{'detail-content-header-content-left-active':isDisplay}">
-                {{$t('selectedStandard')}}：{{resultData.serialNumberRight}} {{resultData.fileNameRight}}
+                {{$t('selectedStandard')}}：{{resultData.serialNumberRight}}
+                <span style="cursor: pointer"
+                      @click="fileClick(resultData.fileNameRight,resultData.fileIdRight)">{{resultData.fileNameRight}}</span>
+              </div>
+              <div class="detail-content-header-content-rightOne">
+                {{$t('comparisonDifferenceComment')}}
               </div>
               <div class="detail-content-header-content-right" v-if="!isDisplay">
                 {{$t('operation')}}
@@ -75,19 +91,24 @@
                     </div>
                     <div class="detail-content-left-button" v-html="item.itemsTextRight"></div>
                   </div>
-                  <div class="detail-content-bottom"
+                  <div class="detail-content-right-one">
-                       :class="{'detail-content-bottom-color':checkboxList.join(',').includes(item.id)}">
+                    <div class="detail-content-left-button">
-                    <div class="detail-content-bottom-left"
-                         :class="{'detail-content-bottom-left-text':language == 'en-us' ? true:false}"
-                         :title="$t('comparisonDifferenceComment')">
-                      <a-icon type="message"/>
-                      {{$t('comparisonDifferenceComment')}}:
-                    </div>
-                    <div class="detail-content-bottom-right"
-                         :class="{'detail-content-bottom-right-text':language == 'en-us' ? true:false}">
                       {{item.comment}}
                     </div>
                   </div>
+                  <!--                  <div class="detail-content-bottom"-->
+                  <!--                       :class="{'detail-content-bottom-color':checkboxList.join(',').includes(item.id)}">-->
+                  <!--                    <div class="detail-content-bottom-left"-->
+                  <!--                         :class="{'detail-content-bottom-left-text':language == 'en-us' ? true:false}"-->
+                  <!--                         :title="$t('comparisonDifferenceComment')">-->
+                  <!--                      <a-icon type="message"/>-->
+                  <!--                      {{$t('comparisonDifferenceComment')}}:-->
+                  <!--                    </div>-->
+                  <!--                    <div class="detail-content-bottom-right"-->
+                  <!--                         :class="{'detail-content-bottom-right-text':language == 'en-us' ? true:false}">-->
+                  <!--                      {{item.comment}}-->
+                  <!--                    </div>-->
+                  <!--                  </div>-->
                 </div>
                 <div class="detail-content-content-text-right" v-if="!isDisplay">
                   <span class="text-button-one">
@@ -167,6 +188,8 @@
   import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
   import commentList from './commentList'
   import { putAction } from '../../../../api/manage'
+  import { Base64 } from 'js-base64'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'comparisonResults',
@@ -177,7 +200,12 @@
       return {
         loading: false,
         checkboxList: [],
+        isVarianceOne: false,
+        isVarianceTwo: false,
+        isVarianceThe: false,
         confirmLoading: false,
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         visible: false,
         formInlineText: {},
         rulesText: {},
@@ -205,6 +233,7 @@
       this.getData()
     },
     methods: {
+      ...mapGetters(['userInfo']),
       Fallback() {
         this.$router.push({
           path: '/documentComparison'
@@ -232,12 +261,45 @@
       },
       viewConsistentAssessmentClick() {
         this.comment = '一致'
+        this.isVarianceTwo = true
+        this.isVarianceOne = false
+        this.isVarianceThe = false
+        this.getData()
+      },
+      viewVarianceAssessmentClick() {
+        this.isVarianceOne = true
+        this.isVarianceTwo = false
+        this.isVarianceThe = false
+        this.comment = '差异'
         this.getData()
       },
       viewAllClick() {
         this.comment = ''
+        this.isVarianceThe = true
+        this.isVarianceOne = false
+        this.isVarianceTwo = false
         this.getData()
       },
+      fileClick(name, id) {
+        let fileName = name
+        let index1 = fileName.lastIndexOf('.')
+        let index2 = fileName.length
+        let fileSuffix = fileName.substring(index1, index2)
+        if (fileSuffix == '.pdf') {
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + id + '&userName=' + this.userInfo().username))
+        } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + id + fileSuffix)
+          window.open(url, '_blank')
+        } else {
+          downloadFile('/sys/common/downLoadFile', name, { id: id })
+        }
+      },
       getData() {
         let query = {
           id: this.$route.query.id,
@@ -466,7 +528,7 @@
     color: #040B29;
 
     .detail-content-header-content-left {
-      width: calc(50% - 64px);
+      width: calc(50% - 194px);
       height: 56px;
       display: inline-block;
       background: rgba(4, 11, 41, 0.0300);
@@ -479,7 +541,7 @@
     }
 
     .detail-content-header-content-content {
-      width: calc(50% - 64px);
+      width: calc(50% - 194px);
       display: inline-block;
       height: 56px;
       background: rgba(4, 11, 41, 0.0300);
@@ -491,6 +553,19 @@
       white-space: nowrap;
     }
 
+    .detail-content-header-content-rightOne {
+      width: 260px;
+      display: inline-block;
+      height: 56px;
+      background: rgba(4, 11, 41, 0.0300);
+      border-radius: 4px 0px 0px 4px;
+      padding-left: 24px;
+      border-right: 1px #EFF1F3 solid;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
     .detail-content-header-content-right {
       width: 128px;
       display: inline-block;
@@ -562,7 +637,7 @@
   }
 
   .detail-content-left {
-    width: 50%;
+    width: calc(50% - 130px);
     display: inline-block;
     float: left;
     padding-right: 24px;
@@ -570,10 +645,20 @@
   }
 
   .detail-content-right {
-    width: 50%;
+    width: calc(50% - 104px);
     display: inline-block;
     float: left;
     padding-left: 24px;
+    padding-right: 24px;
+    border-right: 1px #EFF1F3 solid;
+  }
+
+  .detail-content-right-one {
+    width: 234px;
+    display: inline-block;
+    float: left;
+    padding-left: 24px;
+    /*border-right: 1px #EFF1F3 solid;*/
   }
 
   .detail-content-left-top {
@@ -675,4 +760,7 @@
   .detail-content-bottom-right-text {
     width: calc(50% - 256px);
   }
+  .operator-text-text-text{
+     color: #00B3BE!important;
+  }
 </style>