eta1.2.2

config/index.js

@@ -37,8 +37,8 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable:{
 		'/adminapi': {
-      target: "http://8.136.199.33:7778",
-      // target: "http://192.168.20.49:8605",
+      // target: "http://8.136.199.33:7778",
+      target: "http://192.168.20.49:8606",
 			// secure:false,  // 如果是https接口，需要配置这个参数
 			changeOrigin:true, // 如果接口跨域，需要进行这个参数配置
 			pathRewrite:{

src/api/modules/dataSource.js

@@ -11,7 +11,18 @@ const apiDataSource={
     //编辑自定义列
     tableColEdit:params=>{
         return http.post('/data_stat/source_column/edit',params)
-    }
+    },
+
+    //删除指标列表数据
+    delTableList:params=>{
+        return http.get('/data_stat/edb_delete_log',params)
+    },
+
+    //指标信息变更列表数据
+    edbInfoTableList:params=>{
+        return http.get('/data_stat/edb_update_log',params)
+    },
+
 }
 
 export {

src/views/dataSource_manage/components/DelEDBTable.vue

@@ -3,18 +3,12 @@
         <div class="top-wrap">
             <img class="set-icon" src="~@/assets/img/data_m/set_icon.png" alt="" @click="showSetTableCols=true">
         </div>
-         <el-table
+        <el-table
+            v-loading="tableLoading"
             ref="tableIns"
             :data="tableData"
             border
-            @selection-change="handleSelectionChange"
         >
-            <el-table-column
-                type="selection"
-                width="55"
-                fixed="left"
-                align="center"
-            />
             <el-table-column
                 v-for="col in tableColOpts"
                 :key="col.ColumnKey"
@@ -33,7 +27,6 @@
           background
           @current-change="handleCurrentChange"
           :page-size="pageSize"
-          @size-change="handleSizeChange"
           :total="total"
           style="float: right;margin-top:20px"
         />
@@ -49,6 +42,7 @@ export default {
     components:{SetTableCols},
     data() {
         return {
+            tableLoading:false,
             tableColOpts:[],
             tableData:[],
             pageSize:15,
@@ -62,15 +56,41 @@ export default {
         this.getTableColOpts()
     },
     methods: {
+        //获取表格数据
+        getTableList(){
+            if(!this.permissionBtn.checkPermissionBtn(this.permissionBtn.dataSourcePermission.dataSource_delTable_see)) return 
+            apiDataSource.delTableList({
+                CurrentIndex:this.page,
+                PageSize:this.pageSize,
+                SortParam:'',
+                CreateTime:''
+            }).then(res=>{
+                if(res.Ret===200){
+                    const arr=res.Data.List||[]
+                    this.tableData=arr
+                    this.total=res.Data.Paging.Totals
+                }
+            })
+        },
+
+        handleCurrentChange(e){
+            this.page=e
+            this.getTableList()
+        },
+
         // 获取表格列配置项
         getTableColOpts(){
             this.tableColOpts=[]
+            this.tableLoading=true
             apiDataSource.tableColOpts({ColumnType:3}).then(res=>{
                 if(res.Ret===200){
-                    this.tableColOpts=res.Data.List||[]
+                    const arr=res.Data.List||[]
+                    this.tableColOpts=arr.filter(item=>item.IsShow===1)
                     this.$nextTick(()=>{
                         // this.$refs.tableIns.doLayout()
+                        this.tableLoading=false
                     })
+                    this.getTableList()
                 }
             })
         },

src/views/dataSource_manage/components/DetailTable.vue

@@ -142,7 +142,6 @@ export default {
     methods: {
         // 获取表格列配置项
         getTableColOpts(){
-            if(!this.permissionBtn.checkPermissionBtn(this.permissionBtn.dataSourcePermission.dataSource_detailTable_see)) return 
             this.tableLoading=true
             this.tableColOpts=[]
             apiDataSource.tableColOpts({ColumnType:1}).then(res=>{

src/views/dataSource_manage/components/EDBInfoChangeTable.vue

@@ -3,18 +3,12 @@
         <div class="top-wrap">
             <img class="set-icon" src="~@/assets/img/data_m/set_icon.png" alt="" @click="showSetTableCols=true">
         </div>
-         <el-table
+        <el-table
+            v-loading="tableLoading"
             ref="tableIns"
             :data="tableData"
             border
-            @selection-change="handleSelectionChange"
         >
-            <el-table-column
-                type="selection"
-                width="55"
-                fixed="left"
-                align="center"
-            />
             <el-table-column
                 v-for="col in tableColOpts"
                 :key="col.ColumnKey"
@@ -49,6 +43,7 @@ export default {
     components:{SetTableCols},
     data() {
         return {
+            tableLoading:false,
             tableColOpts:[],
             tableData:[],
             pageSize:15,
@@ -62,15 +57,41 @@ export default {
         this.getTableColOpts()
     },
     methods: {
+        //获取表格数据
+        getTableList(){
+            if(!this.permissionBtn.checkPermissionBtn(this.permissionBtn.dataSourcePermission.dataSource_edbInfoTable_see)) return 
+            apiDataSource.edbInfoTableList({
+                CurrentIndex:this.page,
+                PageSize:this.pageSize,
+                SortParam:'',
+                CreateTime:''
+            }).then(res=>{
+                if(res.Ret===200){
+                    const arr=res.Data.List||[]
+                    this.tableData=arr
+                    this.total=res.Data.Paging.Totals
+                }
+            })
+        },
+
+        handleCurrentChange(e){
+            this.page=e
+            this.getTableList()
+        },
+
         // 获取表格列配置项
         getTableColOpts(){
             this.tableColOpts=[]
+            this.tableLoading=true
             apiDataSource.tableColOpts({ColumnType:4}).then(res=>{
                 if(res.Ret===200){
-                    this.tableColOpts=res.Data.List||[]
+                    const arr=res.Data.List||[]
+                    this.tableColOpts=arr.filter(item=>item.IsShow===1)
                     this.$nextTick(()=>{
                         // this.$refs.tableIns.doLayout()
+                        this.tableLoading=false
                     })
+                    this.getTableList()
                 }
             })
         },

src/views/dataSource_manage/components/StatisticTable.vue

@@ -7,14 +7,7 @@
             ref="tableIns"
             :data="tableData"
             border
-            @selection-change="handleSelectionChange"
         >
-            <el-table-column
-                type="selection"
-                width="55"
-                fixed="left"
-                align="center"
-            />
             <el-table-column
                 v-for="col in tableColOpts"
                 :key="col.ColumnKey"