From e28d546345ef1db303b731e5ae209e3766ba4ebe Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Wed, 20 Jul 2022 22:13:33 +0800
Subject: [PATCH 01/13] =?UTF-8?q?3=E9=98=B6=E6=AE=B5=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=9A=84sql=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 7de7fda86..69d24c766 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -386,7 +386,7 @@ ALTER TABLE `laws_weilai`.`sys_user`
 DROP INDEX `uniq_sys_user_phone`,
 DROP INDEX `uniq_sys_user_email`;
 
--- 参数项清单 修改字段长度 2022-07-17
+-- 参数项清单 修改字段长度 2022-07-17 已同步
 ALTER TABLE `laws_weilai`.`params_info`
     MODIFY COLUMN `params_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `is_must`,
     MODIFY COLUMN `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`;

From 9f7f533137694592dc42668e9f2637e76220ed8d Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 21 Jul 2022 10:11:40 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=94=B6=E9=9B=86=20=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../externalReports/components/addModel.vue   | 316 ++++++++++++
 jero-web/src/views/externalReports/index.vue  | 480 ++++++++++++++++++
 .../ParameterItemCollectionList.vue           |  24 +-
 3 files changed, 817 insertions(+), 3 deletions(-)
 create mode 100644 jero-web/src/views/externalReports/components/addModel.vue
 create mode 100644 jero-web/src/views/externalReports/index.vue

diff --git a/jero-web/src/views/externalReports/components/addModel.vue b/jero-web/src/views/externalReports/components/addModel.vue
new file mode 100644
index 000000000..67d93b664
--- /dev/null
+++ b/jero-web/src/views/externalReports/components/addModel.vue
@@ -0,0 +1,316 @@
+<template>
+  <div class='diolag-area'>
+    <a-spin :spinning='spinLoading'>
+      <a-form-model
+        class='tag-module'
+        ref='ruleForm'
+        :model='formData'
+        :rules='rules'
+        :label-col='labelCol'
+        :wrapper-col='wrapperCol'
+      >
+        <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.dutyTerritory"
+                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'duty_territory'"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span='9'>
+            <a-form-model-item :label="$t('RelatedItems')" prop='ListTitle'>
+              <a-select class="box-input" v-model="formData.projectNameId"
+                        :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
+                <a-select-option v-for="(element,index) in RelatedItemList" :key="element.id" :value="element.id">
+                  {{element.projectName}}
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span='6' style='margin-top: 4px;'>
+            <a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
+            <a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <div class="table-operator" style='float: right;margin-top: -20px'>
+      <a-button type="primary" icon="download" @click="handleExportXls()">{{ $t('export') }}</a-button>
+    </div>
+<!--    :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'-->
+    <a-table
+      class='table-area'
+      ref='table'
+      size='middle'
+      rowKey='id'
+      :columns='columns'
+      :dataSource='areaTable'
+      :pagination='false'
+      :loading='loading'
+      :scroll='{x: 600}'
+
+      @change='handleTableChange'>
+
+<!--      <template slot="file" slot-scope="text, record">-->
+<!--        <a class="action-edit" href="javascript:;" @click="dowloadfile(record)" v-has="'bqnrzdpzxlbj'">{{record.exportFileName}}</a>-->
+<!--      </template>-->
+    </a-table>
+<!--    <div class="page" style='display: flex;justify-content: flex-end;'>-->
+<!--      <a-pagination-->
+<!--        :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
+<!--        show-quick-jumper-->
+<!--        show-size-changer-->
+<!--        :page-size.sync="pageSize"-->
+<!--        :total="total"-->
+<!--        :current="pageNo"-->
+<!--        @change="pageOnChange"-->
+<!--        @showSizeChange="SizeChange"-->
+<!--      />-->
+<!--    </div>-->
+    <div class="table-operator" >
+      <a-button type="primary" v-if='this.opinionGather > 0'  @click="handlecomments()">{{ $t('CommentsCollectionResultsForReference') }}</a-button>
+      <a-button type="primary" v-if='this.technologyEvaluation > 0'  @click="handletechnical()">{{ $t('TechnicalEvaluationResultsForReference') }}</a-button>
+    </div>
+    <!--    <div class='drawer-bootom-button'>-->
+    <!--      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>-->
+    <!--      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>-->
+    <!--    </div>-->
+  </div>
+</template>
+
+<script>
+import { putAction, postAction, getAction, deleteAction ,downloadFile } from '@/api/manage'
+import axios from 'axios'
+import Vue from 'vue'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
+
+export default {
+  name: 'diolagArea',
+  components: {},
+  data() {
+    return {
+      token:Vue.ls.get(ACCESS_TOKEN),
+      title: this.$t('add'),
+      total: 0,
+      selectedRowKeysDate: {},
+      opinionGather:'',
+      technologyEvaluation:'',
+      loading: false,
+      editId: '',
+      RelatedItemList:[],
+      columns: [
+        {
+          title: this.$t('areaOfResponsibility'),
+          dataIndex: 'dutyTerritory_dicText',
+          width: 120,
+          align: 'center',
+          ellipsis: true
+        },
+        {
+          title: this.$t('RelatedItems'),
+          align: 'center',
+          width: 120,
+          dataIndex: 'projectName',
+          ellipsis: true
+        },
+        {
+          title: this.$t('designComplianceReview'),
+          align: 'center',
+          width: 250,
+          dataIndex: 'designStatus_dicText',
+          ellipsis: true
+        },
+        {
+          title: this.$t('preHomeConfirmation'),
+          align: 'center',
+          width: 270,
+          dataIndex: 'prehomoStatus_dicText',
+          ellipsis: true
+        },
+        {
+          title: this.$t('verificationComplianceReview'),
+          align: 'center',
+          width: 270,
+          dataIndex: 'verifyStatus_dicText',
+          scopedSlots: { customRender: 'file' },
+          ellipsis: true
+        }
+      ],
+      newVisible: false,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 14 }
+      },
+      form: {},
+      formData: {
+        projectName:'',
+      },
+      rules: {
+        title: [
+          { required: true, message: this.$t('enterTitle'), trigger: 'blur' }
+        ]
+      },
+      areaTable: [],
+      flag: false,  //表单提交标识
+      spinLoading: false,
+      confirmLoading: false,
+      selectedRowKeys: [],
+      pageNo: 1,
+      pageSize: 10,
+      listVisible: false,
+    }
+  },
+  props: {
+    item: {
+      type: Object,
+      default: '',
+      require: true
+    },
+    paramsManifestId: {
+      type: String,
+      default: '',
+      require: true
+    },
+  },
+  mounted() {
+    this.loadData()
+    this.getRelatedItemList()
+  },
+  methods: {
+    getRelatedItemList(){
+      getAction('/project/projectNameInfoEO/list', {}).then((res) => {
+        if (res.success) {
+          this.RelatedItemList = res.result
+        }
+      })
+    },
+    pageOnChange(page, pageSize) {
+      this.pageNo = page
+      this.loadData()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.loadData()
+    },
+    // 法规意见收集列表
+    handlecomments(){
+      this.$router.push({
+        path: '/collectionOfRegulatoryOpinions',
+        query:{
+          serialNumber:this.item.serialNumber
+        }
+      })
+    },
+    // 法规技术评估列表
+    handletechnical(){
+
+      this.$router.push({
+        path: '/technologyAssessment',
+        query:{
+          serialNumber:this.item.serialNumber
+        }
+      })
+    },
+    loadData() {
+      let params = {
+        id:this.paramsManifestId,
+        dutyTerritory:this.formData.dutyTerritory?this.formData.dutyTerritory:'',
+        projectName:this.formData.projectName?this.formData.projectName:'',
+        projectNameId:this.formData.projectNameId?this.formData.projectNameId:'',
+      }
+      this.loading = true
+      getAction('project/lawsComplianceBoard/queryComplianceResultList', params).then((res) => {
+        if (res.success) {
+          this.areaTable = res.result.complianceResultList
+          this.opinionGather = res.result.opinionGather
+          this.technologyEvaluation = res.result.technologyEvaluation
+          this.loading = false
+        }else{
+          this.loading = false
+        }
+      })
+    },
+    //导出
+    handleExportXls(){
+      let query = {
+        id:this.paramsManifestId,
+        ...this.formData
+      }
+      downloadFile('/project/lawsComplianceBoard/exportComplianceResultDetail', this.$t('complianceResults')+'.xls', query, this.Deselect)
+    },
+    searchQuery() {
+      this.loadData()
+    },
+    searchReset() {
+      this.formData = {}
+      this.loadData()
+    },
+    handleCancel() {
+      this.$emit('areaVisible', false)
+    },
+    onSelectChange(selectedRowKeys, selectedRowKeysDate) {
+      this.selectedRowKeysDate = selectedRowKeysDate
+      this.selectedRowKeys = selectedRowKeys
+    },
+    handleTableChange(val) {
+      console.log(',,,')
+    },
+    showModal() {
+      this.title = this.$t('add')
+      this.newVisible = true
+      this.form = {}
+    },
+  },
+  watch: {
+    selectedRowKeyS(val) {
+      this.selectedRowKeys = val
+    }
+  }
+
+}
+</script>
+
+<style lang='less' scoped>
+@import '~@assets/less/common.less';
+
+.diolag-area {
+  .table-area {
+    margin: 20px 0;
+
+    .action-edit {
+      margin-right: 10px;
+    }
+  }
+
+  .table-del {
+    color: red;
+  }
+}
+.drawer-bootom-button{
+  display: flex;
+  justify-content: center;
+}
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+</style>
+<style lang='less'>
+.area-module {
+  .ant-modal-wrap {
+    .ant-modal {
+      .ant-modal-content {
+        .ant-modal-footer {
+          text-align: center;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
new file mode 100644
index 000000000..157836add
--- /dev/null
+++ b/jero-web/src/views/externalReports/index.vue
@@ -0,0 +1,480 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{ $t('standard') }}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></a-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{$t('title')}}</span>
+              </div>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></a-input>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('status')">
+                <span>{{ $t('status') }}</span>
+              </div>
+              <j-dict-select-tag class="box-input" v-model="queryParam.state"
+                                 :placeholder="$t('PleaseSelect')+$t('status')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'state'"/>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('technicalField')">
+                <span>{{ $t('technicalField') }}</span>
+              </div>
+              <a-tree-select
+                tree-node-filter-prop="title"
+                v-model="queryParam.technologyTerritory"
+                :maxTagCount="1"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                class="box-input"
+                style="width: 100%"
+                :tree-data="CategoryTreeList"
+                tree-checkable
+                :placeholder="$t('PleaseSelect')+$t('technicalField')"
+              />
+<!--              <j-dict-select-tag class="box-input" v-model="queryParam.technologyTerritory"-->
+<!--                                 :placeholder="$t('PleaseSelect')+$t('technicalField')"-->
+<!--                                 :type="'select'"-->
+<!--                                 :triggerChange="false" :dictCode="'duty_territory'"/>-->
+            </div>
+          </a-col>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                   <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                        @handleSuperQuery="handleSuperQuery"
+                                        :fieldList="fieldList"/>
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px"
+                            @click="searchReset">{{ $t('reset') }}</a-button>
+               </a-col>
+            </span>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator" style="overflow:hidden;margin-bottom: 20px">
+      <div style="float: right;margin-bottom: 0px;margin-left: 20px">
+        <div class="operator-text" @click="deriveconformanceresults()">
+          <a-icon type="solution"/>
+          {{ $t('Deriveconformanceresults') }}
+        </div>
+      </div>
+    </div>
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: true}"
+        rowKey="id"
+        :data-source="dataSource"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :columns="columns"
+      >
+        <span slot="projectName" slot-scope="text,record" :title="text">
+          <a @click="entryNameClick(record)">
+            {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
+          </a>
+        </span>
+        <span slot="operation" slot-scope="text,record">
+            <a class="text-operation" @click="handlecody(record)">{{$t('ViewConformanceResults')}}</a>
+        </span>
+      </a-table>
+    </div>
+    <div class="page">
+      <a-pagination
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="pageSize"
+        :total="total"
+        :current="pageNo"
+        @change="pageOnChange"
+        @showSizeChange="SizeChange"
+      />
+    </div>
+    <!--     导出历史模板-->
+    <a-modal class="show-drawer" :title="titleTag" width="1200px" v-model="drawerVisible" :footer="null">
+      <export-history v-if='drawerVisible' @areaVisible='drawerVisible = false' :paramsManifestId='paramsManifestId' :item='item'></export-history>
+    </a-modal>
+  </a-card>
+</template>
+
+<script>
+import ExportHistory from './components/addModel'
+import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+import axios from 'axios'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
+// import eventBUs from '../../../common/event'
+import Vue from 'vue'
+import moment from 'moment'
+
+export default {
+  name: 'index',
+  components: {
+    ExportHistory,
+    globalAdvancedQuery
+  },
+  data() {
+    return {
+      token: Vue.ls.get(ACCESS_TOKEN),
+      loading: false,
+      toggleSearchStatus: false,
+      selectedRowKeys: [],
+      CategoryTreeList:[],
+      paramsManifestId:'',
+      item:{},
+      selectedRowKeysArray: '',
+      formInline: {},
+      rules: {
+        paramsTemplateName: [
+          { required: true, message: this.$t('PleaseEnter') + this.$t('templateName'), trigger: 'change' }
+        ]
+      },
+      fieldList: [],
+      visible: false,
+      dataSource: [],
+      confirmLoading: false,
+      url: {
+        list: 'project/lawsComplianceBoard/page',
+        getSysCategoryTree: '/sys/category/getSysCategoryTree',
+      },
+      total: 0,
+      pageSize: 10,
+      pageNo: 1,
+      title: '新增',
+      columns: [
+        {
+          title: this.$t('standard'),
+          align: 'center',
+          dataIndex: 'serialNumber',
+          width: 180
+        },
+        {
+          title: this.$t('title'),
+          align: 'center',
+          dataIndex: 'title',
+          width: 180
+        },
+        {
+          title: this.$t('status'),
+          align: 'center',
+          dataIndex: 'state_dicText',
+          width: 180
+        },
+        // {
+        //   title: this.$t('category'),
+        //   align: 'center',
+        //   dataIndex: 'category'
+        // },
+        {
+          title: this.$t('technicalField'),
+          align: 'center',
+          dataIndex: 'technologyTerritory_dicText'
+        },
+        {
+          title: this.$t('RegulatoryProcessEvaluationResults'),
+          align: 'center',
+          fixed: 'right',
+          width: 250,
+          scopedSlots: { customRender: 'operation' }
+        }
+      ],
+      queryParam: {},
+      areaVisible: false,
+      paramsTemplateName: '',
+      queryConditionVOList: [],
+      drawerVisible: false,
+      titleTag: ''
+    }
+  },
+  mounted() {
+    this.getList()
+    this.getSysCategoryTree()
+    this.queryConditionInventory()
+  },
+  methods: {
+    queryConditionInventory() {
+      let query = {
+        flag: 1
+      }
+      getAction('/project/projectLawsInventoryEO/queryConditionInventory', query).then((res) => {
+        if (res.success) {
+          this.fieldList = res.result || []
+        } else {
+          this.fieldList = []
+        }
+      })
+    },
+    handleCancel() {
+      this.areaVisible = false
+    },
+    handleSubmit() {
+      if (this.formInline.paramsTemplateName !== undefined) {
+        this.formInline.paramsTemplateName = this.formInline.paramsTemplateName.trim()
+      }
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          getAction(this.url.copy + `?id=${this.selectedRowKeys[0]}&paramsTemplateName=${this.formInline.paramsTemplateName}`, {}).then((res) => {
+            if (res.success) {
+              this.areaVisible = false
+              this.$message.success(res.message)
+              this.selectedRowKeys = []
+              this.getList()
+            } else {
+              this.$message.warning(res.message)
+            }
+          })
+        }
+      })
+    },
+    getSysCategoryTree() {
+      getAction(this.url.getSysCategoryTree, {}).then((res) => {
+        if (res.success) {
+          this.CategoryTreeList = res.result
+        } else {
+          this.CategoryTreeList = []
+        }
+      })
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    },
+    onSelectChange(value) {
+      this.selectedRowKeysArray = this.selectedRowKeys.join(',')
+    },
+    deriveconformanceresults(){
+      let query = {
+        ...this.queryParam,
+        exportAll:'yes',
+        ids: this.selectedRowKeys.join(',')
+      }
+      downloadFile('/project/lawsComplianceBoard/exportComplianceResult', this.$t('complianceResults')+'.xls', query, this.Deselect)
+    },
+    // 导出历史
+    handlecody(e) {
+      this.drawerVisible = true
+      this.titleTag = e.serialNumber + this.$t('ComplianceConfirmationRecord')
+      this.paramsManifestId = e.id
+      this.item = {...e}
+    },
+    hideModal() {
+      this.visible = false
+    },
+    //虚拟清单名称事件
+    entryNameClick(item) {
+      this.$router.push({
+        path: '/ParameterTemplateList',
+        query: item
+      })
+    },
+    searchQuery() {
+      this.pageNo = 1
+      this.getList()
+    },
+    searchReset() {
+      this.queryParam = {}
+      this.territory = ''
+      this.queryConditionVOList = []
+      this.$refs.globalAdvancedQueryRef.resetLine()
+      this.$refs.globalAdvancedQueryRef.emitCallback()
+    },
+    pageOnChange(page, pageSize) {
+      this.pageNo = page
+      this.getList()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.getList()
+    },
+    addModelList() {
+      this.pageNo = 1
+      this.getList()
+    },
+    PersonnelSelectionChange(value, id) {
+      this.queryParam[value] = id
+      this.queryParam = { ...this.queryParam }
+    },
+    handleSuperQuery(params, matchType) {
+      let sqp = {}
+      if (!params || (params && params.length == 0)) {
+        this.queryConditionVOList = []
+        this.$refs.globalAdvancedQueryRef.superQueryFlag = false
+      } else {
+        this.$refs.globalAdvancedQueryRef.superQueryFlag = true
+        this.queryConditionVOList = params
+        this.queryConditionVOList.forEach(res => {
+          res.type = matchType
+        })
+      }
+      this.getList()
+    },
+    getList() {
+      let territory = ''
+      if (this.queryParam.technologyTerritory) {
+        this.territory = this.queryParam.technologyTerritory.join(',')
+      }
+      // let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+      let queryConditionVOList = JSON.parse(JSON.stringify(this.queryConditionVOList))
+      let query = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        queryConditionVOList: JSON.stringify(queryConditionVOList),
+        technology_territory: this.territory,
+        serial_number:this.queryParam.serialNumber,
+        title:this.queryParam.title,
+        state:this.queryParam.state
+
+      }
+      this.loading = true
+      postAction(this.url.list, query).then((res) => {
+        if (res) {
+          if (res.result.current > 1 && res.result.records.length == 0) {
+            this.pageNo = res.result.current - 1
+            this.getList()
+            return
+          }
+          console.log(res.result)
+          this.dataSource = res.result.records || []
+
+          this.total = res.result.total
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+@import '~@assets/less/common.less';
+
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 20%;
+  min-width: 110px;
+  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: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.add-input {
+  width: 82%;
+}
+
+.box-button {
+  height: 38px;
+  /*margin-top: 2px;*/
+}
+
+.text-operation {
+  margin-right: 8px;
+}
+
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
+
+.box-title-text-add {
+  line-height: 1.4;
+  display: flex;
+}
+
+.title-text-add {
+  width: 114px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 42px;
+  margin-top: 3px;
+}
+
+.box-input-add {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+.formAdd {
+  margin-bottom: 40px;
+}
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  z-index: 100;
+  width: 100%;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+
+.add-text-text {
+  margin-top: -14px;
+}
+</style>
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 811b60cf9..f82aea684 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -192,6 +192,12 @@
               <a-icon type="delete"/>
               {{$t('CompulsoryWithdrawal')}}
             </div>
+            <!--      导出-->
+            <div @click="handleExport" class="operator-text"
+                 v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
+              <a-icon type="export"/>
+              {{$t('export')}}
+            </div>
             <!--       角色切换   -->
             <div class="operator-text"
                  v-if="!this.$route.query.it"
@@ -264,13 +270,13 @@
                    @areaVisibleAssignedbyflag='areaVisibleAssignedbyflag' @areaVisible='areaVisibleAssignedby = false'/>
     </a-modal>
     <!--  下发收集--->
-    <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('distributionAndCollection')" width='600px' :footer="null">
+    <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('distributionAndCollection')" width='400px' :footer="null">
       <task-cut-off-time v-if='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray'
                          @GetgetTableList='GetgetTableList'
                          @areaVisibleTaskCutOffTimeflag='areaVisibleTaskCutOffTimeflag'/>
     </a-modal>
     <!--  一键下发收集--->
-    <a-modal v-model="OneclickCollection" :title="$t('OneclickCollection')" width='600px' :footer="null">
+    <a-modal v-model="OneclickCollection" :title="$t('OneclickCollection')" width='400px' :footer="null">
       <task-time v-if='OneclickCollection' :selectedRowKeysArray='selectedRowKeysArray'
                          @GetgetTableList='GetgetTableList'
                          @areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/>
@@ -554,7 +560,8 @@
           {
             type: 'string',
             value: 'paramsBatch',
-            text: this.$t('parameterBatch')
+            text: this.$t('parameterBatch'),
+            dictCode: 'params_batch'
           },
         ],
         selectedRowKeys: [],
@@ -799,6 +806,17 @@
           return flag
         }
       },
+      //导出
+      handleExport(){
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        let query = {
+          ...this.queryParam,
+          ...this.queryParamQuery,
+          ids: selectedRowKeys.join(','),
+          dummyInventoryBaseId: this.$route.query.id
+        }
+        downloadFile(this.url.exportData, this.$route.query.name + this.$t('VirtualList') + '.zip', query, this.Deselect)
+      },
       // 高级搜索
       handleSuperQuery(params, matchType) {
         let sqp = {}

From f59d0f8b9b269336146f3bb73d7403f4a8f257b6 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 21 Jul 2022 13:41:42 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95-=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOController.java    |   9 +-
 .../mapper/ParamsCollectManifestEOMapper.java |   3 +
 .../xml/ParamsCollectManifestEOMapper.xml     |   8 +
 .../IParamsCollectManifestEOService.java      |   4 +
 .../ParamsCollectManifestEOServiceImpl.java   | 360 +++++++++++++++++-
 .../collect/vo/ParamsCollectManifestVO.java   |   5 +-
 6 files changed, 386 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
index 925d7a8a8..6ee8b20a4 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
@@ -522,7 +522,14 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 		return Result.OK("带入工程接口人成功！");
 	}
 
-
+	@ApiOperation(value = "参数项收集清单-全部导出")
+	@GetMapping(value = "/exportAll")
+//	@RequiresPermissions("report:detail:export:normal")
+	public void exportAll(ParamsCollectManifestVO paramsCollectManifestVO,
+							 HttpServletResponse response,
+							 HttpServletRequest request) {
+		paramsCollectManifestEOService.exportAll(paramsCollectManifestVO, response, request);
+	}
 
 
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
index 1e8304570..1166ad6d3 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
@@ -6,6 +6,7 @@ import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 参数收集清单
@@ -17,6 +18,8 @@ public interface ParamsCollectManifestEOMapper extends BaseMapper<ParamsCollectM
 
     List<ParamsCollectManifestEO> listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
 
+    List<Map<String, Object>> listInfoForExport(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
+
     // 查询控件类型为 标题的 参数项
     List<ParamsCollectManifestEO> listInfoOfTitle(@Param("paramsManifestId") String paramsManifestId);
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
index 873d1399a..9a10df792 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
@@ -80,6 +80,14 @@
         order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
     </select>
 
+    <select id="listInfoForExport" resultType="java.util.LinkedHashMap">
+        select *
+        from params_collect_manifest
+        <include refid="BaseQuerySql"/>
+        and control_type != '11'
+        order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
+    </select>
+
     <select id="listInfoOfTitle" resultMap="ParamsCollectManifestEOResultMap">
         select *
         from params_collect_manifest
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
index 73681d6b6..8ba0fa9e6 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
@@ -6,6 +6,7 @@ import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -148,4 +149,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 
 	// 带入工程接口人
 	boolean bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO);
+
+	// 全部导出
+	void exportAll(ParamsCollectManifestVO paramsCollectManifestVO, HttpServletResponse response, HttpServletRequest request);
 }
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 9adfe5327..7db02d212 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -2,6 +2,7 @@ package com.jero.modules.cert.collect.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -12,10 +13,12 @@ import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.WebsocketConst;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.MessageTypeEnum;
+import com.jero.common.constant.enums.ModuleEnum;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.oss.CosBootUtil;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
 import com.jero.modules.cert.collect.entity.*;
@@ -46,6 +49,7 @@ import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.entity.ProjectRelatedPersonnel;
 import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
 import com.jero.modules.project.service.IProjectRelatedPersonnelService;
+import com.jero.modules.split.common.ReadExcel;
 import com.jero.modules.system.entity.SysAnnouncement;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
@@ -54,8 +58,13 @@ import com.jero.modules.system.service.ISysAnnouncementService;
 import com.jero.modules.system.service.ISysDictItemService;
 import com.jero.modules.system.service.ISysUserRoleService;
 import com.jero.modules.system.service.ISysUserService;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.util.HSSFColor;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.xssf.usermodel.*;
 import org.apache.shiro.SecurityUtils;
+import org.aspectj.util.FileUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -65,8 +74,12 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
 import java.lang.reflect.Field;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -126,6 +139,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	@Resource
 	private WebSocket webSocket; // 消息专用
 
+	@Value(value = "${jero.path.upload}")
+	private String uploadpath;
 
 
 
@@ -1976,6 +1991,349 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		return updateBatchById(updateCollectManifestEOList);
 	}
 
+	@Override
+	public void exportAll(ParamsCollectManifestVO paramsCollectManifestVO, HttpServletResponse response, HttpServletRequest request) {
+		OutputStream os = null;
+		OutputStream excelOS = null;
+		XSSFWorkbook workbook = new XSSFWorkbook();
+		String fileOriName = "参数项清单导出信息";
+		if (CutEnum.EN.getValue().equals(paramsCollectManifestVO.getCut())) {
+			fileOriName = "Params info export data";
+		}
+		if (StringUtils.isNotEmpty(paramsCollectManifestVO.getExportName())) {
+			fileOriName = paramsCollectManifestVO.getExportName();
+		}
+		//创建临时文件夹
+		String fileNowPath = uploadpath + "/tempZip/" + UUID.randomUUID().toString().replace("-","") + File.separator + fileOriName;
+		File nowFile = new File(fileNowPath);
+		if (nowFile.exists()) {
+			nowFile.delete();
+		}
+		nowFile.mkdirs();
+		try{
+			String fileName = fileOriName + ".xlsx";
+			// 设置表格相关属性
+			String sheetName = "参数项清单信息";
+			if (CutEnum.EN.getValue().equals(paramsCollectManifestVO.getCut())) {
+				sheetName = "Params data";
+			}
+			XSSFSheet sheetItems = workbook.createSheet(sheetName);
+			String[] titles = getWorkbookTitleForExport(paramsCollectManifestVO); // 获取表头
+
+			String[] headers = titles[1].split(",");
+			XSSFCellStyle cellStyle =workbook.createCellStyle();
+			cellStyle.setWrapText(true);
+//            cellStyle.setAlignment(XSSFCellStyle.ALIGN_CENTER);
+			cellStyle.setVerticalAlignment(XSSFCellStyle.VERTICAL_CENTER);
+			XSSFCellStyle cellStyle1 =workbook.createCellStyle();
+			cellStyle1.setAlignment(XSSFCellStyle.ALIGN_CENTER);
+			XSSFCellStyle cellStyleLink =workbook.createCellStyle();
+			XSSFFont font = workbook.createFont();
+			font.setColor(HSSFColor.LIGHT_BLUE.index);
+			cellStyleLink.setFont(font);
+			cellStyleLink.setWrapText(true);
+
+			// 查询需要导出的字段
+			String field = titles[0]; // 字符串形式
+			List<String> fieldList = Arrays.asList(field.split(",")); // list形式
+
+			//  查询导出数据
+			List<Map<String, Object>> allParamsInfoList = queryForExportAll(paramsCollectManifestVO); // id记得去掉
+
+			// 开始处理工作表
+			List<OSSFile> allRelevFileList = new ArrayList<>();
+
+			// 在excel表中添加表头
+			XSSFRow row = sheetItems.createRow(0);
+			for (int i = 0; i < headers.length; i++) {
+				XSSFCell cell = row.createCell(i);
+				XSSFRichTextString text = new XSSFRichTextString(headers[i]);
+				cell.setCellValue(text);
+				cell.setCellStyle(cellStyle1);
+				sheetItems.setColumnWidth(i, 20 * 256); // 设置单元格宽度
+			}
+
+			Map<String, String> fileNowPathMap = new HashMap<>();
+			//放文字内容
+			int allRow = 0;
+			for(int rowNum = 0;rowNum < allParamsInfoList.size(); rowNum++){
+				Map<String, Object> exportDto = allParamsInfoList.get(rowNum);
+
+				// 处理文件
+				List<OSSFile> fileList = (List<OSSFile>) exportDto.get("fileList");
+				if (CollectionUtil.isNotEmpty(fileList)) {
+					allRelevFileList.addAll(fileList);
+					fileList.forEach(file -> {
+						fileNowPathMap.put(file.getId(), fileNowPath + File.separator + exportDto.get("nio_number"));
+					});
+
+				}
+
+				allRow++;
+				XSSFRow row1 = sheetItems.createRow(allRow);
+				for(int cellNum = 0; cellNum < fieldList.size(); cellNum++){
+					if (ObjectUtils.isNotEmpty(exportDto.get(fieldList.get(cellNum)))) {
+						row1.createCell(cellNum).setCellValue(exportDto.get(fieldList.get(cellNum)).toString());
+						row1.getCell(cellNum).setCellStyle(cellStyle);
+
+					}
+				}
+
+			}
+
+			//下载关联文件内容
+			if (allRelevFileList != null && !allRelevFileList.isEmpty()) {
+				allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList());
+				downLoadFileList(allRelevFileList,fileNowPathMap);
+			}
+
+			String repFileName = fileName.replaceAll("/","_");
+			excelOS = new FileOutputStream(fileNowPath + File.separator + repFileName);
+			response.setHeader("Content-Disposition",
+					"attachment; filename=\""+ ReadExcel.encodeFileName(fileOriName+".zip", request)  +"\"");
+			response.setContentType("application/force-download");
+			response.flushBuffer();
+			os = response.getOutputStream();
+			workbook.write(excelOS);
+			excelOS.flush();
+			excelOS.close();
+			ZipUtil.zip(fileNowPath,fileNowPath+".zip");
+			FileInputStream fis = new FileInputStream(fileNowPath+".zip");
+			int len = 0;
+			while ((len = fis.read()) != -1) {
+				os.write(len);
+			}
+
+			os.flush();
+			os.close(); // 后开先关
+			fis.close(); // 先开后关
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+			throw new JeroBootException("下载文件失败，请重试");
+		} finally {
+			IOUtils.closeQuietly(os);
+			IOUtils.closeQuietly(excelOS);
+			File tempZipFile = new File(uploadpath + "/tempZip");
+			FileUtil.deleteContents(tempZipFile);
+		}
+	}
+
+	private String[] getWorkbookTitleForExport(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String cut = paramsCollectManifestVO.getCut();
+		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
+
+		List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.PARAMS_COLLECT_MANIFEST.getValue());
+
+		List<String> dbFieldNameList = new LinkedList<>();
+		List<String> dbFieldList = new LinkedList<>();
+
+		if (fieldList.size() != 0) {
+			//过滤列表字段(is_show_list-->列表是否显示0否 1是)
+			fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList());
+		}
+
+		// 固定列
+		int indexOfDescription = 1; // 参数名称的位置
+		for (int i = 0; i < fieldList.size(); i++) {
+			OnlCgformField onlCgformField = fieldList.get(i);
+			Map<String, Object> map = new HashMap<>();
+			String dbFieldName = onlCgformField.getDbFieldName();
+			if (!"deadline".equals(dbFieldName) && !"cert_category".equals(dbFieldName) && !"description".equals(dbFieldName)) {
+				dbFieldList.add(dbFieldName);
+
+				if(CutEnum.CN.getValue().equals(cut)){
+					dbFieldNameList.add(onlCgformField.getDbFieldTxt()); // 字段中文名
+				}else{
+					dbFieldNameList.add(onlCgformField.getDbFieldEnName()); // 字段英文名
+				}
+				if ("params_name".equals(dbFieldName)) {
+					indexOfDescription = i;
+				}
+			}
+		}
+
+		// 认证类别列
+		List<String> dbFieldNameListCC = new LinkedList<>();
+		List<String> dbFieldListCC = new LinkedList<>();
+		// 查询所有认证类别
+		List<SysDictItem> sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category");
+		if (CutEnum.EN.getValue().equals(cut)) {
+			sysDictItemList.forEach(sysDictItem -> {
+				dbFieldListCC.add(sysDictItem.getItemValue());
+				dbFieldNameListCC.add(sysDictItem.getEnName() + " Number");
+			});
+
+		} else {
+			sysDictItemList.forEach(sysDictItem -> {
+				dbFieldListCC.add(sysDictItem.getItemValue());
+				dbFieldNameListCC.add(sysDictItem.getItemText() + " 编号");
+			});
+		}
+
+		// 配置列
+		List<String> dbFieldNameListConfig = new LinkedList<>();
+		List<String> dbFieldListConfig = new LinkedList<>();
+		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId);
+		for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
+			dbFieldListConfig.add(paramsConfigEO.getId());
+			dbFieldNameListConfig.add(paramsConfigEO.getConfigName());
+		}
+
+		// 插入认证类别列
+		dbFieldList.addAll(indexOfDescription, dbFieldListCC);
+		dbFieldNameList.addAll(indexOfDescription, dbFieldNameListCC);
+
+		// 插入配置列
+		dbFieldList.addAll(dbFieldListConfig);
+		dbFieldNameList.addAll(dbFieldNameListConfig);
+
+		String[] title = new String[2];
+		String dbFieldStr = StringUtils.join(dbFieldList, ",");
+		String dbFieldNameStr = StringUtils.join(dbFieldNameList, ",");
+
+		title[0] = dbFieldStr;
+		title[1] = dbFieldNameStr;
+		return title;
+	}
+
+	private List<Map<String, Object>> queryForExportAll(ParamsCollectManifestVO paramsCollectManifestVO) {
+		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
+		String paramsTemplateId = paramsCollectManifestVO.getParamsTemplateId();
+		Integer paramsTemplatePublishVersion = paramsCollectManifestVO.getParamsTemplatePublishVersion();
+		String cut = paramsCollectManifestVO.getCut();
+
+
+		ParamsCollectManifestEO queryEO = new ParamsCollectManifestEO();
+		queryEO.setParamsManifestId(paramsManifestId);
+		List<Map<String, Object>> dataList = paramsCollectManifestEOMapper.listInfoForExport(queryEO); // 查询导出数据
+
+		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询所有配置列
+
+		List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
+		List<ParamsConfigDataEO> paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据
+
+		List<String> nioNumberList = dataList.stream().map(m->(String)m.get("nio_number")).collect(Collectors.toList());
+		List<CertCategoryParamsInfoPublishEO> certCategoryParamsInfoPublishEOList = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsTemplateId, paramsTemplatePublishVersion, nioNumberList); //查询所有认证类别参数项
+
+		// 查询责任领域数据字典
+		List<SysDictItem> sysDictItemList = sysDictItemService.selectItemsByDictCode("duty_territory");
+		Map<String, String> dutyTerritoryMap = new HashMap<>();
+		if (CutEnum.EN.getValue().equals(cut)) {
+			dutyTerritoryMap = sysDictItemList.stream().collect(Collectors.toMap(c -> c.getItemValue(), c -> c.getEnName()));
+		} else {
+			dutyTerritoryMap = sysDictItemList.stream().collect(Collectors.toMap(c -> c.getItemValue(), c -> c.getItemText()));
+		}
+		// 状态
+		Map<String,String> stateMap = CollectManifestStateEnum.toMap(cut);
+
+		// 插入配置列和认证类别列数据
+		for (Map<String, Object> record1 : dataList) {
+
+			String paramsCollectManifestId = (String) record1.get("id");
+			String nioNumber = (String) record1.get("nio_number");
+			String dutyTerritory = (String) record1.get("duty_territory");
+			String state = (String) record1.get("state");
+
+			// 处理负责领域
+			record1.put("duty_territory", dutyTerritoryMap.get(dutyTerritory));
+
+			// 处理负状态
+			record1.put("state", stateMap.get(state));
+
+			// 认证类别列
+			List<CertCategoryParamsInfoPublishEO> certCategoryParamsInfoPublishEOS = certCategoryParamsInfoPublishEOList.stream().filter(e->nioNumber.equals(e.getNioNumber())).collect(Collectors.toList());
+			if (CollectionUtil.isNotEmpty(certCategoryParamsInfoPublishEOS)) {
+				certCategoryParamsInfoPublishEOS.forEach(certCategoryParamsInfoPublishEO -> {
+					record1.put(certCategoryParamsInfoPublishEO.getCertCategory(), certCategoryParamsInfoPublishEO.getParamsNumber());
+				});
+			}
+
+			// 配置列
+			if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
+				List<OSSFile> fileList = new ArrayList<>();
+
+				paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
+
+					String paramsConfigId = paramsConfigEO.getId();
+					List<ParamsConfigDataEO> paramsConfigDataEOS = paramsConfigDataEOList.stream().filter(e-> paramsConfigId.equals(e.getParamsConfigId()) && paramsCollectManifestId.equals(e.getParamsCollectManifestId())).collect(Collectors.toList()); // 参数配置数据
+					StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
+					if (CollectionUtil.isNotEmpty(paramsConfigDataEOS)) {
+						ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOS.get(0);
+						if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
+							configDataBuilder.append(paramsConfigDataEO.getTextData()).append("#");
+						}
+						if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
+							configDataBuilder.append(paramsConfigDataEO.getPullData()).append("#");
+						}
+						if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
+							List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId());
+							if (CollectionUtil.isNotEmpty(ossFileList)) {
+								configDataBuilder.append(ossFileList.get(0).getFileName()).append("#");
+
+								fileList.addAll(ossFileList);
+							}
+						}
+
+					}
+
+					String configData = configDataBuilder.toString();
+					if (configData.contains("#")) {
+						configData = configData.substring(0, configData.lastIndexOf("#"));
+					}
+
+					record1.put(paramsConfigEO.getId(), configData);
+				});
+
+				record1.put("fileList", fileList);
+			}
+		}
+		return dataList;
+	}
+
+	private void downLoadFileList(List<OSSFile> fileTemplateList,Map<String ,String> fileNowPathMap) {
+		for(OSSFile fileExportDto : fileTemplateList){
+			String fileNowPath = fileNowPathMap.get(fileExportDto.getId());
+			File nowFile = new File(fileNowPath);
+			if (nowFile.exists()){
+				nowFile.delete();
+			}
+			nowFile.mkdirs();
+
+			String oldPath = fileExportDto.getUrl();
+			String newPath = fileNowPath + File.separator + fileExportDto.getFileName();
+			if (CosBootUtil.doesObjectExist(oldPath)){
+				try (InputStream in = CosBootUtil.download(oldPath);) {
+					copyFile(in, newPath);
+				} catch (IOException e) {
+					e.printStackTrace();
+					log.error(e.getMessage(), e);
+				}
+			}
+		}
+	}
+
+	private void copyFile(InputStream in, String destPath) throws IOException {
+		BufferedInputStream bis = new BufferedInputStream(in);
+		BufferedOutputStream bos =
+				new BufferedOutputStream(Files.newOutputStream(Paths.get(destPath),
+						StandardOpenOption.CREATE,
+						StandardOpenOption.TRUNCATE_EXISTING,
+						StandardOpenOption.WRITE));
+		// 打开输入流
+//        FileInputStream fis = new FileInputStream(srcPath);
+		// 打开输出流
+//        FileOutputStream fos = new FileOutputStream(destPath);
+		// 读取和写入信息
+		byte[] bytes = new byte[1024 * 1024];
+		int len;
+		while ((len = bis.read(bytes)) > 0) {
+			bos.write(bytes, 0, len);
+		}
+		// 关闭流  先开后关  后开先关
+		bos.close(); // 后开先关
+		bis.close(); // 先开后关
+	}
+
 	/**
 	 * 获取一个类和其父类的所有属性
 	 *
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
index 1564daa81..1421ccb64 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
@@ -22,7 +22,7 @@ public class ParamsCollectManifestVO {
     private String paramsTemplateId; // 参数模板id
 
     @ApiModelProperty(value = "参数模板发布版本")
-    private String paramsTemplatePublishVersion; // 参数模板发布版本
+    private Integer paramsTemplatePublishVersion; // 参数模板发布版本
 
     @ApiModelProperty(value = "nio编号")
     private String nioNumber; // nio编号
@@ -71,4 +71,7 @@ public class ParamsCollectManifestVO {
     private String targetConfigIds; // 引用参数专用
 
     private String cut; // 引用参数专用
+
+    private String exportName; // 导出文件名
+
 }

From 147a4fa06d924b8d2362bcf4d90fffda03565fa7 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 21 Jul 2022 13:46:34 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/exportTree/index.vue             | 0
 jero-web/src/views/externalReports/components/handle.vue | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 jero-web/src/components/exportTree/index.vue
 create mode 100644 jero-web/src/views/externalReports/components/handle.vue

diff --git a/jero-web/src/components/exportTree/index.vue b/jero-web/src/components/exportTree/index.vue
new file mode 100644
index 000000000..e69de29bb
diff --git a/jero-web/src/views/externalReports/components/handle.vue b/jero-web/src/views/externalReports/components/handle.vue
new file mode 100644
index 000000000..e69de29bb

From aac1a5028b6cce11c118605e9b649152e064ccf4 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 21 Jul 2022 13:48:24 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   2 +
 jero-web/src/common/lang/zh-cn.js             |   2 +
 .../externalReports/components/addModel.vue   | 537 +++++++++---------
 .../externalReports/components/handle.vue     | 286 ++++++++++
 jero-web/src/views/externalReports/index.vue  | 167 +++---
 5 files changed, 658 insertions(+), 336 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 2f5a87c4c..6199f3709 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1165,4 +1165,6 @@ module.exports = {
   exportComparisonReport:'Export Comparison Report',
   comparisonDifferenceComment:'Comparison Difference Comment',
   fullTextComments:'Full text comments',
+  fileDeclaration:'file Declaration',
+  FileForDetails:'File For Details',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 0634c24d7..2957a5ace 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1169,4 +1169,6 @@ module.exports = {
   exportComparisonReport:'导出对比报告',
   comparisonDifferenceComment:'对比差异评论',
   fullTextComments:'全文评论',
+  fileDeclaration:'文件说明',
+  FileForDetails:'文件详情',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/externalReports/components/addModel.vue b/jero-web/src/views/externalReports/components/addModel.vue
index 67d93b664..c557ad5d5 100644
--- a/jero-web/src/views/externalReports/components/addModel.vue
+++ b/jero-web/src/views/externalReports/components/addModel.vue
@@ -1,316 +1,309 @@
 <template>
-  <div class='diolag-area'>
-    <a-spin :spinning='spinLoading'>
-      <a-form-model
-        class='tag-module'
-        ref='ruleForm'
-        :model='formData'
-        :rules='rules'
-        :label-col='labelCol'
-        :wrapper-col='wrapperCol'
-      >
-        <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.dutyTerritory"
-                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                 :type="'select'"
-                                 :triggerChange="false" :dictCode="'duty_territory'"/>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span='9'>
-            <a-form-model-item :label="$t('RelatedItems')" prop='ListTitle'>
-              <a-select class="box-input" v-model="formData.projectNameId"
-                        :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
-                <a-select-option v-for="(element,index) in RelatedItemList" :key="element.id" :value="element.id">
-                  {{element.projectName}}
-                </a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span='6' style='margin-top: 4px;'>
-            <a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
-            <a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
-          </a-col>
-        </a-row>
-      </a-form-model>
+  <a-modal
+    :title="title"
+    :maskClosable="false"
+    :width="800"
+    placement="right"
+    :closable="true"
+    @cancel="handleCancel"
+    :visible="visible"
+    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    <a-spin :spinning="confirmLoading">
+      <a-form>
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text"
+                        :title="$t('parameterTemplate')">{{$t('parameterTemplate')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model.trim="formInline.paramsTemplateName"
+                           :placeholder="$t('PleaseEnter')+$t('parameterTemplate')"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="region">
+                  <j-dict-select-tag class="box-input" v-model="formInline.region"
+                                     :disabled="disabled"
+                                     :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
+                                     :type="'select'"
+                                     :triggerChange="false" :dictCode="'region'"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('contentDescription')">{{$t('contentDescription')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="description">
+                  <a-input class="box-input add-input"
+                           type="textarea"
+                           :disabled="disabled"
+                           v-model="formInline.description"
+                           :placeholder="$t('PleaseEnter')+$t('contentDescription')"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </a-form>
     </a-spin>
-    <div class="table-operator" style='float: right;margin-top: -20px'>
-      <a-button type="primary" icon="download" @click="handleExportXls()">{{ $t('export') }}</a-button>
+    <div class="drawer-bootom-button">
+      <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
+      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
     </div>
-<!--    :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'-->
-    <a-table
-      class='table-area'
-      ref='table'
-      size='middle'
-      rowKey='id'
-      :columns='columns'
-      :dataSource='areaTable'
-      :pagination='false'
-      :loading='loading'
-      :scroll='{x: 600}'
-
-      @change='handleTableChange'>
-
-<!--      <template slot="file" slot-scope="text, record">-->
-<!--        <a class="action-edit" href="javascript:;" @click="dowloadfile(record)" v-has="'bqnrzdpzxlbj'">{{record.exportFileName}}</a>-->
-<!--      </template>-->
-    </a-table>
-<!--    <div class="page" style='display: flex;justify-content: flex-end;'>-->
-<!--      <a-pagination-->
-<!--        :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
-<!--        show-quick-jumper-->
-<!--        show-size-changer-->
-<!--        :page-size.sync="pageSize"-->
-<!--        :total="total"-->
-<!--        :current="pageNo"-->
-<!--        @change="pageOnChange"-->
-<!--        @showSizeChange="SizeChange"-->
-<!--      />-->
-<!--    </div>-->
-    <div class="table-operator" >
-      <a-button type="primary" v-if='this.opinionGather > 0'  @click="handlecomments()">{{ $t('CommentsCollectionResultsForReference') }}</a-button>
-      <a-button type="primary" v-if='this.technologyEvaluation > 0'  @click="handletechnical()">{{ $t('TechnicalEvaluationResultsForReference') }}</a-button>
-    </div>
-    <!--    <div class='drawer-bootom-button'>-->
-    <!--      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>-->
-    <!--      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>-->
-    <!--    </div>-->
-  </div>
+  </a-modal>
 </template>
 
 <script>
-import { putAction, postAction, getAction, deleteAction ,downloadFile } from '@/api/manage'
-import axios from 'axios'
-import Vue from 'vue'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
+import PersonnelSelection from '@/components/PersonnelSelection/index'
+import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
 
 export default {
-  name: 'diolagArea',
-  components: {},
+  name: 'addModel',
+  components: {
+    PersonnelSelection
+  },
+  props: ['url'],
   data() {
     return {
-      token:Vue.ls.get(ACCESS_TOKEN),
-      title: this.$t('add'),
-      total: 0,
-      selectedRowKeysDate: {},
-      opinionGather:'',
-      technologyEvaluation:'',
-      loading: false,
-      editId: '',
-      RelatedItemList:[],
-      columns: [
-        {
-          title: this.$t('areaOfResponsibility'),
-          dataIndex: 'dutyTerritory_dicText',
-          width: 120,
-          align: 'center',
-          ellipsis: true
-        },
-        {
-          title: this.$t('RelatedItems'),
-          align: 'center',
-          width: 120,
-          dataIndex: 'projectName',
-          ellipsis: true
-        },
-        {
-          title: this.$t('designComplianceReview'),
-          align: 'center',
-          width: 250,
-          dataIndex: 'designStatus_dicText',
-          ellipsis: true
-        },
-        {
-          title: this.$t('preHomeConfirmation'),
-          align: 'center',
-          width: 270,
-          dataIndex: 'prehomoStatus_dicText',
-          ellipsis: true
-        },
-        {
-          title: this.$t('verificationComplianceReview'),
-          align: 'center',
-          width: 270,
-          dataIndex: 'verifyStatus_dicText',
-          scopedSlots: { customRender: 'file' },
-          ellipsis: true
-        }
-      ],
-      newVisible: false,
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 7 }
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 14 }
-      },
-      form: {},
-      formData: {
-        projectName:'',
-      },
+      formInline: {},
+      confirmLoading: false,
+      visible: false,
       rules: {
-        title: [
-          { required: true, message: this.$t('enterTitle'), trigger: 'blur' }
+        paramsTemplateName:[
+          { required: true, message: this.$t('PleaseEnter')+this.$t('parameterTemplate'), trigger: 'blur' },
+          { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('characters'), trigger: 'blur' },
+        ],
+        description:[
+          { min:1, max: 300, message: this.$t('cantExeed')+'300'+this.$t('characters'), trigger: 'blur' },
+        ],
+        state: [
+          { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' },
+        ],
+        region: [
+          { required: true, message: this.$t('PleaseSelect')+this.$t('zoneOfApplication'), trigger: 'change' },
         ]
       },
-      areaTable: [],
-      flag: false,  //表单提交标识
-      spinLoading: false,
-      confirmLoading: false,
-      selectedRowKeys: [],
-      pageNo: 1,
-      pageSize: 10,
-      listVisible: false,
+      disabled: false,
+      projectNameList: [],
+      title: ''
     }
   },
-  props: {
-    item: {
-      type: Object,
-      default: '',
-      require: true
-    },
-    paramsManifestId: {
-      type: String,
-      default: '',
-      require: true
-    },
-  },
   mounted() {
-    this.loadData()
-    this.getRelatedItemList()
+    this.getNameList()
   },
   methods: {
-    getRelatedItemList(){
-      getAction('/project/projectNameInfoEO/list', {}).then((res) => {
+    getNameList() {
+      getAction('project/projectNameInfoEO/list', {}).then((res) => {
         if (res.success) {
-          this.RelatedItemList = res.result
+          this.projectNameList = res.result || []
+        } else {
+          this.projectNameList = []
         }
       })
     },
-    pageOnChange(page, pageSize) {
-      this.pageNo = page
-      this.loadData()
-    },
-    SizeChange(page, pageSize) {
-      this.pageNo = 1
-      this.pageSize = pageSize
-      this.loadData()
-    },
-    // 法规意见收集列表
-    handlecomments(){
-      this.$router.push({
-        path: '/collectionOfRegulatoryOpinions',
-        query:{
-          serialNumber:this.item.serialNumber
-        }
+    addModel() {
+      this.visible = true
+      this.title = this.$t('UploadFile')
+      this.formInline = {}
+      this.$nextTick(() => {
+        this.$refs['ruleForm'].clearValidate()
       })
     },
-    // 法规技术评估列表
-    handletechnical(){
-
-      this.$router.push({
-        path: '/technologyAssessment',
-        query:{
-          serialNumber:this.item.serialNumber
-        }
+    editModel(value) {
+      this.visible = true
+      this.title = this.$t('edit')
+      this.$nextTick(() => {
+        this.formInline = value
+        this.$refs['ruleForm'].clearValidate()
       })
     },
-    loadData() {
-      let params = {
-        id:this.paramsManifestId,
-        dutyTerritory:this.formData.dutyTerritory?this.formData.dutyTerritory:'',
-        projectName:this.formData.projectName?this.formData.projectName:'',
-        projectNameId:this.formData.projectNameId?this.formData.projectNameId:'',
-      }
-      this.loading = true
-      getAction('project/lawsComplianceBoard/queryComplianceResultList', params).then((res) => {
-        if (res.success) {
-          this.areaTable = res.result.complianceResultList
-          this.opinionGather = res.result.opinionGather
-          this.technologyEvaluation = res.result.technologyEvaluation
-          this.loading = false
-        }else{
-          this.loading = false
-        }
-      })
-    },
-    //导出
-    handleExportXls(){
-      let query = {
-        id:this.paramsManifestId,
-        ...this.formData
-      }
-      downloadFile('/project/lawsComplianceBoard/exportComplianceResultDetail', this.$t('complianceResults')+'.xls', query, this.Deselect)
-    },
-    searchQuery() {
-      this.loadData()
-    },
-    searchReset() {
-      this.formData = {}
-      this.loadData()
-    },
     handleCancel() {
-      this.$emit('areaVisible', false)
+      this.visible = false
     },
-    onSelectChange(selectedRowKeys, selectedRowKeysDate) {
-      this.selectedRowKeysDate = selectedRowKeysDate
-      this.selectedRowKeys = selectedRowKeys
+    handleSubmit() {
+      if(this.formInline.paramsTemplateName !== undefined) {
+        this.formInline.paramsTemplateName = this.formInline.paramsTemplateName.trim()
+      }
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          let url = ''
+          let Action
+          if (this.formInline.id) {
+            url = this.url.edit
+            Action = putAction
+          } else {
+            url = this.url.add
+            Action = postAction
+          }
+          let query = JSON.parse(JSON.stringify(this.formInline))
+          Object.keys(query).forEach(res => {
+            if (query[res] && query[res] instanceof Array) {
+              query[res] = query[res].join(',')
+            }
+          })
+          this.confirmLoading = true
+          Action(url, query).then((res) => {
+            if (res.success) {
+              this.confirmLoading = false
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.visible = false
+              this.$emit('addModelList')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+            }
+          })
+        }
+      })
     },
-    handleTableChange(val) {
-      console.log(',,,')
+    handleInput(value) {
+      this.$nextTick(() => {
+        this.formInline = { ...this.formInline }
+        this.$refs.ruleForm.validateField([value])
+      })
     },
-    showModal() {
-      this.title = this.$t('add')
-      this.newVisible = true
-      this.form = {}
+    PersonnelSelectionChange(value, id) {
+      this.formInline[value] = id
+      this.formInline = { ...this.formInline }
+    },
+    projectNameChange(value){
+      console.log(value)
     },
-  },
-  watch: {
-    selectedRowKeyS(val) {
-      this.selectedRowKeys = val
-    }
   }
-
 }
 </script>
-
-<style lang='less' scoped>
-@import '~@assets/less/common.less';
-
-.diolag-area {
-  .table-area {
-    margin: 20px 0;
-
-    .action-edit {
-      margin-right: 10px;
-    }
-  }
-
-  .table-del {
-    color: red;
-  }
+<style>
+.formAdd .ant-form-item-label {
+  width: 130px;
 }
-.drawer-bootom-button{
+
+.formAdd .ant-form-item-control-wrapper {
+  display: inline-block;
+  width: 100%;
+}
+
+/*.formAdd .ant-form-item {*/
+/*  margin-bottom: 20px;*/
+/*}*/
+
+.itemModel .ant-form-item-control-wrapper {
+  width: 100%;
+}
+
+.box-input .ant-select-selection--single {
+  height: 38px;
+}
+
+.box-input .ant-select-selection--multiple {
+  height: 38px;
+}
+
+.box-input .ant-select-selection__rendered {
+  line-height: 38px;
+  height: 38px;
+}
+
+.box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+  margin-top: 6px;
+}
+
+.box-input .ant-calendar-picker {
+  line-height: 38px;
+  height: 38px;
+}
+
+.box-input .ant-calendar-picker-input {
+  height: 38px;
+}
+
+.box-input .ant-input-number-input-wrap {
+  line-height: 38px;
+  height: 38px;
+}
+</style>
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
   display: flex;
-  justify-content: center;
+  /*align-items: center;*/
 }
+
+.title-text {
+  width: 114px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 48px;
+}
+
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
 .Required {
   color: red;
   margin-right: 4px;
 }
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+
+.formAdd {
+  margin-bottom: 40px;
+}
+
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  z-index:100;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+/deep/.add-input{
+  min-height: 135px!important;
+}
 </style>
-<style lang='less'>
-.area-module {
-  .ant-modal-wrap {
-    .ant-modal {
-      .ant-modal-content {
-        .ant-modal-footer {
-          text-align: center;
-        }
-      }
-    }
-  }
+<style>
+.ant-input-disabled {
+  color: rgba(0, 0, 0, 0.65) !important;
 }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/externalReports/components/handle.vue b/jero-web/src/views/externalReports/components/handle.vue
index e69de29bb..b27c7847a 100644
--- a/jero-web/src/views/externalReports/components/handle.vue
+++ b/jero-web/src/views/externalReports/components/handle.vue
@@ -0,0 +1,286 @@
+<template>
+  <a-modal
+    :title="title"
+    :maskClosable="false"
+    :width="800"
+    placement="right"
+    :closable="true"
+    @cancel="handleCancel"
+    :visible="visible"
+    style="height: 80%;overflow: auto;padding-bottom: 53px;">
+<!--    <a-spin :spinning="confirmLoading">-->
+      <a-form>
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+          <a-row :gutter="24">
+            <a-col :span="12">
+                <div style='margin-left: 55px;width: 700px'>
+                  <span :title="$t('parameterTemplate')">{{$t('parameterTemplate')}}：</span>
+                  <span style='margin-left: 5px' :title="$t('parameterTemplate')">{{$t('parameterTemplate')}}</span>
+                  <a style='margin-left: 533px' @click="download(record)">{{$t('download')}}</a>
+                </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text" style='margin-top: 5px'>
+                <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('fileDeclaration')">{{$t('fileDeclaration')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="description">
+                  <a-input class="box-input add-input"
+                           :readOnly="true"
+                           type="textarea"
+                           :disabled="disabled"
+                           v-model="formInline.description"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </a-form>
+<!--    </a-spin>-->
+    <div class="drawer-bootom-button">
+      <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('close')}}</a-button>
+<!--      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('close')}}</a-button>-->
+    </div>
+  </a-modal>
+</template>
+
+<script>
+import PersonnelSelection from '@/components/PersonnelSelection/index'
+import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
+
+export default {
+  name: 'addModel',
+  components: {
+    PersonnelSelection
+  },
+  props: ['url'],
+  data() {
+    return {
+      formInline: {},
+      confirmLoading: false,
+      visible: false,
+      rules: {
+        paramsTemplateName:[
+          { required: true, message: this.$t('PleaseEnter')+this.$t('parameterTemplate'), trigger: 'blur' },
+          { min:1, max: 50, message: this.$t('cantExeed')+'50'+this.$t('characters'), trigger: 'blur' },
+        ],
+        description:[
+          { min:1, max: 300, message: this.$t('cantExeed')+'300'+this.$t('characters'), trigger: 'blur' },
+        ],
+        state: [
+          { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' },
+        ],
+        region: [
+          { required: true, message: this.$t('PleaseSelect')+this.$t('zoneOfApplication'), trigger: 'change' },
+        ]
+      },
+      disabled: false,
+      projectNameList: [],
+      title: ''
+    }
+  },
+  mounted() {
+    this.getNameList()
+  },
+  methods: {
+    getNameList() {
+      getAction('project/projectNameInfoEO/list', {}).then((res) => {
+        if (res.success) {
+          this.projectNameList = res.result || []
+        } else {
+          this.projectNameList = []
+        }
+      })
+    },
+    addModel() {
+      this.visible = true
+      this.title = this.$t('FileForDetails')
+      this.formInline = {}
+      this.$nextTick(() => {
+        this.$refs['ruleForm'].clearValidate()
+      })
+    },
+    editModel(value) {
+      this.visible = true
+      this.title = this.$t('edit')
+      this.$nextTick(() => {
+        this.formInline = value
+        this.$refs['ruleForm'].clearValidate()
+      })
+    },
+    handleCancel() {
+      this.visible = false
+    },
+    handleSubmit() {
+      if(this.formInline.paramsTemplateName !== undefined) {
+        this.formInline.paramsTemplateName = this.formInline.paramsTemplateName.trim()
+      }
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          let url = ''
+          let Action
+          if (this.formInline.id) {
+            url = this.url.edit
+            Action = putAction
+          } else {
+            url = this.url.add
+            Action = postAction
+          }
+          let query = JSON.parse(JSON.stringify(this.formInline))
+          Object.keys(query).forEach(res => {
+            if (query[res] && query[res] instanceof Array) {
+              query[res] = query[res].join(',')
+            }
+          })
+          this.confirmLoading = true
+          Action(url, query).then((res) => {
+            if (res.success) {
+              this.confirmLoading = false
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.visible = false
+              this.$emit('addModelList')
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+              this.confirmLoading = false
+            }
+          })
+        }
+      })
+    },
+    handleInput(value) {
+      this.$nextTick(() => {
+        this.formInline = { ...this.formInline }
+        this.$refs.ruleForm.validateField([value])
+      })
+    },
+    PersonnelSelectionChange(value, id) {
+      this.formInline[value] = id
+      this.formInline = { ...this.formInline }
+    },
+    projectNameChange(value){
+      console.log(value)
+    },
+  }
+}
+</script>
+<style>
+.formAdd .ant-form-item-label {
+  width: 130px;
+}
+
+.formAdd .ant-form-item-control-wrapper {
+  display: inline-block;
+  width: 100%;
+}
+
+/*.formAdd .ant-form-item {*/
+/*  margin-bottom: 20px;*/
+/*}*/
+
+.itemModel .ant-form-item-control-wrapper {
+  width: 100%;
+}
+
+.box-input .ant-select-selection--single {
+  height: 38px;
+}
+
+.box-input .ant-select-selection--multiple {
+  height: 38px;
+}
+
+.box-input .ant-select-selection__rendered {
+  line-height: 38px;
+  height: 38px;
+}
+
+.box-input .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+  margin-top: 6px;
+}
+
+.box-input .ant-calendar-picker {
+  line-height: 38px;
+  height: 38px;
+}
+
+.box-input .ant-calendar-picker-input {
+  height: 38px;
+}
+
+.box-input .ant-input-number-input-wrap {
+  line-height: 38px;
+  height: 38px;
+}
+</style>
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  /*align-items: center;*/
+}
+
+.title-text {
+  width: 114px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 48px;
+}
+
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.title-text-text {
+  margin-top: 9px;
+}
+
+
+.formAdd {
+  margin-bottom: 40px;
+}
+
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  z-index:100;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+/deep/.add-input{
+  min-height: 135px!important;
+}
+</style>
+<style>
+.ant-input-disabled {
+  color: rgba(0, 0, 0, 0.65) !important;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index 157836add..2467169d4 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -1,64 +1,49 @@
 <template>
+<div style='display:flex'>
+<!--  <a-card>-->
+<!--    <div style='width: 400px;background-color: red'></div>-->
+<!--  </a-card>-->
   <a-card :bordered="false">
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :md="6" :sm="8">
             <div class="box-title-text">
-              <div class="title-text" :title="$t('standard')">
-                <span>{{ $t('standard') }}</span>
+              <div class="title-text" :title="$t('fileName')">
+                <span>{{ $t('fileName') }}</span>
               </div>
-              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                       v-model="queryParam.serialNumber"></a-input>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('fileName')"
+                       v-model="queryParam.fileName"></a-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
             <div class="box-title-text">
-              <div class="title-text" :title="$t('title')">
-                <span>{{$t('title')}}</span>
+              <div class="title-text" :title="$t('uploadedBy')">
+                <span>{{$t('uploadedBy')}}</span>
               </div>
-              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                       v-model="queryParam.title"></a-input>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('uploadedBy')"
+                       v-model="queryParam.uploadedBy"></a-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
             <div class="box-title-text">
-              <div class="title-text" :title="$t('status')">
-                <span>{{ $t('status') }}</span>
+              <div class="title-text" :title="$t('uploadTime')">
+                <span>{{ $t('uploadTime') }}</span>
               </div>
-              <j-dict-select-tag class="box-input" v-model="queryParam.state"
-                                 :placeholder="$t('PleaseSelect')+$t('status')"
-                                 :type="'select'"
-                                 :triggerChange="false" :dictCode="'state'"/>
-            </div>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('technicalField')">
-                <span>{{ $t('technicalField') }}</span>
-              </div>
-              <a-tree-select
-                tree-node-filter-prop="title"
-                v-model="queryParam.technologyTerritory"
-                :maxTagCount="1"
-                :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                class="box-input"
-                style="width: 100%"
-                :tree-data="CategoryTreeList"
-                tree-checkable
-                :placeholder="$t('PleaseSelect')+$t('technicalField')"
-              />
-<!--              <j-dict-select-tag class="box-input" v-model="queryParam.technologyTerritory"-->
-<!--                                 :placeholder="$t('PleaseSelect')+$t('technicalField')"-->
-<!--                                 :type="'select'"-->
-<!--                                 :triggerChange="false" :dictCode="'duty_territory'"/>-->
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('uploadTime')"
+                             @change="onChange" @ok="onOk"
+                             format="YYYY-MM-DD"
+                             :getCalendarContainer="(trigger) => trigger.parentNode"
+                             v-model="queryParam.uploadTime"
+                             :disabled="false"/>
             </div>
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                   <globalAdvancedQuery ref="globalAdvancedQueryRef"
-                                        @handleSuperQuery="handleSuperQuery"
-                                        :fieldList="fieldList"/>
+<!--                   <globalAdvancedQuery ref="globalAdvancedQueryRef"-->
+                 <!--                                        @handleSuperQuery="handleSuperQuery"-->
+                 <!--                                        :fieldList="fieldList"/>-->
                   <a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
                   <a-button class="box-button" style="margin-left: 8px"
                             @click="searchReset">{{ $t('reset') }}</a-button>
@@ -69,9 +54,13 @@
     </div>
     <div class="table-operator" style="overflow:hidden;margin-bottom: 20px">
       <div style="float: right;margin-bottom: 0px;margin-left: 20px">
-        <div class="operator-text" @click="deriveconformanceresults()">
-          <a-icon type="solution"/>
-          {{ $t('Deriveconformanceresults') }}
+        <div class="operator-text" @click="handleuploadFile()">
+          <a-icon type="import"/>
+          {{ $t('UploadFile') }}
+        </div>
+        <div class="operator-text" @click="handleDel()">
+          <a-icon type="delete"/>
+          {{ $t('BatchDelete') }}
         </div>
       </div>
     </div>
@@ -93,7 +82,10 @@
           </a>
         </span>
         <span slot="operation" slot-scope="text,record">
-            <a class="text-operation" @click="handlecody(record)">{{$t('ViewConformanceResults')}}</a>
+            <a class="text-operation" @click="handlelist(record)">{{$t('view')}}</a>
+            <a class="text-operation" @click="download(record)">{{$t('download')}}</a>
+            <a class="text-operation" @click="handleEdit(record)">{{$t('edit')}}</a>
+            <a class="text-operation" @click="batchDel(record)">{{$t('delete')}}</a>
         </span>
       </a-table>
     </div>
@@ -109,15 +101,18 @@
         @showSizeChange="SizeChange"
       />
     </div>
-    <!--     导出历史模板-->
-    <a-modal class="show-drawer" :title="titleTag" width="1200px" v-model="drawerVisible" :footer="null">
-      <export-history v-if='drawerVisible' @areaVisible='drawerVisible = false' :paramsManifestId='paramsManifestId' :item='item'></export-history>
-    </a-modal>
+    <!--  上传文件-->
+    <addModel :url="url" ref="addModelRef" @addModelList="addModelList"/>
+    <!--  文件详情-->
+    <handleModel :url="url" ref="handleModelRef" />
   </a-card>
+</div>
+
 </template>
 
 <script>
-import ExportHistory from './components/addModel'
+import addModel from './components/addModel'
+import handleModel from './components/handle'
 import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
 import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
 import axios from 'axios'
@@ -129,7 +124,8 @@ import moment from 'moment'
 export default {
   name: 'index',
   components: {
-    ExportHistory,
+    addModel,
+    handleModel,
     globalAdvancedQuery
   },
   data() {
@@ -162,22 +158,19 @@ export default {
       title: '新增',
       columns: [
         {
-          title: this.$t('standard'),
+          title: this.$t('fileName'),
           align: 'center',
           dataIndex: 'serialNumber',
-          width: 180
         },
         {
-          title: this.$t('title'),
+          title: this.$t('fileDeclaration'),
           align: 'center',
           dataIndex: 'title',
-          width: 180
         },
         {
-          title: this.$t('status'),
+          title: this.$t('uploadedBy'),
           align: 'center',
           dataIndex: 'state_dicText',
-          width: 180
         },
         // {
         //   title: this.$t('category'),
@@ -185,12 +178,13 @@ export default {
         //   dataIndex: 'category'
         // },
         {
-          title: this.$t('technicalField'),
+          title: this.$t('uploadTime'),
           align: 'center',
-          dataIndex: 'technologyTerritory_dicText'
+          dataIndex: 'technologyTerritory_dicText',
+          width: 250
         },
         {
-          title: this.$t('RegulatoryProcessEvaluationResults'),
+          title: this.$t('operation'),
           align: 'center',
           fixed: 'right',
           width: 250,
@@ -268,12 +262,9 @@ export default {
       }
       downloadFile('/project/lawsComplianceBoard/exportComplianceResult', this.$t('complianceResults')+'.xls', query, this.Deselect)
     },
-    // 导出历史
-    handlecody(e) {
-      this.drawerVisible = true
-      this.titleTag = e.serialNumber + this.$t('ComplianceConfirmationRecord')
-      this.paramsManifestId = e.id
-      this.item = {...e}
+    // 上传文件
+    handleuploadFile(e) {
+      this.$refs.addModelRef.addModel()
     },
     hideModal() {
       this.visible = false
@@ -327,6 +318,54 @@ export default {
       }
       this.getList()
     },
+    //查看
+    handlelist(){
+      this.$refs.handleModelRef.addModel()
+    },
+    //编辑
+    handleEdit(item) {
+      this.$refs.addModelRef.editModel(JSON.parse(JSON.stringify(item)))
+    },
+    //删除
+    batchDel(val) {
+      let _this = this
+      this.$confirm({
+        content: _this.$t('ConfirmDelete'),
+        onOk() {
+          getAction(_this.url.deleteBatch, { id: val.id }).then((res) => {
+            if (res.success) {
+              _this.$message.success(_this.$t('OperationSuccessful'))
+              _this.getList()
+            } else {
+              _this.$message.warning(_this.$t('operationFailed'))
+            }
+          })
+        }
+      })
+    },
+    //批量删除
+    handleDel() {
+      if (this.selectedRowKeys.length > 0) {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('ConfirmBatchDeletion'),
+          onOk() {
+            let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+            getAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.selectedRowKeys = []
+                _this.getList()
+              } else {
+                _this.$message.warning(res.message)
+              }
+            })
+          }
+        })
+      } else {
+        this.$message.warning(this.$t('selectLeastOne'))
+      }
+    },
     getList() {
       let territory = ''
       if (this.queryParam.technologyTerritory) {

From 8d18ed2bdda270474e06ba9a631a65aa323873b2 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 21 Jul 2022 15:39:48 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cert/collect/controller/ParamsManifestEOController.java    | 1 +
 .../com/jero/modules/cert/collect/entity/ParamsManifestEO.java | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
index 232eab6f5..d07e31719 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
@@ -83,6 +83,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 		// 处理 状态 中英文
 		Map<String, String> stateMap = ManifestStateEnum.toMap(cut);
 		rows.forEach(manifestEO -> {
+			manifestEO.setProjectName(paramsManifestEOService.getProjectById(manifestEO.getProjectId()).getProjectName());
 			manifestEO.setState(stateMap.get(manifestEO.getState()));
 		});
 		return Result.OK(cut, pageList);
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
index 4862bf93f..0e5fa32ec 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
@@ -100,4 +100,7 @@ public class ParamsManifestEO implements Serializable {
     @TableField(exist = false)
     private String cut;
 
+    @TableField(exist = false)
+    private String projectName;
+
 }

From 4c5e71459a4025d63a07d13ea2b092ffea06e85b Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 21 Jul 2022 16:01:56 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../ParameterItemCollectionList.vue           | 55 ++++++++++++-------
 .../components/TaskParameterCollection.vue    |  4 +-
 4 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 6199f3709..423f7bcbd 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -421,6 +421,7 @@ module.exports = {
   MessageNotification: 'Message Notification',
   SeeMore: 'See More',
   OperationSuccessful: 'Operation Successful',
+  Intheexport: 'In The Export...',
   OperationFailed: 'Operation Failed',
   PersonnelSelection: 'Select ',
   EmployeeNumber: 'Employee ID',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 2957a5ace..30aeaec72 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -426,6 +426,7 @@ module.exports = {
   MessageNotification: '消息通知',
   SeeMore: '查看更多',
   OperationSuccessful: '操作成功',
+  Intheexport: '导出中...',
   operationFailed: '操作失败',
   PersonnelSelection: '人员选择',
   EmployeeNumber: '员工号',
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index f82aea684..b4f513c54 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/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')}}(Model - year market)——{{$t(this.paramsManifest.title)}}
+          {{$t('ParameteItemCollectionList')}}({{$t(this.$route.query.projectName)}})——{{$t(this.paramsManifest.title)}}
         </span>
       </div>
     </div>
@@ -108,10 +108,10 @@
             <!--      // R&H Manager manager-->
             <!--      // 系统管理员 admin-->
             <!--      // 游客 guest-->
-            <a-popconfirm overlayClassName='popconfirm' placement="bottomRight" v-if='currentPersonRole == "homo"'>
+            <a-popconfirm overlayClassName='popconfirm' placement="bottomRight" v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
               <template slot="title" id="popconfirm">
                 <!--      添加-->
-                <div @click="handleAdd" class="operator-text-title">
+                <div @click="handleAdd" class="operator-text-title" v-if='currentPersonRole == "homo"'>
                   <a-icon type="plus"/>
                   {{$t('addTo')}}
                 </div>
@@ -120,18 +120,24 @@
 <!--                  <a-icon type="solution"/>-->
 <!--                  {{$t('distributionAndCollection')}}-->
 <!--                </div>-->
+                <!--      导出-->
+                <div @click="handleExport" class="operator-text-title"
+                     v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
+                  <a-icon type="export"/>
+                  {{$t('export')}}
+                </div>
                 <!--     一键下发收集 -->
                 <div @click="defOneclickCollection" class="operator-text-title" v-if='currentPersonRole == "homo"'>
                   <a-icon type="solution"/>
                   {{$t('OneclickCollection')}}
                 </div>
                 <!--      冻结配置-->
-                <div @click="freezeConfiguration" class="operator-text-title">
+                <div @click="freezeConfiguration" class="operator-text-title" v-if='currentPersonRole == "homo"'>
                   <a-icon type="solution"/>
                   {{$t('FreezeConfiguration')}}
                 </div>
                 <!--   同步上报库   -->
-                <div @click="handleSynchronousReportLibraryJurisdiction" class="operator-text-title">
+                <div @click="handleSynchronousReportLibraryJurisdiction" class="operator-text-title" v-if='currentPersonRole == "homo"'>
                   <a-icon type="setting"/>
                   {{$t('SynchronousReportLibrary')}}
                 </div>
@@ -141,16 +147,16 @@
 <!--                  {{$t('TaskCutOffTime')}}-->
 <!--                </div>-->
                 <!--      批量删除-->
-                <div @click="handleDelJurisdiction" class="operator-text-title">
+                <div @click="handleDelJurisdiction" class="operator-text-title" v-if='currentPersonRole == "homo"'>
                   <a-icon type="delete"/>
                   {{$t('BatchDelete')}}
                 </div>
-                <div @click="bringInTheProjectInterfaceClick" class="operator-text-title">
+                <div @click="bringInTheProjectInterfaceClick" class="operator-text-title" v-if='currentPersonRole == "homo"'>
                   <a-icon type="profile"/>
                   {{$t('bringInTheProjectInterface')}}
                 </div>
               </template>
-              <div class="operator-text" style="position: relative">
+              <div class="operator-text" style="position: relative " @click='morepop' v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
                 <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
               </div>
             </a-popconfirm>
@@ -192,12 +198,7 @@
               <a-icon type="delete"/>
               {{$t('CompulsoryWithdrawal')}}
             </div>
-            <!--      导出-->
-            <div @click="handleExport" class="operator-text"
-                 v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
-              <a-icon type="export"/>
-              {{$t('export')}}
-            </div>
+
             <!--       角色切换   -->
             <div class="operator-text"
                  v-if="!this.$route.query.it"
@@ -808,14 +809,26 @@
       },
       //导出
       handleExport(){
-        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
-        let query = {
-          ...this.queryParam,
-          ...this.queryParamQuery,
-          ids: selectedRowKeys.join(','),
-          dummyInventoryBaseId: this.$route.query.id
+        console.log(this.$route.query)
+        let long = localStorage.getItem('language')
+        this.cut = ''
+        if (long && long === 'zh-cn') {
+          this.cut = 'cn'
+        } else if (long && long === 'en-us') {
+          this.cut = 'en'
         }
-        downloadFile(this.url.exportData, this.$route.query.name + this.$t('VirtualList') + '.zip', query, this.Deselect)
+        let query = {
+          paramsManifestId: this.paramsManifest.id,
+          paramsTemplateId: this.$route.query.paramsTemplateId,
+          paramsTemplatePublishVersion:1,
+          cut: this.cut,
+          exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')'
+        }
+        console.log(query)
+        getAction('/params/collectManifest/exportAll', query).then((res) => {
+            this.$message.success(this.$t('Intheexport'))
+          this.textLoading = false
+        })
       },
       // 高级搜索
       handleSuperQuery(params, matchType) {
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
index d2cc97db2..e172375ac 100644
--- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
@@ -255,7 +255,9 @@
             localStorage.setItem('paramsManifest', JSON.stringify(item))
             let newUrl = _this.$router.resolve({
               path: '/ParameterItemCollection',
-              query: item
+              query:  item
+                // projectName:this.$route.query.projectName
+
             })
             window.open(newUrl.href, '_blank')
           } else {

From 3ecfe6accd042e9473d197edd842721f9514f260 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 21 Jul 2022 17:19:51 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95-=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=E7=8A=B6=E6=80=81=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsCollectManifestEOServiceImpl.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 7db02d212..f0ea1ec22 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1393,7 +1393,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		paramsCollectManifestEOList = paramsCollectManifestEOList.stream().sorted(Comparator.comparing(ParamsCollectManifestBaseEO::getNioNumber)).collect(Collectors.toList()); // 按NIO编号升序
  		for (ParamsCollectManifestEO paramsCollectManifestEO : paramsCollectManifestEOList) {
 			// 判断参数项状态
-			if (CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(paramsCollectManifestEO.getState())) {
+			if (CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(paramsCollectManifestEO.getState())
+					|| CollectManifestStateEnum.SDT_BACK.getValue().equals(paramsCollectManifestEO.getState())
+					|| CollectManifestStateEnum.CHANGE.getValue().equals(paramsCollectManifestEO.getState())) {
 				if (StringUtils.isNotBlank(paramsCollectManifestEO.getSdt())) {
 					ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
 					updateEO.setId(paramsCollectManifestEO.getId());
@@ -1517,7 +1519,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		List<ParamsCollectManifestEO> paramsCollectManifestEOList = list(queryWrapper);
 		for (ParamsCollectManifestEO paramsCollectManifestEO : paramsCollectManifestEOList) {
 			// 判断参数项状态
-			if (CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(paramsCollectManifestEO.getState())) {
+			if (CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(paramsCollectManifestEO.getState())
+					|| CollectManifestStateEnum.SDT_BACK.getValue().equals(paramsCollectManifestEO.getState())
+					|| CollectManifestStateEnum.CHANGE.getValue().equals(paramsCollectManifestEO.getState())) {
 				if (StringUtils.isNotBlank(paramsCollectManifestEO.getSdt())) {
 					ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
 					updateEO.setId(paramsCollectManifestEO.getId());

From d637e943958aa8851d401066481cecf1804f71c0 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 21 Jul 2022 17:28:54 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E6=A0=91=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/exportTree/index.vue | 125 +++++++++++++++++++
 jero-web/src/views/externalReports/index.vue |  10 +-
 2 files changed, 132 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/components/exportTree/index.vue b/jero-web/src/components/exportTree/index.vue
index e69de29bb..fa269e4b0 100644
--- a/jero-web/src/components/exportTree/index.vue
+++ b/jero-web/src/components/exportTree/index.vue
@@ -0,0 +1,125 @@
+<template>
+  <div>
+    <a-input-search style="margin-bottom: 8px" placeholder="Search" @change="onChange" />
+    <a-tree
+      :expanded-keys="expandedKeys"
+      :auto-expand-parent="autoExpandParent"
+      :tree-data="gData"
+      @expand="onExpand"
+    >
+      <template slot="title" slot-scope="{ title }">
+        <span v-if="title.indexOf(searchValue) > -1">
+          {{ title.substr(0, title.indexOf(searchValue)) }}
+          <span style="color: #f50">{{ searchValue }}</span>
+          {{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
+        </span>
+        <span v-else>{{ title }}</span>
+      </template>
+      <template>
+        <a-dropdown :trigger="['contextmenu']">
+          <span>{{ title }}</span>
+          <template #overlay>
+            <a-menu @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey)">
+              <a-menu-item key="1">1st menu item</a-menu-item>
+              <a-menu-item key="2">2nd menu item</a-menu-item>
+              <a-menu-item key="3">3rd menu item</a-menu-item>
+            </a-menu>
+          </template>
+        </a-dropdown>
+      </template>
+    </a-tree>
+  </div>
+</template>
+
+<script>
+const x = 3;
+const y = 2;
+const z = 1;
+const gData = [];
+
+const generateData = (_level, _preKey, _tns) => {
+  const preKey = _preKey || '0';
+  const tns = _tns || gData;
+
+  const children = [];
+  for (let i = 0; i < x; i++) {
+    const key = `${preKey}-${i}`;
+    tns.push({ title: key, key, scopedSlots: { title: 'title' } });
+    if (i < y) {
+      children.push(key);
+    }
+  }
+  if (_level < 0) {
+    return tns;
+  }
+  const level = _level - 1;
+  children.forEach((key, index) => {
+    tns[index].children = [];
+    return generateData(level, key, tns[index].children);
+  });
+};
+generateData(z);
+
+const dataList = [];
+const generateList = data => {
+  for (let i = 0; i < data.length; i++) {
+    const node = data[i];
+    const key = node.key;
+    dataList.push({ key, title: key });
+    if (node.children) {
+      generateList(node.children);
+    }
+  }
+};
+generateList(gData);
+
+const getParentKey = (key, tree) => {
+  let parentKey;
+  for (let i = 0; i < tree.length; i++) {
+    const node = tree[i];
+    if (node.children) {
+      if (node.children.some(item => item.key === key)) {
+        parentKey = node.key;
+      } else if (getParentKey(key, node.children)) {
+        parentKey = getParentKey(key, node.children);
+      }
+    }
+  }
+  return parentKey;
+};
+export default {
+  data() {
+    return {
+      searchValue: '',
+      autoExpandParent: true,
+      expandedKeys: ['0-0-0', '0-0-1'],
+      gData,
+    };
+  },
+  methods: {
+    onExpand(expandedKeys) {
+      this.expandedKeys = expandedKeys;
+      this.autoExpandParent = false;
+    },
+    onChange(e) {
+      const value = e.target.value;
+      const expandedKeys = dataList
+        .map(item => {
+          if (item.title.indexOf(value) > -1) {
+            return getParentKey(item.key, gData);
+          }
+          return null;
+        })
+        .filter((item, i, self) => item && self.indexOf(item) === i);
+      Object.assign(this, {
+        expandedKeys,
+        searchValue: value,
+        autoExpandParent: true,
+      });
+    },
+    onContextMenuClick(treeKey, menuKey) {
+      console.log(`treeKey: ${treeKey}, menuKey: ${menuKey}`);
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index 2467169d4..329442c47 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -1,8 +1,10 @@
 <template>
 <div style='display:flex'>
-<!--  <a-card>-->
-<!--    <div style='width: 400px;background-color: red'></div>-->
-<!--  </a-card>-->
+  <a-card :bordered="false">
+    <div style='width: 300px;background-color: white'>
+      <exportTree ref="exportRef" />
+    </div>
+  </a-card>
   <a-card :bordered="false">
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -115,6 +117,7 @@ import addModel from './components/addModel'
 import handleModel from './components/handle'
 import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
 import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
+import exportTree from '@/components/exportTree/index'
 import axios from 'axios'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 // import eventBUs from '../../../common/event'
@@ -126,6 +129,7 @@ export default {
   components: {
     addModel,
     handleModel,
+    exportTree,
     globalAdvancedQuery
   },
   data() {

From 907036800481d733ee7049d4d457dda95f3d215f Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 21 Jul 2022 17:47:51 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E6=94=B6=E9=9B=86-=E5=AF=BC=E5=87=BA=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ParameterItemCollectionList.vue                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index b4f513c54..b1076e198 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -809,7 +809,7 @@
       },
       //导出
       handleExport(){
-        console.log(this.$route.query)
+        this.$message.success(this.$t('Intheexport'))
         let long = localStorage.getItem('language')
         this.cut = ''
         if (long && long === 'zh-cn') {
@@ -826,7 +826,7 @@
         }
         console.log(query)
         getAction('/params/collectManifest/exportAll', query).then((res) => {
-            this.$message.success(this.$t('Intheexport'))
+
           this.textLoading = false
         })
       },

From 0d165293f9218439adc45022ac34a1d4cc9a145d Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 21 Jul 2022 17:52:01 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/system/MessageDetails.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/jero-web/src/views/system/MessageDetails.vue b/jero-web/src/views/system/MessageDetails.vue
index 309fe3c4a..b7b3c0d01 100644
--- a/jero-web/src/views/system/MessageDetails.vue
+++ b/jero-web/src/views/system/MessageDetails.vue
@@ -16,6 +16,9 @@
 </template>
 
 <script>
+  import Vue from 'vue'
+  import { ACCESS_TOKEN } from '@/store/mutation-types'
+
   export default {
     name: 'MessageDetails',
     methods: {
@@ -30,6 +33,13 @@
           })
         }
       }
+    },
+    mounted() {
+      if (this.$route.query.msgContentInfo && this.$route.query.msgContentInfo.includes('downLoadFile')) {
+        let index = this.$route.query.msgContentInfo.indexOf('target')
+        this.$route.query.msgContentInfo = this.$route.query.msgContentInfo.slice(0, index - 2) + '&token=' + Vue.ls.get(ACCESS_TOKEN) + '\' '
+          + this.$route.query.msgContentInfo.slice(index)
+      }
     }
   }
 </script>

From c9601c4abb00f18abc448fb9562f117f90128012 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 21 Jul 2022 17:52:20 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95-=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=EF=BC=9A=E5=AF=BC=E5=87=BA=E6=97=B6=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index f0ea1ec22..424e1ffe3 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -68,15 +68,18 @@ import org.aspectj.util.FileUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
@@ -2108,6 +2111,40 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				os.write(len);
 			}
 
+			// 将导出文件上传到cos上
+			String uploadFileName = fileOriName + ".zip";
+			InputStream uploadFileio = new FileInputStream(new File(fileNowPath+".zip"));
+			MultipartFile mFile = new MockMultipartFile(uploadFileName, uploadFileName, "text/plain", uploadFileio); // 用于上传
+			OSSFile ossFile = ossFileService.uploadLocalOfCos(mFile, "/manifest", "", CutEnum.CN.getValue()); // 上传导出的压缩包
+
+			// 系统向用户发消息
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
+			String msgTitle = "您导出的" + paramsCollectManifestVO.getExportName()  + "已经生成完毕";
+			String content = "您导出的" + paramsCollectManifestVO.getExportName()  + "已经生成完毕，请点击下载。";
+
+			String href = "<a href='/jero-boot/sys/common/downLoadFile?id=" + ossFile.getId() + "'" + " target='_blank'>下载</a>。";
+			String contentInfo = "您导出的" + paramsCollectManifestVO.getExportName()  + "已经生成完毕，请点击" + href;
+
+			SysAnnouncement sysAnnouncement = new SysAnnouncement();
+			sysAnnouncement.setDelFlag("0");
+			sysAnnouncement.setSendStatus("0");
+			sysAnnouncement.setSendTime(new Date());
+			sysAnnouncement.setMsgCategory(MessageTypeEnum.PUSH.getValue()); //消息类型：转发推送
+			sysAnnouncement.setInitiator(MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); // 发起人：系统
+			sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户
+			sysAnnouncement.setTitile(msgTitle);
+			sysAnnouncement.setMsgContent(content);
+			sysAnnouncement.setMsgContentInfo(contentInfo);
+			sysAnnouncement.setUserIds(currentUser.getId()); // 发送给当前导出人
+			sysAnnouncementService.saveAnnouncement(sysAnnouncement);
+
+			JSONObject obj = new JSONObject();
+			obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC);
+			obj.put(WebsocketConst.MSG_ID, currentUser.getId());
+			obj.put(WebsocketConst.MSG_TXT, contentInfo);
+			webSocket.sendMessage(obj.toJSONString());
+
+			uploadFileio.close();
 			os.flush();
 			os.close(); // 后开先关
 			fis.close(); // 先开后关

From afb0d090d4409eadbaf70e3ee7b89defc574f1e9 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 21 Jul 2022 18:34:15 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95-=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=B6=88=E6=81=AF=E4=B8=AD=E7=9A=84=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 74 +++++++++++++++++--
 1 file changed, 68 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 424e1ffe3..346534b85 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1294,6 +1294,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
 		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId); // 获取项目信息
+		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
+		paramsManifestEO.setProjectName(projectInfo.getProjectName());
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
@@ -1325,8 +1327,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		SysUser sysUser = sysUserService.getUserByName(dre);
 		String[] thirdIds = new String[1];
 		thirdIds[0] = sysUser.getThirdId();
-		String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId;
-		String href = "<a href='/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId + "'" + " target='_blank'>the link</a>,";
+		String urlParamsStr = parseUrlParams(paramsManifestEO);
+		String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr;
+		String href = "<a href='/ParameterItemCollection" + urlParamsStr + "'" + " target='_blank'>the link</a>,";
 		String content = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter the link to handle it.";
 		String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " please enter " + href + " to handle it.";
 		String msgTitle = "You have a homo parameter task to complete";
@@ -1385,6 +1388,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
 		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId); // 获取项目信息
+		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
+		paramsManifestEO.setProjectName(projectInfo.getProjectName());
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
@@ -1450,8 +1455,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				 SysUser sysUser = sysUserService.getUserByName(sdt);
 				 String[] thirdIds = new String[1];
 				 thirdIds[0] = sysUser.getThirdId();
-				 String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId;
-				 String href = "<a href='/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId + "'" + " target='_blank'>the link</a>,";
+				 String urlParamsStr = parseUrlParams(paramsManifestEO);
+				 String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr;
+				 String href = "<a href='/ParameterItemCollection" + urlParamsStr + "'" + " target='_blank'>the link</a>,";
 				 String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length() - 1) + " and other parameter items, please enter " + href + " and fill in the relevant information.";
 				 String msgTitle = "You have a homo parameter task to complete";
 
@@ -1509,6 +1515,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
 		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId); // 获取项目信息
+		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
+		paramsManifestEO.setProjectName(projectInfo.getProjectName());
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
@@ -1576,8 +1584,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				SysUser sysUser = sysUserService.getUserByName(sdt);
 				String[] thirdIds = new String[1];
 				thirdIds[0] = sysUser.getThirdId();
-				String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId;
-				String href = "<a href='/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId + "'" + " target='_blank'>the link</a>,";
+				String urlParamsStr = parseUrlParams(paramsManifestEO);
+				String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr;
+				String href = "<a href='/ParameterItemCollection" + urlParamsStr + "'" + " target='_blank'>the link</a>,";
 				String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length() - 1) + " and other parameter items, please enter " + href + " and fill in the relevant information.";
 				String msgTitle = "You have a homo parameter task to complete";
 
@@ -2446,6 +2455,59 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 	}
 
+	/**
+	 * 通过实体类获取 URL Params
+	 *
+	 * @param clazz 实体类
+	 * @return URL Params
+	 */
+	private String parseUrlParams(Object clazz) {
+		// 遍历属性类、属性值
+		List<Field> list = findAllFieldsOfSelfAndSuperClass(clazz.getClass());
+
+		StringBuilder requestURL = new StringBuilder();
+		try {
+
+			boolean flag = true;
+			String property, value, params;
+			for (Field field : list) {
+				// 允许访问私有变量
+				field.setAccessible(true);
+				// 过滤静态属性
+				if (Modifier.isStatic(field.getModifiers())) {
+					continue;
+				}
+				// 属性名
+				property = field.getName();
+				// 属性值
+				if (field.get(clazz) != null) {
+					if (Date.class.equals(field.getType())) {
+						Date date = (Date) field.get(clazz);
+						String pattern = "";
+						pattern = "yyyy-MM-dd HH:mm:ss";
+						SimpleDateFormat formatter=new SimpleDateFormat(pattern);
+						String time=formatter.format(date);
+						value = time;
+					} else {
+						value = field.get(clazz).toString();
+					}
+					params = property + "=" + value;
+				} else {
+					params = property + "=";
+				}
+				if (flag) {
+					requestURL.append("?").append(params);
+					flag = false;
+				} else {
+					requestURL.append("&").append(params);
+				}
+			}
+		} catch (Exception e) {
+			log.error("通过实体类获取URL出现异常：" + e.getMessage(), e);
+		}
+		return requestURL.toString();
+	}
+
 	/**
 	 * 实体对象转成Map
 	 * @param obj 实体对象