jwyu 1 year ago
parent
commit
bf7a6d08f1

+ 3 - 2
src/views/dataSource_manage/components/DelEDBTable.vue

@@ -1,6 +1,8 @@
 <template>
     <div class="del-table-wrap">
-
+        <div>
+            <img src="~@/assets/img/data_m/set_icon.png" alt="" style="cursor: pointer;float:right" @click="showSetTableCols=true">
+        </div>
         <el-table
             v-loading="tableLoading"
             ref="tableIns"
@@ -56,7 +58,6 @@ export default {
     methods: {
         //获取表格数据
         getTableList(){
-            if(!this.permissionBtn.checkPermissionBtn(this.permissionBtn.dataSourcePermission.dataSource_delTable_see)) return 
             apiDataSource.delTableList({
                 CurrentIndex:this.page,
                 PageSize:this.pageSize,

+ 4 - 35
src/views/dataSource_manage/components/DetailTable.vue

@@ -2,30 +2,14 @@
     <div class="detail-table-wrap">
         <div class="top-wrap">
         <div class="filter-box">
-            <el-date-picker
-                v-model="filterState.dateVal"
-                type="date"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd"
-                style="width:200px"
-                v-permission="permissionBtn.dataSourcePermission.dataSource_detailTable_filterDate"
-            />
-            <el-select
-                placeholder="数据源"
-                multiple
-                clearable
-                style="width:200px"
-            >
-
-            </el-select>
             <el-select
-                placeholder="数据账号"
+                placeholder="终端编码"
                 multiple
                 clearable
                 style="width:200px"
             >
 
-            </el-select>
+            </el-select> 
             <el-cascader
                 placeholder="创建人"
                 :props="{multiple: true}"
@@ -56,25 +40,15 @@
                 style="width:200px"
             />
         </div>
-        <el-checkbox
-            v-model="checkAll"
-            v-permission="permissionBtn.dataSourcePermission.dataSource_detailTable_checkAll"
-        >列表全选</el-checkbox>
+        <img src="~@/assets/img/data_m/set_icon.png" alt="" style="cursor: pointer;" @click="showSetTableCols=true">
         </div>
         <el-table
             v-loading="tableLoading"
             ref="tableIns"
             :data="tableData"
             border
-            @selection-change="handleTableSelectChange"
             @sort-change="handleTableSortChange"
         >
-            <el-table-column
-                type="selection"
-                width="55"
-                fixed="left"
-                align="center"
-            />
             <el-table-column
                 v-for="col in tableColOpts"
                 :key="col.ColumnKey"
@@ -99,18 +73,15 @@
         />
         <!-- 自定义列表 -->
         <SetTableCols v-model="showSetTableCols" :ColumnType="1" @change="handleTableColChange"/>
-        <!-- 设置刷新时间 -->
-        <SetRefreshTime v-model="showSetRefreshTime"/> 
     </div>
 </template>
 
 <script>
 import {apiDataSource} from '@/api/modules/dataSource'
 import {frequencyOpt} from '../utils/config'
-import SetRefreshTime from './SetRefreshTime.vue'
 import SetTableCols from './SetTableCols.vue'
 export default {
-    components:{SetTableCols,SetRefreshTime},
+    components:{SetTableCols},
     data() {
         return {
             frequencyOpt,
@@ -128,8 +99,6 @@ export default {
             tableLoading:false,
 
             showSetTableCols:false,
-
-            showSetRefreshTime:false
         }
     },
     created() {

+ 3 - 1
src/views/dataSource_manage/components/EDBInfoChangeTable.vue

@@ -1,5 +1,8 @@
 <template>
     <div class="edbinfo-table-wrap">
+        <div>
+            <img src="~@/assets/img/data_m/set_icon.png" alt="" style="cursor: pointer;float:right" @click="showSetTableCols=true">
+        </div>
         <el-table
             v-loading="tableLoading"
             ref="tableIns"
@@ -56,7 +59,6 @@ export default {
     methods: {
         //获取表格数据
         getTableList(){
-            if(!this.permissionBtn.checkPermissionBtn(this.permissionBtn.dataSourcePermission.dataSource_edbInfoTable_see)) return 
             apiDataSource.edbInfoTableList({
                 CurrentIndex:this.page,
                 PageSize:this.pageSize,

+ 0 - 131
src/views/dataSource_manage/components/SetRefreshTime.vue

@@ -1,131 +0,0 @@
-<template>
-    <el-dialog
-      title="设置刷新时间"
-      :visible.sync="show"
-      :modal-append-to-body="false"
-      :close-on-click-modal="false"
-      :center="true"
-      v-dialogDrag
-      custom-class="dialogclass"
-      width="660px"
-      @close="handleClose"
-    >
-        <div class="set-refresh-wrap">
-            <el-radio-group v-model="refreshType">
-                <el-radio :label="1">正常刷新</el-radio>
-                <el-radio :label="2">终止刷新</el-radio>
-            </el-radio-group>
-            <div class="select-time-wrap">
-                <div class="select-item" v-for="item,index in list" :key="index">
-                    <span>刷新时间{{index+1}}</span>
-                    <el-select
-                        :disabled="refreshType==2"
-                        placeholder="请选择频率"
-                        v-model="item.date"
-                        clearable
-                        :style="{width:item.date==='每月'?'90px':'200px'}"
-                    >
-                        <el-option 
-                            v-for="item in refreshFrequencyOpt" 
-                            :key="item"
-                            :label="item"
-                            :value="item"
-                        />
-                    </el-select>
-                    <el-select
-                        :disabled="refreshType==2"
-                        placeholder="请选择日期"
-                        v-model="item.whichDay"
-                        style="width:90px"
-                        v-if="item.date==='每月'"
-                    >
-                        <el-option 
-                            v-for="item in 28" 
-                            :key="item"
-                            :label="item+'日'"
-                            :value="item"
-                        />
-                    </el-select>
-                    <el-time-select
-                        :disabled="refreshType==2"
-                        style="width:200px"
-                        clearable
-                        :editable="false"
-                        v-model="item.time"
-                        :picker-options="{
-                            start: '00:00',
-                            step: '01:00',
-                            end: '23:00'
-                        }"
-                        value-format="HH:mm"
-                        placeholder="请选择时间"
-                    />
-                </div>
-            </div>
-            <div style="text-align:center;margin:30px 0">
-                <el-button type="primary" plain @click="handleClose">取消</el-button>
-                <el-button type="primary">确定</el-button>
-            </div>
-        </div>
-    </el-dialog>
-</template>
-
-<script>
-import {refreshFrequencyOpt} from '../utils/config'
-export default {
-    model:{
-        prop:"show",
-        event:'close'
-    },
-    props:{
-        show:{
-            type:Boolean,
-            default:false
-        }
-    },
-    data() {
-        return {
-            refreshFrequencyOpt,
-            refreshType:1,
-            list:[
-                {
-                    date:'',
-                    whichDay:1,
-                    time:''
-                },
-                {
-                    date:'',
-                    whichDay:1,
-                    time:''
-                },
-                {
-                    date:'',
-                    whichDay:1,
-                    time:''
-                }
-            ]
-        }
-    },
-    methods: {
-        handleClose(){
-            this.$emit('close', false)
-        }
-    },
-}
-</script>
-
-<style lang="scss" scoped>
-.set-refresh-wrap{
-    padding: 10px 30px;
-    .select-time-wrap{
-        margin-top: 30px;
-        .select-item{
-            display: flex;
-            align-items: center;
-            gap: 20px;
-            margin-bottom: 30px;
-        }
-    }
-    
-}
-</style>

+ 3 - 0
src/views/dataSource_manage/components/StatisticTable.vue

@@ -1,5 +1,8 @@
 <template>
     <div class="statistic-table-wrap">
+        <div>
+            <img src="~@/assets/img/data_m/set_icon.png" alt="" style="cursor: pointer;float:right" @click="showSetTableCols=true">
+        </div>
          <el-table
             ref="tableIns"
             :data="tableData"

+ 9 - 28
src/views/dataSource_manage/dataSourceListGL.vue

@@ -10,22 +10,14 @@
                 >{{item.name}}</li>
             </ul>
             <div>
-                <el-button
-                    v-if="activeNav==='DetailTable'" 
-                    type="primary" 
-                    plain 
-                    v-permission="permissionBtn.dataSourcePermission.dataSource_detailTable_refresh"
-                >一键刷新</el-button>
-                <el-button
-                    v-if="activeNav==='DetailTable'"
-                    type="primary" 
-                    @click="handleShowSetRefreshTime"
-                    v-permission="permissionBtn.dataSourcePermission.dataSource_detailTable_setRefreshTime"
-                >设置刷新时间</el-button>
-                <el-button 
-                    type="primary"
-                    @click="handleShowSetTableCol"
-                >自定义列</el-button>
+                <el-date-picker
+                    v-model="time"
+                    type="date"
+                    placeholder="选择日期"
+                    value-format="yyyy-MM-dd"
+                    style="width:200px"
+                    v-if="activeNav!='DelEDBTable'"
+                />
             </div>
         </div>
         <div class="main-box">
@@ -41,15 +33,6 @@ import EDBInfoChangeTable from './components/EDBInfoChangeTable.vue'
 import StatisticTable from './components/StatisticTable.vue'
 export default {
     components:{DelEDBTable,DetailTable,EDBInfoChangeTable,StatisticTable},
-    computed: {
-        showFilterDate(){
-            if(this.activeNav==='DelEDBTable') return false
-            if(this.activeNav==='DetailTable'&&this.permissionBtn.checkPermissionBtn(this.permissionBtn.dataSourcePermission.dataSource_detailTable_filterDate)) return true
-            if(this.activeNav==='StatisticTable'&&this.permissionBtn.checkPermissionBtn(this.permissionBtn.dataSourcePermission.dataSource_statisticTable_filterDate)) return true
-            if(this.activeNav==='EDBInfoChangeTable'&&this.permissionBtn.checkPermissionBtn(this.permissionBtn.dataSourcePermission.dataSource_edbInfoTable_filterDate)) return true
-            return false
-        }  
-    },
     data() {
         return {
             navOpt:[
@@ -59,12 +42,10 @@ export default {
                 {name:'指标信息变更表',key:'EDBInfoChangeTable'}
             ],
             activeNav:'DetailTable',
+            time:''
         }
     },
     methods: {
-        handleShowSetRefreshTime(){
-            this.$refs.comIns.handleShowSetRefreshTime()
-        },
         handleShowSetTableCol(){
             this.$refs.comIns.handleShowSetTableCol()
         }