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

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')">
-                  <span>{{$t('collectResults')}}</span>
+                <div class="title-text" :title="$t('ProcessStatus')">
+                  <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/problemKnowledgeBase/components/countryCardView.vue

@@ -127,6 +127,7 @@
         applyMarkets: '',
         header_text: '',
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         url: {
           list: '/problemKnowledgeBase/countryCardTempEO/list',
           deleteOne: ''
@@ -153,10 +154,12 @@
         } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.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 + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
         } else {
           downloadFile('/sys/common/downLoadFile', fileQuery.contentFileName, { id: fileQuery.id })
         }

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue

@@ -662,12 +662,12 @@
         margin-top: 10px;
 
         .content-box-content-botton-text {
-          width: 118px;
+          max-width: 198px;
           height: 32px;
           display: inline-block;
           text-align: center;
           line-height: 32px;
-          padding: 0 6px;
+          padding: 0 10px;
           background: #EFF1F3;
           border-radius: 4px;
           text-overflow: ellipsis;

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue

@@ -200,6 +200,7 @@
         queryForm: {},
         isPraise: false,
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         isCollect: false
       }
     },
@@ -218,10 +219,12 @@
         } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.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 + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
         } else {
           downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
         }
@@ -491,12 +494,13 @@
         margin-top: 10px;
 
         .content-box-content-botton-text {
-          width: 140px;
+          max-width: 200px;
+          /*min-width: 120px;*/
           height: 32px;
           display: inline-block;
           text-align: center;
           line-height: 32px;
-          padding: 0 6px;
+          padding: 0 10px;
           background: #EFF1F3;
           border-radius: 4px;
           text-overflow: ellipsis;
@@ -509,7 +513,7 @@
           cursor: pointer;
 
           .file-text {
-            width: 90px;
+            width: calc(100% - 30px);
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
@@ -519,6 +523,7 @@
           }
 
           .icon-text {
+            width: 24px;
             font-size: 16px;
             overflow: hidden;
             margin-bottom: 9px;

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue

@@ -144,7 +144,7 @@
             width: 170
           },
           {
-            title: this.$t('chapterContents'),
+            title: this.$t('secondaryDirectory'),
             align: 'center',
             dataIndex: 'memoriesChapterName',
             ellipsis: true,

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue

@@ -108,6 +108,7 @@
         pageNo: 1,
         queryParam: {},
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         userData: {},
         columns: [
           {
@@ -216,10 +217,12 @@
         } else if (fileSuffix === '.docx' || fileSuffix === '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + 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 + '/' + item.fileId + fileSuffix)
+          window.open(url, '_blank')
         } else {
           if (item.createBy == this.userInfo().username) {
             downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username })

jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue

@@ -4,8 +4,9 @@
       <a-col :span="12">
         <div class="box-title-text">
           <div class="title-text">
-              <span class="title-text-text"
-                    :title="$t('title')">{{$t('title')}}</span>
+            <span class="Required" v-if="!disabled">*</span>
+            <span class="title-text-text"
+                  :title="$t('title')">{{$t('title')}}</span>
           </div>
           <a-form-model-item class="itemModel" prop="titleCn">
             <a-input class="box-input"
@@ -18,8 +19,9 @@
       <a-col :span="12">
         <div class="box-title-text">
           <div class="title-text">
-              <span class="title-text-text"
-                    :title="$t('englishTitle')">{{$t('englishTitle')}}</span>
+            <span class="Required" v-if="!disabled">*</span>
+            <span class="title-text-text"
+                  :title="$t('englishTitle')">{{$t('englishTitle')}}</span>
           </div>
           <a-form-model-item class="itemModel" prop="titleEn">
             <a-input class="box-input"
@@ -34,10 +36,11 @@
       <a-col :span="12">
         <div class="box-title-text">
           <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('technicalField')">{{$t('technicalField')}}</span>
+            <span class="Required" v-if="!disabled">*</span>
+            <span class="title-text-text"
+                  :title="$t('technicalField')">{{$t('technicalField')}}</span>
           </div>
-          <a-form-model-item class="itemModel-multi" prop="technologyTerritory">
+          <a-form-model-item class="itemModel" prop="technologyTerritory">
             <a-tree-select
               tree-node-filter-prop="title"
               v-model="formInline.technologyTerritory"
@@ -53,20 +56,20 @@
           </a-form-model-item>
         </div>
       </a-col>
-      <a-col :span="12">
-        <div class="box-title-text">
-          <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('implementationModel')">{{$t('implementationModel')}}</span>
-          </div>
-          <a-form-model-item class="itemModel" prop="implementCar">
-            <a-input class="box-input"
-                     :disabled="disabled"
-                     v-model.trim="formInline.implementCar"
-                     :placeholder="$t('PleaseEnter')+$t('implementationModel')"/>
-          </a-form-model-item>
-        </div>
-      </a-col>
+<!--      <a-col :span="12">-->
+<!--        <div class="box-title-text">-->
+<!--          <div class="title-text">-->
+<!--                <span class="title-text-text"-->
+<!--                      :title="$t('implementationModel')">{{$t('implementationModel')}}</span>-->
+<!--          </div>-->
+<!--          <a-form-model-item class="itemModel" prop="implementCar">-->
+<!--            <a-input class="box-input"-->
+<!--                     :disabled="disabled"-->
+<!--                     v-model.trim="formInline.implementCar"-->
+<!--                     :placeholder="$t('PleaseEnter')+$t('implementationModel')"/>-->
+<!--          </a-form-model-item>-->
+<!--        </div>-->
+<!--      </a-col>-->
       <!--      <a-col :span="12">-->
       <!--        <div class="box-title-text">-->
       <!--          <div class="title-text">-->
@@ -108,10 +111,10 @@
                     :title="$t('status')">{{$t('status')}}</span>
           </div>
           <a-form-model-item class="itemModel-multi itemModel-multi-one">
-            <j-multi-select-tag class="box-input" v-model="formInline.state"
+            <j-dict-select-tag class="box-input" v-model="formInline.state"
                                 :disabled="disabled"
                                 :placeholder="$t('PleaseSelect')+$t('status')"
-                                :type="'checkbox'"
+                                :type="'radio'"
                                 :triggerChange="false" :dictCode="'state'"/>
           </a-form-model-item>
         </div>
@@ -125,9 +128,9 @@
                     :title="$t('usage')">{{$t('usage')}}</span>
           </div>
           <a-form-model-item class="itemModel-multi itemModel-multi-one">
-            <j-multi-select-tag class="box-input" v-model="formInline.useMethod"
+            <j-dict-select-tag class="box-input" v-model="formInline.useMethod"
                                 :placeholder="$t('PleaseSelect')+$t('usage')"
-                                :type="'checkbox'"
+                                :type="'radio'"
                                 :disabled="disabled"
                                 :triggerChange="false" :dictCode="'yong4_fa3'"/>
           </a-form-model-item>
@@ -156,10 +159,11 @@
                       :title="$t('ImplementationDate')">{{$t('ImplementationDate')}}</span>
           </div>
           <a-form-model-item class="itemModel" prop="newCarImplementTime">
+<!--            :placeholder="$t('PleaseEnter')+$t('ImplementationDate')"-->
             <a-input class="box-input"
                      :disabled="disabled"
                      v-model.trim="formInline.newCarImplementTime"
-                     :placeholder="$t('PleaseEnter')+$t('ImplementationDate')"/>
+                     :placeholder="'202X.X.X'"/>
           </a-form-model-item>
         </div>
       </a-col>
@@ -170,10 +174,11 @@
                       :title="$t('vehicleInProductionDate')">{{$t('vehicleInProductionDate')}}</span>
           </div>
           <a-form-model-item class="itemModel" prop="productionCarImplementTime">
+<!--            $t('PleaseEnter')+$t('vehicleInProductionDate')-->
             <a-input class="box-input"
                      :disabled="disabled"
                      v-model.trim="formInline.productionCarImplementTime"
-                     :placeholder="$t('PleaseEnter')+$t('vehicleInProductionDate')"/>
+                     :placeholder="'202X.X.X'"/>
           </a-form-model-item>
         </div>
       </a-col>
@@ -185,6 +190,7 @@
       <a-col :span="24">
         <div class="box-title-text">
           <div class="title-text">
+            <span class="Required" v-if="!disabled">*</span>
             <span class="title-text-text" :title="$t('primaryCoverageCn')">{{$t('primaryCoverageCn')}}</span>
           </div>
           <a-form-model-item class="itemModel" prop="contentCn">
@@ -200,6 +206,7 @@
       <a-col :span="24">
         <div class="box-title-text">
           <div class="title-text">
+            <span class="Required" v-if="!disabled">*</span>
             <span class="title-text-text" :title="$t('primaryCoverageEn')">{{$t('primaryCoverageEn')}}</span>
           </div>
           <a-form-model-item class="itemModel" prop="contentEn">
@@ -245,9 +252,10 @@
       <a-col :span="24">
         <div class="box-title-text">
           <div class="title-text">
+            <span class="Required" v-if="!disabled">*</span>
             <span class="title-text-text" :title="$t('regulatoryContact')">{{$t('regulatoryContact')}}</span>
           </div>
-          <a-form-model-item class="itemModel">
+          <a-form-model-item class="itemModel" prop="lawsContactName">
             <PersonnelSelection
               :query="{db_field_name:'lawsContact',db_field_txt:$t('regulatoryContact')}"
               :personneQuery="formInline"
@@ -290,7 +298,19 @@
     data() {
       return {
         rules: {
+          lawsContactName:[
+            {
+              required: true,
+              message: this.$t('regulatoryContact') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
+          ],
           titleCn: [
+            {
+              required: true,
+              message: this.$t('title') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
             {
               max: 500,
               message: this.$t('title') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
@@ -298,6 +318,11 @@
             }
           ],
           titleEn: [
+            {
+              required: true,
+              message: this.$t('englishTitle') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
             {
               max: 500,
               message: this.$t('englishTitle') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
@@ -354,6 +379,11 @@
             }
           ],
           contentEn: [
+            {
+              required: true,
+              message: this.$t('primaryCoverageEn') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
             {
               max: 300,
               message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
@@ -361,11 +391,23 @@
             }
           ],
           contentCn: [
+            {
+              required: true,
+              message: this.$t('primaryCoverageCn') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
             {
               max: 300,
               message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
               trigger: 'blur'
             }
+          ],
+          technologyTerritory: [
+            {
+              required: true,
+              message: this.$t('technicalField') + this.$t('cannotEmpty'),
+              trigger: 'change'
+            }
           ]
         },
         formInline: {},

jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue

@@ -4,6 +4,7 @@
       <a-col :span="12">
         <div class="box-title-text">
           <div class="title-text">
+            <span class="Required" v-if="!disabled">*</span>
               <span class="title-text-text"
                     :title="$t('title')">{{$t('title')}}</span>
           </div>
@@ -18,6 +19,7 @@
       <a-col :span="12">
         <div class="box-title-text">
           <div class="title-text">
+            <span class="Required" v-if="!disabled">*</span>
               <span class="title-text-text"
                     :title="$t('englishTitle')">{{$t('englishTitle')}}</span>
           </div>
@@ -110,6 +112,7 @@
       <a-col :span="24">
         <div class="box-title-text">
           <div class="title-text">
+            <span class="Required" v-if="!disabled">*</span>
             <span class="title-text-text" :title="$t('primaryCoverageCn')">{{$t('primaryCoverageCn')}}</span>
           </div>
           <a-form-model-item class="itemModel" prop="contentCn">
@@ -125,6 +128,7 @@
       <a-col :span="24">
         <div class="box-title-text">
           <div class="title-text">
+            <span class="Required" v-if="!disabled">*</span>
             <span class="title-text-text" :title="$t('primaryCoverageEn')">{{$t('primaryCoverageEn')}}</span>
           </div>
           <a-form-model-item class="itemModel" prop="contentEn">
@@ -165,6 +169,11 @@
       return {
         rules: {
           titleCn: [
+            {
+              required: true,
+              message: this.$t('title') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
             {
               max: 500,
               message: this.$t('title') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
@@ -172,6 +181,11 @@
             }
           ],
           titleEn: [
+            {
+              required: true,
+              message: this.$t('englishTitle') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
             {
               max: 500,
               message: this.$t('englishTitle') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
@@ -221,6 +235,11 @@
             }
           ],
           contentEn: [
+            {
+              required: true,
+              message: this.$t('primaryCoverageEn') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
             {
               max: 300,
               message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
@@ -228,6 +247,11 @@
             }
           ],
           contentCn: [
+            {
+              required: true,
+              message: this.$t('primaryCoverageCn') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            },
             {
               max: 300,
               message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),

jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue

@@ -6,13 +6,14 @@
       :visible="visible"
       :confirm-loading="confirmLoading"
       :maskClosable="false"
+      :footer="null"
       @cancel="visible = false"
     >
-      <template slot="footer">
-        <a-button key="back" @click="visible = false">
-          {{$t('cancel')}}
-        </a-button>
-      </template>
+<!--      <template slot="footer">-->
+<!--        <a-button key="back" @click="visible = false">-->
+<!--          {{$t('cancel')}}-->
+<!--        </a-button>-->
+<!--      </template>-->
       <div style="margin-bottom: 10px;text-align: center">
         <div @click="handleModule" class="operator-text">
           <a-icon type="download"/>

jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue

@@ -39,22 +39,22 @@
             <!--            </div>-->
             <a-card :bordered="false" class="box-clause" style="margin-top: 20px"
                     v-for="(item,index) in dataSource">
-              <div class="table-operator-admin">
-                <div class="operator-text" v-if="item.id" :class="{'operator-text-feed':index == 0 ? true:false}"
-                     style="font-size: 16px">
-                  {{$t('engineer')+item.createBy+$t('feedbackResults')}}
-                </div>
-                <div class="text-results" v-if="item.id">
-                  {{$t('complianceResults')}}：{{item.complianceResultName}}
-                </div>
-              </div>
+              <!--              <div class="table-operator-admin">-->
+              <!--                <div class="operator-text" v-if="item.id" :class="{'operator-text-feed':index == 0 ? true:false}"-->
+              <!--                     style="font-size: 16px">-->
+              <!--                  {{$t('engineer')+item.createBy+$t('feedbackResults')}}-->
+              <!--                </div>-->
+              <!--                <div class="text-results" v-if="item.id">-->
+              <!--                  {{$t('complianceResults')}}：{{item.complianceResultName}}-->
+              <!--                </div>-->
+              <!--              </div>-->
               <div class="table-operator-admin-right">
                 <div @click="fileExportClick" v-if="index == 0" class="operator-text-index">
                   <a-icon type="export" :rotate="-90"/>
                   {{$t('fileExport')}}
                 </div>
+                <!--                style="margin-left: 18px"-->
                 <a-table
-                  style="margin-left: 18px"
                   ref="table"
                   size="middle"
                   :loading="loading"
@@ -96,8 +96,8 @@
       return {
         queryParam: {},
         dataSource: [],
-        userInfoQuery:{},
-        administrators:false,
+        userInfoQuery: {},
+        administrators: false,
         url: {
           list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/list',
           exportData: 'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip'
@@ -106,6 +106,44 @@
         loading: false,
 
         columns: [
+          {
+            title: this.$t('engineer'),
+            dataIndex: 'createBy',
+            align: 'center',
+            width: 160,
+            ellipsis: true,
+            customRender: (value, row, index) => {
+              const obj = {
+                children: value,
+                attrs: {}
+              }
+              if (index === 0) {
+                obj.attrs.rowSpan = row.indexData
+              } else {
+                obj.attrs.rowSpan = 0
+              }
+              return obj
+            }
+          },
+          {
+            title: this.$t('complianceResults'),
+            dataIndex: 'complianceResultName',
+            align: 'center',
+            width: 160,
+            ellipsis: true,
+            customRender: (value, row, index) => {
+              const obj = {
+                children: value,
+                attrs: {}
+              }
+              if (index === 0) {
+                obj.attrs.rowSpan = row.indexData
+              } else {
+                obj.attrs.rowSpan = 0
+              }
+              return obj
+            }
+          },
           {
             title: this.$t('relevantSections'),
             dataIndex: 'relatedSection',
@@ -190,6 +228,18 @@
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
             this.dataSource = res.result || []
+            if (this.dataSource && this.dataSource.length > 0) {
+              this.dataSource.forEach(val => {
+                if (val.lawsTechnologyEvaluationResultEOList && val.lawsTechnologyEvaluationResultEOList.length > 0) {
+                  val.lawsTechnologyEvaluationResultEOList.forEach(ol => {
+                    ol.indexData = val.lawsTechnologyEvaluationResultEOList.length
+                    ol.complianceResultName = val.complianceResultName
+                    ol.createBy = val.createBy
+                  })
+                }
+              })
+            }
+            console.log(this.dataSource)
             if (this.dataSource.length == 0) {
               this.dataSource.push({
                 name: ''
@@ -353,9 +403,10 @@
 
   .table-operator-admin-right {
     float: left;
-    width: calc(100% - 240px);
+    width: 100%;
     text-align: right;
-    border-left: 1px solid #e8e8e8;
+    margin-bottom: 20px;
+    /*border-left: 1px solid #e8e8e8;*/
   }
 
   .operator-text-index {

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,
-              flowStatus:row.flowStatus
+              createBy: row.createBy,
+              flowStatus: row.flowStatus
             }
           })
           window.open(newUrl.href, '_blank')
@@ -479,8 +486,8 @@
               lawsTechnologyEvaluationId: row.id,
               standId: row.standId,
               remark: row.remark,
-              createBy:row.createBy,
-              flowStatus:row.flowStatus
+              createBy: row.createBy,
+              flowStatus: row.flowStatus
             }
           })
           window.open(newUrl.href, '_blank')

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

@@ -33,6 +33,7 @@
         monthlyReportRegulationsList: [],
         loading: false,
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         url: {
           list: '/report/lawsMonthlyReportManageEO/page'
         }
@@ -74,10 +75,12 @@
         } else if (fileSuffix === '.docx' || fileSuffix === '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + 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 + '/' + item.fileId + fileSuffix)
+          window.open(url, '_blank')
         } else {
           if (item.createBy == this.userInfo().username){
             downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username })

jero-web/src/views/documentManage/library/docDetail/index.vue

@@ -319,6 +319,7 @@
         serial_number: '',
         confirmLoading: false,
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         loading: false,
         dataSource: [],
         pageNo: 1,
@@ -462,10 +463,12 @@
         } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.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 + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
         } else {
           downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
         }

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"
-                       :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}">
+                  <div class="detail-content-right-one">
+                    <div class="detail-content-left-button">
                       {{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>

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

@@ -196,6 +196,7 @@
         pageNoRight: 1,
         formInline: {},
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         rules: {
           remark: [
             {
@@ -388,10 +389,12 @@
           } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
             let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.fileId + fileSuffix)
             window.open(url, '_blank')
-          } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls'
-            || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+          } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
             let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.fileId + 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 + '/' + fileQuery.fileId + fileSuffix)
+            window.open(url, '_blank')
           } else {
             downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.fileId })
           }

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

@@ -126,6 +126,7 @@
         dataSource: [],
         selectedRowKeys: [],
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         total: 0,
         pageSize: 10,
         pageNo: 1,
@@ -422,10 +423,12 @@
         } else if (fileSuffix === '.docx' || fileSuffix === '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + row.fileIdLeft + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + row.fileIdLeft + 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 + '/' + row.fileIdLeft + fileSuffix)
+          window.open(url, '_blank')
         } else {
           downloadFile('/sys/common/downLoadFile', row.fileNameLeft, { id: row.fileIdLeft })
         }
@@ -440,10 +443,12 @@
         } else if (fileSuffix === '.docx' || fileSuffix === '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + row.fileIdRight + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + row.fileIdRight + 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 + '/' + row.fileIdRight + fileSuffix)
+          window.open(url, '_blank')
         } else {
           downloadFile('/sys/common/downLoadFile', row.fileNameRight, { id: row.fileIdRight })
         }

jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue

@@ -352,6 +352,7 @@
         selectModel: '',
         fileList: [],
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         queryParamSeach: '',
         mapOne: {},
         mapTwo: {},
@@ -696,10 +697,12 @@
         } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.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 + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
         } else {
           downloadFile('/sys/common/downLoadFile', fileQuery.fileName || fileQuery.file_name, { id: fileQuery.id })
         }

jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue

@@ -92,6 +92,7 @@
         total: 0,
         pageSize: 10,
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         pageNo: 1,
         queryParam: {}
       }
@@ -129,10 +130,12 @@
         } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_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 + '/' + item.file_id + fileSuffix)
+          window.open(url, '_blank')
         }
       },
       ResetSearch() {
@@ -151,10 +154,12 @@
         } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id.slice(0, 32) + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id.slice(0, 32) + 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 + '/' + fileQuery.id.slice(0, 32) + fileSuffix)
+          window.open(url, '_blank')
         } else {
           downloadFile('/sys/common/downLoadFile', fileQuery.file_name, { id: fileQuery.id.slice(0, 32) })
         }

jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue

@@ -132,6 +132,7 @@
         loading: false,
         fileList: [],
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         mapOne: {},
         mapTwo: {},
         queryParamOne: {},
@@ -267,10 +268,12 @@
         } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.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 + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
         } else {
           downloadFile('/sys/common/downLoadFile', fileQuery.fileName || fileQuery.file_name, { id: fileQuery.id })
         }

jero-web/src/views/documentTools/searchCenter/components/whole.vue

@@ -116,6 +116,7 @@
         total: 0,
         pageSize: 10,
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         pageNo: 1,
         queryParam: {}
       }
@@ -170,10 +171,12 @@
         } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id.slice(0, 32) + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id.slice(0, 32) + 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 + '/' + fileQuery.id.slice(0, 32) + fileSuffix)
+          window.open(url, '_blank')
         } else {
           downloadFile('/sys/common/downLoadFile', fileQuery.file_name, { id: fileQuery.id.slice(0, 32) })
         }
@@ -239,10 +242,12 @@
         } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_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 + '/' + item.file_id + fileSuffix)
+          window.open(url, '_blank')
         }
       },
       titleClick(item) {

jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue

@@ -279,6 +279,7 @@
         components: {},
         visibleFile: false,
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         dataSourceFile: [],
         columnsFile: [
           {
@@ -830,10 +831,12 @@
         } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.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 + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
         } else {
           downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
         }
@@ -848,10 +851,12 @@
         } 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'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } 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 })
         }

