修改UAT问题

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

@@ -757,6 +757,7 @@ module.exports = {
   // 参数收集开始
   MaintainConfigureInfo: 'Maintain Configuration Information',
   ParameteItemCollectionList: 'Parameter Collection List',
+  ParameteItemReportList: 'Parameter Report List',
   ParameterViewPage: 'Parameter View Page',
   Areyousureparameteritems: 'Are you sure to submit the selected parameter items?',
   Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed',

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

@@ -775,6 +775,7 @@ module.exports = {
   // 参数收集
   MaintainConfigureInfo: '维护配置信息',
   ParameteItemCollectionList: '参数项收集清单',
+  ParameteItemReportList:'参数上报库清单',
   ParameterViewPage: '参数项查看页',
   Areyousureparameteritems: '确认提交所选参数项嘛?',
   Theselectedconfiguration: '参数清单中参数项均为待发起收集或变更时，才能添加配置',

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

@@ -5,7 +5,7 @@
       <div class="Virtual-detail-header" style="top: 0">
         <div class="Virtual-detail-title">
               <span>
-                {{this.$route.query.pageName ? this.$route.query.pageName : $t('ParameterViewPage')}}
+                {{this.$route.query.pageName ? this.$t('ParameteItemReportList')+'('+this.$route.query.pageName+')' + ' — '+this.$route.query.title +' — '+ this.$route.query.version: $t('ParameterViewPage')}}
               </span>
         </div>
       </div>
@@ -129,6 +129,13 @@
         <a-icon type="export"/>
         {{$t('dataExport')}}
       </div>
+
+      <!--      导出-->
+      <div @click="Derivedlist" class="operator-text" v-has="'report:detail:export:general'">
+        <a-icon type="export"/>
+        {{$t('Derivedlist')}}
+      </div>
+
       <div @click="ConventionalExport" class="operator-text" v-has="'report:detail:export:normal'">
         <a-icon type="export" :rotate="-90"/>
         {{$t('ConventionalExport')}}
@@ -215,21 +222,131 @@
     <conventionalModel :url="url" ref="conventionalModel"/>
     <customelModel :url="url" ref="customelModel"/>
     <JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
+    <!--    数据导出弹框-->
+    <a-modal
+      :title="$t('dataExport')"
+      :width="500"
+      :visible="dataExportFailed"
+      :maskClosable="false"
+      @ok="handleExportSubmit"
+      @cancel="handleCancel"
+    >
+      <a-form-model
+        class='formAdd'
+        ref='dataExportruleForm'
+        :model='dataExportformInline'
+        :rules='dataExportrules'
+        :label-col='labelCol'
+        :wrapper-col='wrapperCol'
+      >
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('exportOption')" style='margin-top: -17px;'>
+                <span class="Required">*</span>
+                <span class="title-text-text" :title="$t('exportOption')">
+                {{$t('exportOption')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="exportOption">
+                <a-select class="box-input" allowClear v-model="dataExportformInline.exportOption"
+                          :placeholder="$t('PleaseSelect')+$t('exportOption')">
+                  <a-select-option :value="'1'">
+                    {{$t('includeTitle')}}
+                  </a-select-option>
+                  <a-select-option :value="'0'">
+                    {{$t('Notitleincluded')}}
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
+
+    <!--    数据导出异步弹窗-->
+    <a-modal
+      :title="$t('dataExport')"
+      :width="500"
+      :visible="ExportFailed"
+      :maskClosable="false"
+      @ok="exportsubmit"
+      @cancel="exportcancel"
+    >
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <div style='font-size: 18px;margin-bottom: 20px;display: flex;justify-content: center'
+               class="box-title-text-index">
+            <span>{{$t('Exportsuccessexportlist')}}</span>
+            <!--            <div>{{$t('NiOnumberis')}}{{ item.nioNumber }},{{$t('Statusis')}}-->
+            <!--              <span style='color: red'>{{ item.state }}</span>,{{$t('NoOperationPermissionForthisbutton')}}。-->
+            <!--            </div>-->
+          </div>
+        </a-col>
+      </a-row>
+    </a-modal>
+
+    <!--    导出列表-->
+    <a-modal
+      :title="$t('Derivedlist')"
+      :width="900"
+      :visible="exportvisible"
+      :confirm-loading="confirmLoading"
+      :maskClosable="false"
+      @ok="exportok"
+      @cancel="exportvisiblecancel"
+    >
+      <!--      <historyTable :columnshistory='columnshistory' :dataSourcehistory='dataSourcehistory'></historyTable>-->
+      <a-table
+        class="table"
+        :components="drag(columnsexport,'columnsexport')"
+        :columns="columnsexport"
+        :pagination="false"
+        rowKey="id"
+        :scroll="{x: '100%',y: 400}"
+        :data-source="dataSourceexport"
+        :loading="loading"
+      >
+             <span slot="operation" slot-scope="text,record">
+                <a @click="exportdata(record)" v-if="record.state == '1'">{{$t('download')}}</a>
+                <a style="margin-left: 5px;" @click="exportdelete(record)">{{$t('delete')}}</a>
+             </span>
+        <!--              <span slot="detailText" slot-scope="text,record">-->
+        <!--                    <span class="text" :title="text">-->
+        <!--                     {{text && text.length > 40?text.slice(0,39)+'...':text}}-->
+        <!--                    </span>-->
+        <!--              </span>-->
+      </a-table>
+      <div class="page" v-if="dataSourceexport.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSizehistory"
+          :total="total"
+          :current="pageNohistory"
+          @change="onChangehistory"
+          @showSizeChange="SizeChangehistory"
+        />
+      </div>
+    </a-modal>
   </a-card>
 </template>
 
 <script>
-import { downloadFile, getAction, postAction } from '../../../api/manage'
+import { deleteAction, downloadFile, getAction, postAction } from '../../../api/manage'
   import axios from 'axios'
   import TableCollection from '@/components/tableCollection/index1'
   import conventionalModel from './commponts/conventionalmodle'
   import customelModel from './commponts/customexportmodle'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
   import PersonnelSelection from '@/components/PersonnelSelection/index'
+import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
   import Vue from 'vue'
 
   export default {
     name: 'managementdetails',
+    mixins:[ResizeHeader, ResizeColumnProvide],
     components: {
       conventionalModel,
       customelModel,
@@ -238,6 +355,48 @@ import { downloadFile, getAction, postAction } from '../../../api/manage'
     },
     data() {
       return {
+        pageNohistory: 1,
+        pageSizehistory: 10,
+        columnsexport: [
+          {
+            title: this.$t('fileName'),
+            align: 'left',
+            dataIndex: 'fileName',
+            width: 300,
+            ellipsis: true,
+            scopedSlots: { customRender: 'detailText' }
+          },
+          {
+            title: this.$t('status'),
+            align: 'left',
+            dataIndex: 'stateText',
+            width: 120,
+          },
+          {
+            title: this.$t('Exporttime'),
+            align: 'left',
+            dataIndex: 'createTime',
+            width: 200
+          },
+          {
+            title: this.$t('operation'),
+            align: 'left',
+            fixed: 'right',
+            width: 100,
+            scopedSlots: { customRender: 'operation' }
+          }
+        ],
+        dataSourceexport:[],
+        exportvisible: false,
+        confirmLoading:false,
+        ExportFailed:false,
+        dataExportFailed: false, // 数据失败的弹框
+        dataExportformInline: {},
+        dataExportrules: {
+          exportOption: [
+            { required: true, message: this.$t('PleaseSelect') + this.$t('exportOption'), trigger: 'change' }
+          ]
+        },
         toggleSearchStatus: false,
         columns: [],
         selectedRowKeys: [],
@@ -418,6 +577,70 @@ import { downloadFile, getAction, postAction } from '../../../api/manage'
       document.title = this.$t('ParameterViewPage')
     },
     methods: {
+      // 导出列表
+      Derivedlist(){
+        this.pageNohistory = 1
+        this.exportvisible = true
+        this.expoteList()
+      },
+      exportdata(item){
+        downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.fileId })
+      },
+      exportdelete(item){
+        this.$confirm({
+          title: this.$t('confirmDeletion'),
+          content: '',
+          onOk:
+            async () => {
+              deleteAction(`params/paramsCollectExport/delete`, { id: item.id }).then((res) => {
+                if (res.success) {
+                  this.$message.success(this.$t('OperationSuccessful'))
+                  this.expoteList()
+                } else {
+                  this.$message.warning(this.$t('operationFailed'))
+                }
+              })
+            }
+        })
+      },
+      onChangehistory(page, pageSize) {
+        this.pageNohistory = page
+        this.expoteList()
+      },
+      SizeChangehistory(page, pageSize) {
+        this.pageNohistory = 1
+        this.pageSizehistory = pageSize
+        this.expoteList()
+      },
+      expoteList(val) {
+        let query = {
+          pageNo: this.pageNohistory,
+          pageSize: this.pageSizehistory,
+          paramsManifestId: this.$route.query.id,
+          paramsCollectManifestId: this.paramsReportDetailId
+        }
+        this.loading = true
+        getAction('params/paramsCollectExport/page', query).then((res) => {
+          if (res.success) {
+            this.dataSourceexport = res.result.records
+            // if (this.dataSourcehistory && this.dataSourcehistory.length > 0) {
+            //   this.dataSourcehistory.forEach(val => {
+            //     val.logContent = val.logContent.replace(/\"/g, '<span class=\'textData\'>"</span>')
+            //   })
+            // }
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      exportok(){
+        this.exportvisible = false
+      },
+      exportvisiblecancel(){
+        this.exportvisible = false
+      },
       onCheckAllChange(e) {
         let selectedValue = ['nio_number', 'params_name', 'operation']
         this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : selectedValue
@@ -705,27 +928,75 @@ import { downloadFile, getAction, postAction } from '../../../api/manage'
       listReset() {
         this.formInline = {}
       },
+
+      // 导出确定
+      handleExportSubmit() {
+        this.$refs.dataExportruleForm.validate(valid => {
+          if (valid) {
+            this.$message.success(this.$t('Intheexport'))
+            let long = localStorage.getItem('language')
+            this.cut = ''
+            if (long && long === 'zh-cn') {
+              this.cut = 'cn'
+            } else if (long && long === 'en-us') {
+              this.cut = 'en'
+            }
+
+            let query = {
+              paramsManifestId: this.$route.query.id,
+              cut: this.cut,
+              // userTypes: this.currentPersonRole,
+              ids:this.selectedRowKeys.join(','),
+              ...this.formInline,
+              exportOption: this.dataExportformInline.exportOption,
+              exportName: this.$route.query.projectName + '(' + this.$route.query.title + this.$route.query.version + ')'
+            }
+            // let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
+            // downloadFile('/report/detail/exportGeneral', name, query, this.selectClear)
+            let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
+            getAction('/report/detail/exportGeneral', query).then((res) => {
+              // if (res.success) {
+              // }
+            })
+            this.dataExportFailed = false
+            this.ExportFailed = true
+            // downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear)
+          }
+        })
+      },
+      exportsubmit(){
+        this.ExportFailed = false
+      },
+      exportcancel(){
+        this.ExportFailed = false
+      },
+      handleCancel() {
+        this.dataExportformInline = {}
+        this.$refs.dataExportruleForm.clearValidate()
+        this.dataExportFailed = false
+      },
       //导出
       handleExport() {
-        this.$message.success(this.$t('Intheexport'))
-        let long = localStorage.getItem('language')
-        this.cut = ''
-        if (long && long === 'zh-cn') {
-          this.cut = 'cn'
-        } else if (long && long === 'en-us') {
-          this.cut = 'en'
-        }
-        console.log(this.selectedRowKeys)
-        let query = {
-          paramsManifestId: this.$route.query.id,
-          cut: this.cut,
-          // 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('/report/detail/exportGeneral', name, query, this.selectClear)
+        this.dataExportFailed = true
+        // this.$message.success(this.$t('Intheexport'))
+        // let long = localStorage.getItem('language')
+        // this.cut = ''
+        // if (long && long === 'zh-cn') {
+        //   this.cut = 'cn'
+        // } else if (long && long === 'en-us') {
+        //   this.cut = 'en'
+        // }
+        // console.log(this.selectedRowKeys)
+        // let query = {
+        //   paramsManifestId: this.$route.query.id,
+        //   cut: this.cut,
+        //   // 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('/report/detail/exportGeneral', name, query, this.selectClear)
       },
       ConventionalExport() {
         this.$refs.conventionalModel.addModel()
@@ -989,6 +1260,12 @@ popconfirmmize {
 ::v-deep .ant-popover-buttons {
   display: none !important;
 }
+
+.itemModel {
+  width: 100%;
+  display: inline-block;
+  margin-top: 2px;
+}
 </style>
 <style lang='less'>
 .popconfirmClassName .ant-popover-message-title {

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')}}({{this.$route.query.type == '1' ? $t(this.$route.query.projectName) : $t(this.$route.query.projectName.slice(0,-3)) + '-' + $t(this.$route.query.projectVersion)}}) — {{$t(this.$route.query.title)}}
+          {{$t('ParameteItemCollectionList')}}({{this.$route.query.type == '1' ? $t(this.$route.query.projectName) : $t(this.$route.query.projectName.slice(0,-3)) + '-' + $t(this.$route.query.projectVersion)}}) — {{$t(this.$route.query.title)}} — {{$t(this.$route.query.version)}}
         </span>
       </div>
       <div class="Virtual-detail-title-right">
@@ -181,7 +181,7 @@
                 <!--                  {{$t('distributionAndCollection')}}-->
                 <!--                </div>-->
                 <!--      导出-->
-                <div @click="handleExport" class="operator-text-title" v-if='currentPersonRole == "homo"'>
+                <div @click="handleExport('0')" class="operator-text-title" v-if='currentPersonRole == "homo"'>
                   <a-icon type="export" :rotate="-90"/>
                   {{$t('dataExport')}}
                 </div>
@@ -266,7 +266,7 @@
               {{$t('Assignedby')}}
             </div>
             <!--      导出-->
-            <div @click="handleExport" class="operator-text"
+            <div @click="handleExport('0')" class="operator-text"
                  v-if='currentPersonRole == "sdt" || currentPersonRole == "admin" || currentPersonRole == "studio"'>
               <a-icon type="export"/>
               {{$t('dataExport')}}
@@ -356,6 +356,19 @@
             <!--            </div>-->
 
           </div>
+
+          <div class="table-operator" v-if="this.$route.query.it">
+            <!--      导出-->
+            <div @click="handleExport('1')" class="operator-text" v-if='currentPersonRole == "homo" || currentPersonRole == "admin"　|| currentPersonRole == "viewer"'>
+              <a-icon type="export" :rotate="-90"/>
+              {{$t('dataExport')}}
+            </div>
+            <!--      导出列表-->
+            <div @click="Derivedlist" class="operator-text" v-if='currentPersonRole == "homo" || currentPersonRole == "admin"　|| currentPersonRole == "viewer"'>
+              <a-icon type="export" :rotate="-90"/>
+              {{$t('Derivedlist')}}
+            </div>
+          </div>
           <div style="width: 100%">
             <!-- 表格-10控件-->
             <!--            :queryParamQuery='queryParamQuery'-->
@@ -1538,7 +1551,8 @@
         }
       },
       //导出
-      handleExport() {
+      handleExport(num) {
+        this.isHistroy = num || 0
         this.dataExportFailed = true
         // this.$message.success(this.$t('Intheexport'))
         // let long = localStorage.getItem('language')
@@ -1647,7 +1661,8 @@
               paramsTemplatePublishVersion: 1,
               cut: this.cut,
               userTypes: this.currentPersonRole,
-              exportName: this.$route.query.projectName + '(' + this.$route.query.title + ')'
+              exportName: this.$route.query.projectName + '(' + this.$route.query.title + this.$route.query.version + ')',
+              isHistory:this.isHistroy
             }
             let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
             getAction('/params/collectManifest/exportAll', query).then((res) => {