合并冲突

licp

2024-04-29 cd0252da419d4065e322b945da2d836796bc0e1f

 src/components/tool/value-table.vue

@@ -105,7 +105,7 @@
        @row-click="rowClick" :show-summary="data.countFleid!=undefined && data.countFleid.length > 0"
        :summary-method="getSummaries" :row-class-name="tableRowClassName" :row-key="record=>record.id"
        :current-row-key="data.currentId" :highlight-current-row="data.highlight===undefined||data.highlight"
        :span-method="spanMethod">
        :span-method="spanMethod" :key="specialKey">
        <el-table-column type="selection" width="65" v-if="data.showSelect" :key="Math.random()">
        </el-table-column>
        <el-table-column type="index" align="center" label="序号" width="65" v-if="data.isIndex" :key="Math.random()">
@@ -448,7 +448,8 @@
          //   position:0
          // }
        ],
        param: {}
        param: {},
        specialKey:'table-'
      }
    },
    beforeUpdate() {
@@ -465,6 +466,7 @@
      this.token = {
        'token': sessionStorage.getItem('token')
      }
      this.specialKey = this.specialKey+Math.random()*100;
    },
    methods: {
      rowspan(spanArr, position, spanName) {