合并分支 'dev_third_stage' 到 'master'

Dev third stage

查看合并请求 laws-nio/laws-weilai!79

jero-web/src/components/tableCollection/index.vue

@@ -294,8 +294,15 @@
       onClickSee(val) {
         let _this = this
         this.areaVisibleView = true
+        let url = ''
+        if (this.$route.query.it === undefined) {
+          url = `/jero-boot/params/config/getById?id=${val.db_field_name}`
+        } else {
+          // 历史版本
+          url = `/jero-boot/params/collectManifestHistory/getConfigById?id=${val.db_field_name}`
+        }
         axios({
-          url: `/jero-boot/params/config/getById?id=${val.db_field_name}`,
+          url: url,
           method: 'get',
           transformRequest: [function(data) {
             let ret = ''
@@ -312,8 +319,9 @@
           .then((res) => {
             console.log(res)
             if (res.data.success) {
-              this.configDetail = res.data.result
+              this.configDetail = res.data.result || {}
             } else {
+              this.configDetail = {}
               _this.$message.warning(res.data.result)
             }
           })
@@ -501,12 +509,25 @@
       getTableListReset() {
         let params = {
           paramsManifestId: this.$route.query.id,
-          userTypes: this.currentPersonRole
+          pageNo: this.pageNo,
+          pageSize: this.pageSize,
+          // userTypes: this.currentPersonRole
         }
+        let url
         this.loading = true
         this.$emit('listReset', '')
         // todo
-        getAction(this.url.tableList, params).then((res) => {
+        if (this.$route.query.it === undefined) {
+          // 页面跳转
+          url = this.url.tableList
+          params.paramsManifestId = this.$route.query.id
+          params.userTypes = this.currentPersonRole
+        } else {
+          // 历史版本
+          url = 'params/collectManifestHistory/list'
+          params.paramsManifestId = this.$route.query.it
+        }
+        getAction(url, params).then((res) => {
           if (res.success) {
             let tt = []
             if (this.currentPersonRole !== 'dre') {

jero-web/src/components/tableCollection/index1.vue

@@ -96,7 +96,7 @@
       </div>
     </a-modal>
     <!--  配置信息--->
-    <a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null">
+    <a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null" @cancel="hideModal">
       <div class="content-text">
         <div class="text-field">
           <span class="text-field-left" :title="$t('configurationName')">{{$t('configurationName')}}:</span>
@@ -290,12 +290,16 @@
         this.$emit('handlePreservation')
         this.getTableList()
       },
+      hideModal(){
+        this.areaVisibleView = false
+      },
       // 查看配置详细信息
       onClickSee(val) {
+        console.log(val)
         let _this = this
         this.areaVisibleView = true
         axios({
-          url: `/jero-boot/params/config/getById?id=${val.db_field_name}`,
+          url: `/jero-boot/report/detail/getConfig?id=${val.db_field_name}`,
           method: 'get',
           transformRequest: [function(data) {
             let ret = ''