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/project/controller/LawsComplianceBoardController.java

@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 @Api(tags="法规符合性看板")
@@ -42,4 +44,26 @@ public class LawsComplianceBoardController {
         JSONObject result = this.lawsComplianceBoardService.queryComplianceResultList(params);
         return Result.OK(result);
     }
+
+    /**
+     * 导出符合性结果
+     * @param response
+     * @param request
+     * @param params
+     */
+    @RequestMapping(value = "/exportComplianceResult")
+    public void exportComplianceResult(HttpServletResponse response, HttpServletRequest request,@RequestParam Map<String,Object> params){
+        this.lawsComplianceBoardService.exportComplianceResult(response,request,params);
+    }
+
+    /**
+     * 导出符合性结果明细
+     * @param response
+     * @param request
+     * @param params
+     */
+    @RequestMapping(value = "/exportComplianceResultDetail")
+    public void exportComplianceResultDetail(HttpServletResponse response, HttpServletRequest request,@RequestParam Map<String,Object> params){
+        this.lawsComplianceBoardService.exportComplianceResultDetail(response,request,params);
+    }
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/LawsComplianceBoardMapper.java

@@ -8,7 +8,7 @@ import java.util.Map;
 
 public interface LawsComplianceBoardMapper {
     /**
-     * 查询出 启动过 设计、prehomo、验证符合性、法规技术评估、法规意见收集其中一个流程 的数据
+     * 分页查询出 启动过 设计、prehomo、验证符合性、法规技术评估、法规意见收集其中一个流程 的数据
      * @param page
      * @param params
      * @return
@@ -21,4 +21,11 @@ public interface LawsComplianceBoardMapper {
      * @return
      */
     List<Map<String, Object>> queryComplianceResultList(@Param("params") Map<String, Object> params);
+
+    /**
+     * 查询出 启动过 设计、prehomo、验证符合性、法规技术评估、法规意见收集其中一个流程 的数据列表
+     * @param params
+     * @return
+     */
+    List<Map<String, Object>> queryList(Map<String, Object> params);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml

@@ -62,4 +62,41 @@
                 and pni.project_name like CONCAT(CONCAT('%',#{params.projectName}),'%')
             </if>
     </select>
+
+    <select id="queryList" resultType="hashMap">
+        SELECT
+            bdl.id as "id",
+            bdl.serial_number as "serialNumber",
+            bdl.title as "title",
+            bdl.technology_territory as "technologyTerritory",
+            bdl.state as "state",
+            bdl.create_time as "createTime"
+        FROM
+            buss_document_library bdl
+                LEFT JOIN project_laws_inventory pli ON ( pli.stand_id = bdl.id )
+                LEFT JOIN project_task_inventory pti ON ( pli.id = pti.project_laws_inventory_id )
+        WHERE
+            (
+                    bdl.id IN ( SELECT DISTINCT stand_id FROM laws_opinion_gather)
+                    OR bdl.id IN ( SELECT DISTINCT stand_id FROM laws_technology_evaluation)
+                    or pti.design_p_id IS NOT NULL
+                    OR pti.prehomo_p_id IS NOT NULL
+                    OR pti.verify_p_id IS NOT NULL
+                )
+            ${params.condition}
+        GROUP BY bdl.id
+        order by bdl.create_time desc
+    </select>
+
+    <sql id="Base_Where_Clause">
+        where 1=1
+        <trim suffixOverrides="," >
+            <if test="id != null" >
+                and id ${idOperator} #{id}
+            </if>
+            <if test="type != null" >
+                and type ${typeOperator} #{type}
+            </if>
+        </trim>
+    </sql>
 </mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/ILawsComplianceBoardService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.common.api.vo.Result;
 import net.sf.json.JSONObject;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 public interface ILawsComplianceBoardService {
@@ -15,4 +17,20 @@ public interface ILawsComplianceBoardService {
      * @return
      */
     JSONObject queryComplianceResultList(Map<String, Object> params);
+
+    /**
+     * 导出符合性结果
+     * @param response
+     * @param request
+     * @param params
+     */
+    void exportComplianceResult(HttpServletResponse response, HttpServletRequest request, Map<String, Object> params);
+
+    /**
+     * 导出符合性结果明细
+     * @param response
+     * @param request
+     * @param params
+     */
+    void exportComplianceResultDetail(HttpServletResponse response, HttpServletRequest request, Map<String, Object> params);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java

@@ -3,6 +3,8 @@ package com.jero.modules.project.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.exception.JeroBootException;
 import com.jero.modules.document.enums.FieldTypeEnum;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
 import com.jero.modules.document.vo.QueryConditionVO;
@@ -16,12 +18,19 @@ import com.jero.modules.system.util.StringUtils;
 import net.sf.json.JSONObject;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -83,6 +92,145 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
         return result;
     }
 
+    @Override
+    public void exportComplianceResult(HttpServletResponse response, HttpServletRequest request, Map<String, Object> params) {
+        String cut = (String) params.get("cut");
+        String condition = this.getConditionStr(params);
+        params.put("condition",condition);
+        List<Map<String,Object>> exportData = this.lawsComplianceBoardMapper.queryList(params);
+        if(CollectionUtils.isNotEmpty(exportData)){
+            String title = "";
+            String fileName = "";
+            if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+                title = "编号,标题,状态,技术领域,责任领域,相关项目,设计符合性,Pre-Homo确认,验证符合性";
+                fileName = "符合性结果" + ".xlsx";
+            }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+                title = "Serial number,Title,State,Technology territory,Responsible Field,Relevant project,Design conformance,Pre-Homo Confirm,Verify conformance";
+                fileName = "Compliance results" + ".xlsx";
+            }
+            OutputStream os = null;
+            HSSFWorkbook workbook = new HSSFWorkbook();
+
+            try {
+                response.setHeader("Content-Disposition",
+                        "attachment; filename=" + fileName);
+                response.setContentType("application/force-download");
+
+                HSSFSheet sheet = workbook.createSheet("sheet1");
+
+                CellStyle titleCellStyle = workbook.createCellStyle();
+                titleCellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
+                titleCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中
+                titleCellStyle.setWrapText(true);//自动换行
+
+                //创建表头
+                String[] firstLineTitleArr = title.split(",");
+                Row firstRow = sheet.createRow(0);
+
+                //设置居中、表头值。
+                for (int i = 0; i <= firstLineTitleArr.length; i++){
+                    Cell cell = firstRow.createCell(i);
+                    cell.setCellStyle(titleCellStyle);
+                    cell.setCellValue(firstLineTitleArr[i]);
+                }
+
+                //设置导出数据
+                if(CollectionUtils.isNotEmpty(exportData)) {
+                    int rowIndex = 1;
+                    for (int dataIndex = 0; dataIndex < exportData.size(); dataIndex++) {
+                        Row dataRow = sheet.createRow(rowIndex);
+                        dataRow.createCell(0).setCellValue(exportData.get(dataIndex).get("serialNumber").toString());
+                        dataRow.createCell(1).setCellValue(exportData.get(dataIndex).get("title").toString());
+                        dataRow.createCell(2).setCellValue(exportData.get(dataIndex).get("state").toString());
+                        dataRow.createCell(3).setCellValue(exportData.get(dataIndex).get("technologyTerritory").toString());
+
+                        dataRow.createCell(4).setCellValue(exportData.get(dataIndex).get("dutyTerritory").toString());
+                        dataRow.createCell(5).setCellValue(exportData.get(dataIndex).get("projectName").toString());
+                        dataRow.createCell(6).setCellValue(exportData.get(dataIndex).get("designStatus").toString());
+                        dataRow.createCell(7).setCellValue(exportData.get(dataIndex).get("prehomoStats").toString());
+                        dataRow.createCell(8).setCellValue(exportData.get(dataIndex).get("verifyStatus").toString());
+                        rowIndex ++;
+                    }
+                }
+                os = response.getOutputStream();
+                workbook.write(os);
+                os.flush();
+            }catch (IOException ex){
+                if(CutEnum.CN.getValue().equals(cut)){
+                    throw new JeroBootException("下载文件失败");
+                }else{
+                    throw new JeroBootException("Failed to download file");
+                }
+            }
+        }
+    }
+
+    @Override
+    public void exportComplianceResultDetail(HttpServletResponse response, HttpServletRequest request, Map<String, Object> params) {
+        String cut = (String) params.get("cut");
+        List<Map<String,Object>> exportData = this.lawsComplianceBoardMapper.queryComplianceResultList(params);
+        if(CollectionUtils.isNotEmpty(exportData)){
+            String title = "";
+            String fileName = "";
+            if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+                title = "责任领域,相关项目,设计符合性,Pre-Homo确认,验证符合性";
+                fileName = "符合性结果" + ".xlsx";
+            }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+                title = "Responsible Field,Relevant project,Design conformance,Pre-Homo Confirm,Verify conformance";
+                fileName = "Compliance results" + ".xlsx";
+            }
+            OutputStream os = null;
+            HSSFWorkbook workbook = new HSSFWorkbook();
+
+            try {
+                response.setHeader("Content-Disposition",
+                        "attachment; filename=" + fileName);
+                response.setContentType("application/force-download");
+
+                HSSFSheet sheet = workbook.createSheet("sheet1");
+
+                CellStyle titleCellStyle = workbook.createCellStyle();
+                titleCellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中
+                titleCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中
+                titleCellStyle.setWrapText(true);//自动换行
+
+                //创建表头
+                String[] firstLineTitleArr = title.split(",");
+                Row firstRow = sheet.createRow(0);
+
+                //设置居中、表头值。
+                for (int i = 0; i <= firstLineTitleArr.length; i++){
+                    Cell cell = firstRow.createCell(i);
+                    cell.setCellStyle(titleCellStyle);
+                    cell.setCellValue(firstLineTitleArr[i]);
+                }
+
+                //设置导出数据
+                if(CollectionUtils.isNotEmpty(exportData)) {
+                    int rowIndex = 1;
+                    for (int dataIndex = 0; dataIndex < exportData.size(); dataIndex++) {
+                        Row dataRow = sheet.createRow(rowIndex);
+                        dataRow.createCell(0).setCellValue(exportData.get(dataIndex).get("dutyTerritory").toString());
+                        dataRow.createCell(1).setCellValue(exportData.get(dataIndex).get("projectName").toString());
+                        dataRow.createCell(2).setCellValue(exportData.get(dataIndex).get("designStatus").toString());
+                        dataRow.createCell(3).setCellValue(exportData.get(dataIndex).get("prehomoStats").toString());
+                        dataRow.createCell(4).setCellValue(exportData.get(dataIndex).get("verifyStatus").toString());
+                        rowIndex ++;
+                    }
+                }
+                os = response.getOutputStream();
+                workbook.write(os);
+                os.flush();
+            }catch (IOException ex){
+                if(CutEnum.CN.getValue().equals(cut)){
+                    throw new JeroBootException("下载文件失败");
+                }else{
+                    throw new JeroBootException("Failed to download file");
+                }
+            }
+        }
+    }
+
 
     @NotNull
     public String getConditionStr(Map<String, Object> parameter) {
@@ -184,6 +332,19 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi
             }
         }
 
