Browse Source

暂停开发,封代码喽~

jwyu 1 year ago
parent
commit
bfbb8ad844

+ 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:8606",
+      target: "http://8.136.199.33:7778",
+      // target: "http://192.168.20.49:8606",
 			// secure:false,  // 如果是https接口,需要配置这个参数
 			changeOrigin:true, // 如果接口跨域,需要进行这个参数配置
 			pathRewrite:{

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

@@ -1,8 +1,6 @@
 <template>
     <div class="del-table-wrap">
-        <div class="top-wrap">
-            <img class="set-icon" src="~@/assets/img/data_m/set_icon.png" alt="" @click="showSetTableCols=true">
-        </div>
+
         <el-table
             v-loading="tableLoading"
             ref="tableIns"
@@ -98,6 +96,10 @@ export default {
         handleTableColChange(){
             this.getTableColOpts()
         },
+
+        handleShowSetTableCol(){
+            this.showSetTableCols=true
+        },
     },
 }
 </script>

+ 20 - 20
src/views/dataSource_manage/components/DetailTable.vue

@@ -2,6 +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
@@ -47,24 +55,11 @@
                 clearable
                 style="width:200px"
             />
-            <el-checkbox 
-                v-model="checkAll"
-                v-permission="permissionBtn.dataSourcePermission.dataSource_detailTable_checkAll"
-            >列表全选</el-checkbox>
-        </div>
-        <div class="right-opt-box">
-            <el-button 
-                type="primary" 
-                plain 
-                v-permission="permissionBtn.dataSourcePermission.dataSource_detailTable_refresh"
-            >一键刷新</el-button>
-            <el-button 
-                type="primary" 
-                @click="handleShowSetRefreshTime"
-                v-permission="permissionBtn.dataSourcePermission.dataSource_detailTable_setRefreshTime"
-            >设置刷新时间</el-button>
-            <img class="set-icon" src="~@/assets/img/data_m/set_icon.png" alt="" @click="showSetTableCols=true">
         </div>
+        <el-checkbox
+            v-model="checkAll"
+            v-permission="permissionBtn.dataSourcePermission.dataSource_detailTable_checkAll"
+        >列表全选</el-checkbox>
         </div>
         <el-table
             v-loading="tableLoading"
@@ -121,7 +116,8 @@ export default {
             frequencyOpt,
             filterState:{
                 frequency:'',
-                keyword:''
+                keyword:'',
+                dateVal:''
             },
             checkAll:false,
             tableColOpts:[],
@@ -172,10 +168,14 @@ export default {
 
         },
 
-
+        //设置刷新时间弹窗
         handleShowSetRefreshTime(){
             this.showSetRefreshTime=true
-        }
+        },
+
+        handleShowSetTableCol(){
+            this.showSetTableCols=true
+        },
     },
 }
 </script>

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

@@ -1,8 +1,5 @@
 <template>
     <div class="edbinfo-table-wrap">
-        <div class="top-wrap">
-            <img class="set-icon" src="~@/assets/img/data_m/set_icon.png" alt="" @click="showSetTableCols=true">
-        </div>
         <el-table
             v-loading="tableLoading"
             ref="tableIns"
@@ -99,6 +96,10 @@ export default {
         handleTableColChange(){
             this.getTableColOpts()
         },
+
+        handleShowSetTableCol(){
+            this.showSetTableCols=true
+        },
     },
 }
 </script>

+ 18 - 1
src/views/dataSource_manage/components/SetRefreshTime.vue

@@ -23,7 +23,7 @@
                         placeholder="请选择频率"
                         v-model="item.date"
                         clearable
-                        style="width:200px"
+                        :style="{width:item.date==='每月'?'90px':'200px'}"
                     >
                         <el-option 
                             v-for="item in refreshFrequencyOpt" 
@@ -32,6 +32,20 @@
                             :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"
@@ -76,14 +90,17 @@ export default {
             list:[
                 {
                     date:'',
+                    whichDay:1,
                     time:''
                 },
                 {
                     date:'',
+                    whichDay:1,
                     time:''
                 },
                 {
                     date:'',
+                    whichDay:1,
                     time:''
                 }
             ]

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

@@ -1,8 +1,5 @@
 <template>
     <div class="statistic-table-wrap">
-        <div class="top-wrap">
-            <img class="set-icon" src="~@/assets/img/data_m/set_icon.png" alt="" @click="showSetTableCols=true">
-        </div>
          <el-table
             ref="tableIns"
             :data="tableData"
@@ -71,6 +68,10 @@ export default {
         handleTableColChange(){
             this.getTableColOpts()
         },
+
+        handleShowSetTableCol(){
+            this.showSetTableCols=true
+        },
     },
 }
 </script>

+ 28 - 10
src/views/dataSource_manage/dataSourceList.vue

@@ -9,16 +9,27 @@
                     @click="activeNav=item.key"
                 >{{item.name}}</li>
             </ul>
-            <el-date-picker
-                v-model="dateVal"
-                type="date"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd"
-                v-if="showFilterDate"
-            />
+            <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>
+            </div>
         </div>
         <div class="main-box">
-            <component :is='activeNav' :filterDate="dateVal"></component>
+            <component :is='activeNav' ref="comIns"></component>
         </div>
     </div>
 </template>
@@ -48,7 +59,14 @@ export default {
                 {name:'指标信息变更表',key:'EDBInfoChangeTable'}
             ],
             activeNav:'DetailTable',
-            dateVal:''
+        }
+    },
+    methods: {
+        handleShowSetRefreshTime(){
+            this.$refs.comIns.handleShowSetRefreshTime()
+        },
+        handleShowSetTableCol(){
+            this.$refs.comIns.handleShowSetTableCol()
         }
     },
 }
@@ -57,7 +75,7 @@ export default {
 <style lang="scss" scoped>
 .data-source-list-page{
     .top-wrap{
-        padding: 30px;
+        padding: 20px 30px;
         border-radius: 4px;
         border: 1px solid #DCDFE6; 
         background-color: #fff;