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

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

@@ -1160,4 +1160,5 @@ module.exports = {
   turnOffAutomaticMatching:'Turn Off Automatic Matching',
   Deriveconformanceresults:'Derive Conformance Results',
   Regulatorycompliancekanban:'Regulatory Compliance Kanban',
+  exportComparisonReport:'Export Comparison Report',
 }

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

@@ -1164,4 +1164,5 @@ module.exports = {
   viewTheComparisonResults:'查看对比结果',
   addFullTextComment:'添加全文评论',
   turnOffAutomaticMatching:'关闭自动匹配',
+  exportComparisonReport:'导出对比报告',
 }

jero-web/src/components/layouts/TabLayout.vue

@@ -98,6 +98,7 @@
           this.$route.path == '/projectStatusAndProgress' ||
           this.$route.path == '/TaskPlanList' ||
           this.$route.path == '/documentDataComparison' ||
+          this.$route.path == '/comparisonResults' ||
           this.$route.path == '/initiateDocumentComparison' ||
           this.$route.path == '/evaluationProcess' ||
           this.$route.path == '/evaluationResultsClause' ||

jero-web/src/config/router.config.js

@@ -392,6 +392,11 @@ export const constantRouterMap = [
     name: 'documentDataComparison',
     component: () => import(/* webpackChunkName: "user" */ '@/views/documentTools/documentComparison/components/documentDataComparison')
   },