+        String ids = (String) parameter.get("ids");
+        if(StringUtils.isNotEmpty(ids)){
+            List<String> idList = Arrays.asList(ids.split(","));
+            String idStr = "";
+            for (String id : idList) {
+                idStr += "'"+id+"',";
+            }
+            if(StringUtils.isNotEmpty(idStr)){
+                idStr = idStr.substring(0,idStr.length()-1);
+                conditionSb.append(" and id in("+idStr+")");
+            }
+        }
+
         //处理列表表头排序
         /*if (StringUtils.isNotBlank((String) parameter.get("orderByField"))) {
             conditionSb.append(" order by " + (String) parameter.get("orderByField"));

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

@@ -1151,6 +1151,9 @@ module.exports = {
   CommentsCollectionResultsForReference:'Comments Collection Results For Reference',
   TechnicalEvaluationResultsForReference:'Technical Evaluation Results For Reference',
   ComplianceConfirmationRecord:'Compliance Confirmation Record',
+  noComparisonDocumentSelected:'No comparison document selected',
+  RemarkInfo:'Remarks Info',
+  initiateDocumentComparison:'Initiate Document Comparison',
   Deriveconformanceresults:'Derive Conformance Results',
   Regulatorycompliancekanban:'Regulatory Compliance Kanban',
 }

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

@@ -1157,4 +1157,7 @@ module.exports = {
   ComplianceConfirmationRecord:'符合性确认记录',
   Deriveconformanceresults:'导出符合性结果',
   Regulatorycompliancekanban:'法规符合性看板',
+  noComparisonDocumentSelected:'未选择对比文档',
+  RemarkInfo:'备注信息',
+  initiateDocumentComparison:'发起文档对比',
 }

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

@@ -97,6 +97,7 @@
           this.$route.path == '/handshakeProcess' ||
           this.$route.path == '/projectStatusAndProgress' ||
           this.$route.path == '/TaskPlanList' ||
+          this.$route.path == '/initiateDocumentComparison' ||
           this.$route.path == '/evaluationProcess' ||
           this.$route.path == '/evaluationResultsClause' ||
           this.$route.path == '/evaluationResultsWhole' ||

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

@@ -382,6 +382,11 @@ export const constantRouterMap = [
     name: 'evaluationProcess',
     component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/evaluationProcess/index')
   },
+  {
+    path: '/initiateDocumentComparison',
+    name: 'initiateDocumentComparison',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/documentTools/documentComparison/components/initiateComparison')
+  },
   {
     path: '/handshakeProcess',
     name: 'handshakeProcess',

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

@@ -0,0 +1,445 @@
+<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('initiateComparison')}}</span>
+        </div>
+      </div>
+      <div style="padding-top: 68px;background: #fff">
+        <div class="detail-content">
+          <div style="width: 100%;height: auto;overflow: hidden">
+            <div class="detail-content-left">
+              <a-form layout="inline" @keyup.enter.native="searchQueryLeft">
+                <a-row :gutter="24">
+                  <a-col :md="8" :sm="8">
+                    <div class="box-title-text">
+                      <div class="title-text" :title="$t('standard')">
+                        <span>{{$t('standard')}}</span>
+                      </div>
+                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                               v-model="queryParamLeft.serialNumber"></j-input>
+                    </div>
+                  </a-col>
+                  <a-col :md="8" :sm="8">
+                    <div class="box-title-text">
+                      <div class="title-text" :title="$t('title')">
+                        <span>{{$t('title')}}</span>
+                      </div>
+                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                               v-model="queryParamLeft.title"></j-input>
+                    </div>
+                  </a-col>
+                  <span style="text-align:right;overflow: hidden;" class="table-page-search-submitButtons">
+               <a-col :md="8" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQueryLeft">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px"
+                            @click="searchResetLeft">{{$t('reset')}}</a-button>
+               </a-col>
+               </span>
+                </a-row>
+              </a-form>
+              <a-table
+                ref="table"
+                size="middle"
+                :loading="loadingLeft"
+                :pagination="false"
+                :scroll="{x: '100%',y:400}"
+                rowKey="id"
+                :data-source="dataSourceLeft"
+                :row-selection="{ selectedRowKeys: selectedRowKeysLeft, onChange: onSelectChangeLeft }"
+                :columns="columns"
+              >
+              </a-table>
+              <div class="page">
+                <a-pagination
+                  :show-total="total => $t('total')+` ${total} `+$t('strip')"
+                  show-quick-jumper
+                  show-size-changer
+                  :page-size.sync="pageSizeLeft"
+                  :total="totalLeft"
+                  :current="pageNoLeft"
+                  @change="pageOnChangeLeft"
+                  @showSizeChange="SizeChangeLeft"
+                />
+              </div>
+              <div class="box-button-standard">
+                <span class="box-button-standard-left">
+                     {{$t('selectedStandard')}}
+                </span>
+                <span class="box-button-standard-right">
+                      {{$t('noComparisonDocumentSelected')}}
+              </span>
+              </div>
+            </div>
+            <div class="detail-content-right">
+              <a-form layout="inline" @keyup.enter.native="searchQueryRight">
+                <a-row :gutter="24">
+                  <a-col :md="8" :sm="8">
+                    <div class="box-title-text">
+                      <div class="title-text" :title="$t('standard')">
+                        <span>{{$t('standard')}}</span>
+                      </div>
+                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                               v-model="queryParamRight.serialNumber"></j-input>
+                    </div>
+                  </a-col>
+                  <a-col :md="8" :sm="8">
+                    <div class="box-title-text">
+                      <div class="title-text" :title="$t('title')">
+                        <span>{{$t('title')}}</span>
+                      </div>
+                      <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                               v-model="queryParamRight.title"></j-input>
+                    </div>
+                  </a-col>
+                  <span style="text-align:right;overflow: hidden;" class="table-page-search-submitButtons">
+               <a-col :md="8" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQueryRight">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px"
+                            @click="searchResetRight">{{$t('reset')}}</a-button>
+               </a-col>
+               </span>
+                </a-row>
+              </a-form>
+              <a-table
+                ref="table"
+                size="middle"
+                :loading="loadingRight"
+                :pagination="false"
+                :scroll="{x: '100%',y:400}"
+                rowKey="id"
+                :data-source="dataSourceRight"
+                :row-selection="{ selectedRowKeys: selectedRowKeysRight, onChange: onSelectChangeRight }"
+                :columns="columns"
+              >
+              </a-table>
+              <div class="page">
+                <a-pagination
+                  :show-total="total => $t('total')+` ${total} `+$t('strip')"
+                  show-quick-jumper
+                  show-size-changer
+                  :page-size.sync="pageSizeRight"
+                  :total="totalRight"
+                  :current="pageNoRight"
+                  @change="pageOnChangeRight"
+                  @showSizeChange="SizeChangeRight"
+                />
+              </div>
+              <div class="box-button-standard">
+                <span class="box-button-standard-left">
+                     {{$t('selectedStandard')}}
+                </span>
+                <span class="box-button-standard-right">
+                      {{$t('noComparisonDocumentSelected')}}
+              </span>
+              </div>
+            </div>
+          </div>
+          <div class="Remarks">
+            <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+              <div class="box-title-text-Remarks">
+                <div class="title-text-Remarks" :title="$t('standard')">
+                  <span>{{$t('RemarkInfo')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="dreUserIdName">
+                  <a-textarea :placeholder="$t('pleaseEnter')+$t('RemarkInfo')"
+                              v-model="formInline.RemarkInfo"
+                              :rows="4"/>
+                </a-form-model-item>
+              </div>
+            </a-form-model>
+          </div>
+          <div class="submit-button">
+            <a-button class="box-button" type="primary" @click="submit">{{$t('initiateDocumentComparison')}}</a-button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'initiateDocumentComparison',
+    data() {
+      return {
+        loading: false,
+        loadingLeft: false,
+        loadingRight: false,
+        queryParamLeft: {},
+        queryParamRight: {},
+        pageSizeLeft: 10,
+        totalLeft: 0,
+        pageNoLeft: 1,
+        pageSizeRight: 10,
+        selectedRowKeysRight: [],
+        dataSourceRight: [],
+        totalRight: 0,
+        pageNoRight: 1,
+        formInline: {},
+        rules: {},
+        columns: [
+          {
+            title: this.$t('number'),
+            align: 'center',
+            width: 70,
+            customRender: function(t, r, index) {
+              return parseInt(index) + 1
+            }
+          },
+          {
+            title: this.$t('standard'),
+            align: 'center',
+            ellipsis: true,
+            dataIndex: 'standard'
+          },
+          {
+            title: this.$t('title'),
+            align: 'center',
+            ellipsis: true,
+            dataIndex: 'title'
+          },
+          {
+            title: this.$t('TextStatus'),
+            align: 'center',
+            ellipsis: true,
+            dataIndex: 'TextStatus'
+          },
+          {
+            title: this.$t('fileName'),
+            align: 'center',
+            ellipsis: true,
+            dataIndex: 'fileName'
+          },
+          {
+            title: this.$t('textInformation'),
+            align: 'center',
+            ellipsis: true,
+            dataIndex: 'textInformation'
+          }
+        ],
+        dataSourceLeft: [],
+        selectedRowKeysLeft: []
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      Fallback() {
+        this.$router.push({
+          path: '/documentComparison'
+        })
+      },
+      searchQueryLeft() {
+
+      },
+      searchResetLeft() {
+
+      },
+      onSelectChangeLeft(value) {
+        this.selectedRowKeysLeft = value
+      },
+      pageOnChangeLeft(page) {
+        this.pageNoLeft = page
+        this.getList()
+      },
+      SizeChangeLeft(pageSize) {
+        this.pageNoLeft = 1
+        this.pageSizeLeft = pageSize
+        this.getList()
+      },
+      searchQueryRight() {
+
+      },
+      searchResetRight() {
+
+      },
+      onSelectChangeRight(value) {
+        this.selectedRowKeysRight = value
+      },
+      pageOnChangeRight(page) {
+        this.pageNoRight = page
+        this.getList()
+      },
+      SizeChangeRight(pageSize) {
+        this.pageNoRight = 1
+        this.pageSizeRight = pageSize
+        this.getList()
+      },
+      submit() {
+
+      }
+    }
+  }
+</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;
+        }
+      }
+    }
+  }
+
+  .detail-content-left {
+    width: 50%;
+    float: left;
+    border-right: 2px #EFF1F3 solid;
+    padding: 24px 32px;
+    box-sizing: border-box;
+    border-bottom: 2px #EFF1F3 solid;
+  }
+
+  .detail-content-right {
+    width: 50%;
+    float: left;
+    padding: 24px 32px;
+    box-sizing: border-box;
+    border-bottom: 2px #EFF1F3 solid;
+  }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+
+  .box-title-text-Remarks {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+    margin-bottom: 10px;
+  }
+
+  .title-text-Remarks {
+    width: 68px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 6px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .title-text {
+    width: 60px;
+    color: #000F16;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: calc(100% - 60px);
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
+  }
+
+  .box-button-standard {
+    width: 100%;
+    margin-top: 20px;
+  }
+
+  .box-button-standard-left {
+    width: 111px;
+    height: 46px;
+    display: inline-block;
+    border: 1px solid #CED0D8;
+    border-right: none;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    text-align: center;
+    line-height: 46px;
+    color: #040B29;
+  }
+
+  .box-button-standard-right {
+    width: calc(100% - 111px);
+    height: 46px;
+    display: inline-block;
+    border: 1px solid #CED0D8;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    text-align: center;
+    line-height: 46px;
+    color: #9B9DA9;
+  }
+
+  .Remarks {
+    margin-top: 20px;
+    width: 50%;
+    padding: 0 32px;
+    box-sizing: border-box;
+  }
+
+  .itemModel {
+    width: calc(100% - 232px);
+  }
+
+  .submit-button {
+    width: 100%;
+    margin-top: 20px;
+    text-align: right;
+    padding: 0 32px;
+    box-sizing: border-box;
+  }
+</style>

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

@@ -260,7 +260,10 @@
 
       },
       initiatingProcessClick(){
-
+        let newUrl = this.$router.resolve({
+          path: '/initiateDocumentComparison',
+        })
+        window.open(newUrl.href, '_blank')
       },
       deleteData(val){
         let _this = this