被覆盖代码回档

src/views/Report/ReportList.vue

@@ -27,7 +27,7 @@
                         <el-input v-model="q.name" placeholder="请输入报告名称"></el-input>
                     </div>
                 </el-col>
-
+             
                 <el-col :span="6" align="right" class="tag-btns">
                     <el-button type="primary" @click="search">查询</el-button>
                     <el-button type="default" @click="reset">重置</el-button>
@@ -92,34 +92,29 @@
                         </div>
                     </div>
                 </el-col> -->
-
+             
-
+               
             </el-row>
         </div>
-        <el-row class="tag-btn">
-          <el-button type="primary" size="big" @click="permissionApp">权限申请</el-button>
-        </el-row>
         <div class="table">
-          <el-row>
+            <el-row>
-          <el-col :span="4" class="treeList">
+                <el-col :span="4" class="treeList">
-            <el-input placeholder="输入关键字进行过滤" v-model="filterText">
+                    <el-input placeholder="输入关键字进行过滤" v-model="filterText">
-            </el-input>
+                    </el-input>
-            <el-tree
+                    <el-tree
-              class="filter-tree"
+                    class="filter-tree"
-              :data="treeData"
+                    :data="treeData"
-              show-checkbox
+                    show-checkbox
-              node-key="id"
+                    node-key="id"
-              default-expand-all
+                    default-expand-all
-              :filter-node-method="filterNode"
+                    :filter-node-method="filterNode"
-              ref="tree"
+                    ref="tree"
-            >
+                    >
-            </el-tree>
+                    </el-tree>
-          </el-col>
+                </el-col>
-          <el-col :span="19">
+                <el-col :span="19">
-            <vxe-table ref="xTable" :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 420px)'"
+                <vxe-table :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="'calc(100vh - 420px)'">
-                       @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
+                <vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
-              <vxe-column type="checkbox" width="60"></vxe-column>
-              <vxe-column show-overflow show-header-overflow type="seq" title="序号" width="77">
                     <template #default="{ row, rowIndex }">
                         {{ rowIndex + (q.pageNo - 1) * q.pageSize + 1 }}
                     </template>
@@ -159,7 +154,7 @@
 <!--                        <el-button type="text" @click="downloadRow(row)">下载</el-button>-->
                     </template>
                 </vxe-column>
-
+                
             </vxe-table>
             <el-pagination
                 @size-change="handleSizeChange"
@@ -171,10 +166,10 @@
                 :total="total"/>
             </el-col>
             </el-row>
+           
 
-
+           
-
+            
-
         </div>
 
         <!--预览-->
@@ -304,8 +299,6 @@ export default {
 
                 }
             ],
-      content: '',
-      checkIds: []
     }
   },
   watch: {
@@ -318,24 +311,6 @@ export default {
             if (!value) return true;
             return data.label.indexOf(value) !== -1;
         },
-    selectAllEvent ({ checked }) {
-      const records = this.$refs.xTable.getCheckboxRecords()
-      this.checkIds = records.map(item => {
-        return item.id
-      })
-    },
-    selectChangeEvent ({ checked }) {
-      const records = this.$refs.xTable.getCheckboxRecords()
-      this.checkIds = records.map(item => {
-        return item.id
-      })
-    },
-    permissionApp () {
-      this.$router.push({
-        path: '/permission/step1',
-        query: { id: 'AEHJB8YNJ3', ids: this.checkIds.toString() }
-      })
-    },
     init () {
       this.labelList()
       this.reportDateList()
@@ -465,6 +440,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.treeList{
+    padding: 20px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
+    margin-right: 20px;
+    .filter-tree{
+        margin-top: 20px;
+    }
+
+}
 .report-list {
     .title {
         border-bottom: 1px solid #EBEEF5;
@@ -478,9 +462,7 @@ export default {
             color: #262626;
         }
     }
-    .tag-btn{
+
-      padding: 10px 13px;
-    }
     .tag-search {
         padding-top: 9px;
 
@@ -504,11 +486,11 @@ export default {
                 font-weight: normal;
                 color: #646464;
                 display: inline-block;
-                width: 112px;
+                // width: 112px;
                 height: 19px;
                 line-height: 19px;
-                padding-left: 48px;
+                padding-left: 13px;
-                border-right: 1px solid #BFBFBF;
+                // border-right: 1px solid #BFBFBF;
                 margin-right: 10px;
                 margin-top: 2.5px;
                 overflow: hidden;