+  {
+    path: '/comparisonResults',
+    name: 'comparisonResults',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/documentTools/documentComparison/components/comparisonResults')
+  },
   {
     path: '/handshakeProcess',
     name: 'handshakeProcess',

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

@@ -0,0 +1,185 @@
+<template>
+  <div class="doc-detail">
+    <div class="doc-detail-wrap">
+      <div class="doc-detail-header" style="position: fixed;top: 0">
+        <div class="doc-detail-title">
+             <span style="line-height: 66px;display: inline-block;float: left" @click="Fallback">
+               <a-icon type="arrow-left" style="margin-right: 6px;"/>
+             </span>
+          <span> {{$t('comparisonResults')}}</span>
+        </div>
+        <div class="doc-detail-right">
+          <div @click="exportComparisonReportClick" class="operator-text-text"
+               :title="$t('exportComparisonReport')">
+            <a-icon type="eye"/>
+            {{$t('exportComparisonReport')}}
+          </div>
+          <div @click="commentClick" class="operator-text-text"
+               :title="$t('comment')">
+            <a-icon type="message"/>
+            {{$t('comment')}}
+          </div>
+        </div>
+      </div>
+      <div style="padding-top: 68px;background: #fff">
+        <div class="detail-content">
+          <div class="detail-content-header">
+            <a-checkbox @change="onChange" style="margin-left: 20px;float: left"></a-checkbox>
+            <div class="detail-content-header-content">
+              <div class="detail-content-header-content-left">
+                所选标准：GB 23456-2020 机动车标准 FMVSS 114 中文.word
+              </div>
+              <div class="detail-content-header-content-content">
+                所选标准：GB 23456-2020 机动车标准 FMVSS 114 中文.word
+              </div>
+              <div class="detail-content-header-content-right">
+                操作
+              </div>
+            </div>
+          </div>
+          <a-checkbox-group @change="onChange">
+            <div class="detail-content-content">
+
+            </div>
+          </a-checkbox-group>
+        </div>
+      </div>
+    </div>
+    <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'comparisonResults',
+    data() {
+      return {
+        loading: false
+      }
+    },
+    methods: {
+      Fallback() {
+        this.$router.push({
+          path: '/documentComparison'
+        })
+      },
+      commentClick() {
+
+      },
+      exportComparisonReportClick() {
+
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  @import '~@assets/less/common.less';
+
+  .doc-detail {
+    background: #fff;
+    height: 100%;
+
+    .doc-detail-wrap {
+      .doc-detail-header {
+        width: 100%;
+        z-index: 1000;
+        height: 68px;
+        line-height: 68px;
+        padding: 0 0 0 32px;
+        box-sizing: border-box;
+        display: flex;
+        justify-content: space-between;
+        border-bottom: 2px #eff1f3 solid;
+        background: #fff;
+
+        .doc-detail-title {
+          display: inline-block;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
+          font-size: 20px;
+          font-weight: 400;
+          color: #040B29;
+          line-height: 68px;
+        }
+      }
+
+      .doc-detail-right {
+        width: 300px;
+        line-height: 68px;
+        /*display: flex;*/
+        text-align: right;
+
+        .doc-detail-btn {
+          margin-left: 10px;
+        }
+      }
+
+      .operator-text-text {
+        cursor: pointer;
+        margin-right: 53px;
+        font-size: 14px;
+        font-weight: 400;
+        color: #040B29;
+        display: inline-block;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        text-align: right;
+      }
+    }
+  }
+
+  .detail-content {
+    padding: 24px 32px;
+    box-sizing: border-box;
+  }
+
+  .detail-content-header {
+    width: 100%;
+    height: 56px;
+    line-height: 56px;
+  }
+
+  .detail-content-header-content {
+    width: calc(100% - 56px);
+    margin-left: 20px;
+    display: inline-block;
+    height: 56px;
+    font-size: 14px;
+    font-family: Blue Sky Noto;
+    font-weight: bold;
+    color: #040B29;
+
+    .detail-content-header-content-left {
+      width: calc(50% - 64px);
+      height: 56px;
+      display: inline-block;
+      background: rgba(4, 11, 41, 0.0300);
+      border-radius: 4px 0px 0px 4px;
+      border-right: 1px #EFF1F3 solid;
+      padding-left: 24px;
+    }
+
+    .detail-content-header-content-content {
+      width: calc(50% - 64px);
+      display: inline-block;
+      height: 56px;
+      background: rgba(4, 11, 41, 0.0300);
+      border-radius: 4px 0px 0px 4px;
+      border-right: 1px #EFF1F3 solid;
+      padding-left: 24px;
+    }
+
+    .detail-content-header-content-right {
+      width: 128px;
+      display: inline-block;
+      height: 56px;
+      background: rgba(4, 11, 41, 0.0300);
+      border-radius: 4px 0px 0px 4px;
+      padding-left: 24px;
+    }
+  }
+
+</style>

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

@@ -261,7 +261,7 @@
       },
       initiatingProcessClick(){
         let newUrl = this.$router.resolve({
-          path: '/documentDataComparison',
+          path: '/comparisonResults',
         })
         window.open(newUrl.href, '_blank')
       },

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

@@ -3,7 +3,7 @@
     <div class="Virtual-detail-header" style="position: fixed;top: 0">
       <div class="Virtual-detail-title">
         <span>
-          {{$t('ParameteItemCollectionList')}}
+          {{$t('ParameteItemCollectionList')}}(Model - year market)——{{$t(this.paramsManifest.title)}}
         </span>
       </div>
     </div>

jero-web/src/views/projectManagement/dialog/configure.vue

@@ -226,7 +226,8 @@
           if (res.success) {
             this.conFlag = res.result
             if (this.conFlag == true) {
-              this.paramsConfigEOList.splice(item.displaySeq + 1, 0, {
+              console.log(this.paramsConfigEOList)
+              this.paramsConfigEOList.splice(this.paramsConfigEOList.length + 1, 0, {
                 id: '',
                 configName: '', // 配置名称
                 version: '', // 版本

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

@@ -12,7 +12,7 @@
         <a-row :gutter='24'>
           <a-col :span='9'>
             <a-form-model-item :label="$t('areaOfResponsibility')">
-              <j-dict-select-tag class="box-input" v-model="formData.areaOfResponsibility"
+              <j-dict-select-tag class="box-input" v-model="formData.dutyTerritory"
                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'duty_territory'"/>
@@ -20,10 +20,10 @@
           </a-col>
           <a-col :span='9'>
             <a-form-model-item :label="$t('RelatedItems')" prop='ListTitle'>
-              <a-select class="box-input" v-model="formData.RelatedItems"
+              <a-select class="box-input" v-model="formData.projectName"
                         :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
-                <a-select-option v-for="(element,index) in item.RelatedItemList" :key="element.value" :value="element.value">
+                <a-select-option v-for="(element,index) in RelatedItemList" :key="element.id" :value="element.id">
-                  {{element.label}}
+                  {{element.projectName}}
                 </a-select-option>
               </a-select>
             </a-form-model-item>
@@ -195,9 +195,16 @@ export default {
   },
   mounted() {
     this.loadData()
-    console.log(this.item)
+    this.getRelatedItemList()
   },
   methods: {
+    getRelatedItemList(){
+      getAction('/project/projectNameInfoEO/list', {}).then((res) => {
+        if (res.success) {
+          this.RelatedItemList = res.result
+        }
+      })
+    },
     // 清单列表传出数据
     listVisibleRow(val) {
       this.selectedRowKeys = []

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

@@ -277,6 +277,7 @@ export default {
     deriveconformanceresults(){
       let query = {
         ...this.queryParam,
+        exportAll:'yes',
         ids: this.selectedRowKeys.join(',')
       }
       downloadFile('/project/lawsComplianceBoard/exportComplianceResult', this.$t('complianceResults')+'.xls', query, this.Deselect)