jero-web/src/views/externalReports/index.vue

@@ -619,7 +619,23 @@ export default {
       let supFolder = ''
       this.supFolder = this.nodeItem.key
       this.addSub = false
-      this.menuRightVisible = true
+      let params = {}
+      let long = localStorage.getItem('language')
+      let cut = ''
+      if (long && long == 'zh-cn') {
+        this.cut = 'cn'
+      } else if (long && long == 'en-us') {
+        this.cut = 'en'
+      }
+      params.id = this.supFolder
+      params.cut = this.cut
+      postAction(`extRepo/extRepoFolder/isAllowSiblingFolder`, params).then(res => {
+        if (res.success) {
+          this.menuRightVisible = true
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
 
     },
     orgAdds(){

jero-web/src/views/processCenter/components/standardContentList.vue

@@ -71,6 +71,7 @@
       return {
         dataSource: [],
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         columns: [
           {
             title: this.$t('ProcessType'),
@@ -187,10 +188,12 @@
         } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.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 + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
         } else {
           downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
         }
@@ -205,10 +208,12 @@
         } 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'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } 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 })
         }

jero-web/src/views/projectManagement/components/addModel.vue

@@ -112,6 +112,7 @@
                 <PersonnelSelection
                   :query="{db_field_name:'certificationEngineer',db_field_txt:$t('certifiedEngineer')}"
                   :personneQuery="formInline"
+                  :selectDepartment="true"
                   @change="PersonnelSelectionChange"
                   :disabled="disabled"
                   v-model="formInline.certificationEngineerName"/>

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -848,6 +848,7 @@
           AndUserIdEdit: '/project/projectLibraryRoleRelEO/edit'
         },
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         loading: false,
         dataSource: [],
         isResultReported: false,
@@ -2126,10 +2127,12 @@
         } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.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 + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
         } else {
           downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
         }
@@ -2145,10 +2148,12 @@
         } 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'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } 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, userName: this.userInfo().username })
         }

jero-web/src/views/projectManagement/components/resultReportedUpload.vue

@@ -49,6 +49,7 @@
         myuploadAction: window._CONFIG['domianURL'] + this.thisFileUploadUrl,
         upDataList: [],
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         fileList: [],
         myfileList: [],
         isLoding: false,
@@ -214,10 +215,12 @@
         } else if (fileSuffix === '.docx' || fileSuffix === '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.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 + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
         } else {
           downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id,userName:this.userInfo().username })
         }

jero-web/src/views/projectManagement/historicalVersion/index.vue

@@ -363,6 +363,7 @@
           list: '/project/projectVersionInfoEO/list'
         },
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
         loading: false,
         dataSource: [],
         // fieldList      | array   |✔| 需要查询的列集合示例如下，type类型有:date/datetime/string/int/number
@@ -468,10 +469,12 @@
         } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
-        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.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 + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
         } else {
           downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
         }
@@ -486,10 +489,12 @@
         } 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'
-          || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+        } 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 })
         }