Bladeren bron

Merge branch 'dev'

zhangyu 4 jaren geleden
bovenliggende
commit
e006c0a675

+ 3 - 3
src/components/relation/relationShip/Modal/exportExcel.vue

@@ -9,7 +9,7 @@
         <el-col :span="8">
           <p>
             <i class="iconfont icon-doc-line"/>
-            {{values.currentNum}}{{relationCount}}
+            {{values.currentNum}}{{length}}
           </p>
 
           <a :href="downloadProject('excel')">
@@ -92,10 +92,10 @@
 
   export default {
     name: "exportExcel",
-    props: ['values'],
+    props: ['values','length'],
     data() {
       return {
-        relationCount:localStorage.getItem('count'),
+        // relationCount:localStorage.getItem('count'),
         dialogExport: false,
         dialogProcess: false,
         activities: [{

+ 4 - 1
src/views/relation/relationShip/index.vue

@@ -238,6 +238,7 @@
     <exportExcel
       ref="export"
       :values="values"
+      :length="length"
     />
     <addRelationShip
       ref="addShipComponent"
@@ -343,7 +344,8 @@
         delParam: {},
         loading: false,
         needMergeArr: ['Name', 'LocalID', 'LocalName', 'CADID', 'btn'],
-        rowMergeArrs: {}
+        rowMergeArrs: {},
+        length:''
         // needMergeArr: ['name', 'id'], // 有合并项的列
         // rowMergeArrs: {}, // 包含需要一个或多个合并项信息的对象
       }
@@ -419,6 +421,7 @@
         } else {
           this.tableData = []
         }
+        this.length = this.tableData.length
       },
       back() {
         this.$router.go(-1)