Merge remote-tracking branch 'origin/fix_20230609'

# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	jero-web/src/views/parameter/managementdetails/index.vue

jero-web/src/views/parameter/managementdetails/index.vue

@@ -125,10 +125,10 @@
         {{$t('preservation')}}
       </div>
       <!--      导出-->
-<!--      <div @click="handleExport" class="operator-text" v-has="'report:detail:export:normal'">-->
-<!--        <a-icon type="export"/>-->
-<!--        {{$t('dataExport')}}-->
-<!--      </div>-->
+      <div @click="handleExport" class="operator-text" v-has="'report:detail:export:general'">
+        <a-icon type="export"/>
+        {{$t('dataExport')}}
+      </div>
       <div @click="ConventionalExport" class="operator-text" v-has="'report:detail:export:normal'">
         <a-icon type="export" :rotate="-90"/>
         {{$t('ConventionalExport')}}
@@ -715,16 +715,17 @@ import { downloadFile, getAction, postAction } from '../../../api/manage'
         } else if (long && long === 'en-us') {
           this.cut = 'en'
         }
+        console.log(this.selectedRowKeys)
         let query = {
-          paramsManifestId: this.paramsManifest.id,
-          paramsTemplateId: this.$route.query.paramsTemplateId,
-          paramsTemplatePublishVersion: 1,
+          paramsManifestId: this.$route.query.id,
           cut: this.cut,
-          userTypes: this.currentPersonRole,
+          // userTypes: this.currentPersonRole,
+          ids:this.selectedRowKeys.join(','),
+          ...this.formInline,
           exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')'
         }
         let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
-        downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
+        downloadFile('/report/detail/exportGeneral', name, query, this.selectClear)
       },
       ConventionalExport() {
         this.$refs.conventionalModel.addModel()