功能新增

public/config.js

@@ -1,4 +1,6 @@
 window.SERVICE_ID = {
   sysMenuId: 1, //权限菜单
-  getUserTableId: 9, //根据账号组获取账号 
+  sysAllMenuId: 3, //获取全部权限
+  getUserTableId: 9, //根据账号组获取账号
+  getTableColumnId: 18122, //获取表头
 };

src/api/newLogin.js

@@ -17,6 +17,15 @@ export function GetCheckCode (params) {
   })
 }
 
+//权限-列设置初始化
+export function initColumnSet (params) {
+  return request({
+    url: '/foxlibc/initColumnSet',
+    method: 'post',
+    data: params
+  })
+}
+
 //登录
 export function login (params) {
   return request({
@@ -83,7 +92,7 @@ export function GetSystemSet (params) {
 }
 
 // 密码校验
-export function CheckUser(params) {
+export function CheckUser (params) {
   return request({
     url: '/foxlibc/sec-sign-in',
     method: 'post',

src/views/newTable/index.vue

@@ -249,7 +249,8 @@ export default {
       handler (val) {
         if (val.service_id) {
           this.resetTable();
-          this.getQuery(this.dataId);
+          this.getColumnData(this.dataId)
+          // this.getQuery(this.dataId);
         } else {
           this.resetTable();
         }
@@ -331,6 +332,33 @@ export default {
     this.$refs["table"]?.doLayout();
   },
   methods: {
+    //获取表头数据
+    async getColumnData (id) {
+      try {
+        const { code, returnData } = await Query({
+          serviceId: SERVICE_ID.getTableColumnId,
+          dataContent: {
+            serviceOutPutId: id
+          },
+        });
+        if (code == 0) {
+          if (returnData && returnData.length) {
+            const titleColumn = returnData.find(
+              (item) => item.needShow === 1
+            );
+            if (titleColumn) {
+              this.rowTitle = titleColumn.columnName;
+            }
+            this.tableCols = returnData;
+            this.getQuery(this.dataId);
+          }
+        } else {
+          this.$message.error("获取表头数据失败");
+        }
+      } catch (error) {
+        console.log(error)
+      }
+    },
     eledite () {
       this.flag = false;
       const arrbegin = _.cloneDeep(this.tableOptionscp);
@@ -431,14 +459,8 @@ export default {
             this.noMore = true;
             this.loading = false;
           } else {
-            const titleColumn = columnset.find(
-              (item) => item.needShow === 1
-            );
-            if (titleColumn) {
-              this.rowTitle = titleColumn.columnName;
-            }
             this.tableData.push(...returnData);
-            this.tableCols = columnset;
+            // this.tableCols = columnset;
             setTimeout(() => {
               this.initTableData();
               this.loading = false;
@@ -505,7 +527,7 @@ export default {
     //初始化表格
     initTableData () {
       this.tableColsCopy = this.tableCols.filter((item) => item.needShow);
-      this.tableColsCopy = _.orderBy(this.tableColsCopy,['orderNumber'],['asc']);
+      this.tableColsCopy = _.orderBy(this.tableColsCopy, ['orderNumber'], ['asc']);
       this.tableDataCopy = _.cloneDeep(this.tableData);
       const datas = _.cloneDeep(this.tableColsCopy);
       // const reqUts = [];

src/views/systemSettings/views/newAuth/components/table.vue

@@ -28,7 +28,7 @@
     <div class="table-yl box-public-shadow-mini">
       <div class="table-yl-head flex">
         <div class="title">列设置</div>
-        <el-button @click="restData" type="primary" size="small" class="rmScs">初始化</el-button>
+        <!-- <el-button @click="restData" type="primary" size="small" class="rmScs">初始化</el-button> -->
       </div>
       <div class="table-yl-content">
         <el-table :data="tableData" stripe border height="100%" style="width: 100%">
@@ -167,6 +167,7 @@
 <script>
 import Dialog from '@/layout/components/Dialog'
 import pb from '@/layout/mixin/getPublicData'
+import { initColumnSet } from '@/api/newLogin'
 export default {
   name: 'Table',
   mixins: [pb],
@@ -183,6 +184,10 @@ export default {
       type: String,
       default: ''
     },
+    authTable: {
+      type: Boolean,
+      default: false
+    },
   },
   components: { Dialog },
   data () {
@@ -227,15 +232,24 @@ export default {
       handler (obj) {
         if (obj.queryTemplateID) {
           obj.serviceID = obj.queryTemplateID
-          this.getTable(obj.queryTemplateID)
+          // this.getTable(obj.queryTemplateID)
         }
         this.form = obj
+        this.restData()
       },
       immediate: true
-    }
+    },
+    authTable: {
+      handler (val) {
+        if (val) {
+          this.restData()
+        }
+      },
+      immediate: true
+    },
   },
   async mounted () {
-    const result = await this.getQuery(3, false, { serviceType: 1 })
+    const result = await this.getQuery(SERVICE_ID.sysAllMenuId, false, { serviceType: 1 })
     this.authArrs = result
   },
   methods: {
@@ -255,7 +269,7 @@ export default {
     //表格数据提交
     async handleOk () {
       this.tableForm.serviceOutPutId = this.form.auth_id
-      const result = await this.generalDataReception(18122, this.tableForm, 2)
+      const result = await this.generalDataReception(SERVICE_ID.getTableColumnId, this.tableForm, 2)
       this.tableFlag = false
     },
     //表格取消
@@ -275,41 +289,19 @@ export default {
     serviceChange (val) {
       if (val) {
         this.form.queryTemplateID = val
-        this.getTable(val)
       }
     },
     handleEdit (row) {
       this.tableFlag = true
       this.tableForm = row
     },
-    async getData () {
-      const res = await this.getQuery(18122, false, { serviceOutPutId: this.form.auth_id })
-      if (res && res.length) {
-        this.allData = res
-        this.delData()
-      }
-    },
-    async delData () {
-      const res = this.allData
-      // for (let i = 0; i < res.length; i++) {
-      //   const element = res[i];
-      //   element.serviceOutPutId = this.form.auth_id;
-      // }
-      const result = await this.generalDataReception(18122, res, 3)
-      if (result) {
-        this.addData()
+    async restData () {
+      const { code, returnData } = await initColumnSet({ auth_id: this.form.auth_id })
+      if (code && returnData && returnData.length) {
+        this.tableData = returnData
+      } else {
+        this.tableData = []
       }
-    },
-    async addData () {
-      const res = this.tableData
-      for (let i = 0; i < res.length; i++) {
-        const element = res[i];
-        element.serviceOutPutId = this.form.auth_id;
-      }
-      await this.generalDataReception(18122, res, 1)
-    },
-    restData () {
-      this.getData()
     }
   }
 }

src/views/systemSettings/views/newAuth/index.vue

@@ -51,7 +51,7 @@
             </div>
           </el-form>
           <keep-alive>
-            <component ref="dataChild" :icons="icons" :authType="dataType" :authNum="authNum" :authObj="authObj" :is="componentName"></component>
+            <component ref="dataChild" :icons="icons" :authType="dataType" :authNum="authNum" :authObj="authObj" :authTable="authTable" :is="componentName"></component>
           </keep-alive>
         </div>
       </div>
@@ -120,7 +120,8 @@ export default {
       rmObj: {},
       dataType: 'add',
       authNum: null,
-      authDataArr: []
+      authDataArr: [],
+      authTable: false
     }
   },
   watch: {
@@ -197,6 +198,7 @@ export default {
       this.$refs['form'].validate(async (valid) => {
         if (valid) {
           let code = null
+          this.authTable = false
           const child = this.$refs['dataChild'].form
           const data = _.merge(child, this.form)
           if (data.pass_parameters && data.pass_parameters.length) {
@@ -225,9 +227,11 @@ export default {
               this.authObj = {}
               this.clearForm()
             }
+            this.authTable = true
             this.setTreeData()
           }
         } else {
+          this.authTable = false
           return false
         }
       });

src/views/systemSettings/views/newService/index.vue

@@ -79,7 +79,7 @@
             <div class="title">采集配置</div>
             <el-form class="flex" style="flex-wrap: wrap;justify-content: flex-start;" :inline="true" :model="formInline">
               <el-form-item label="采集类型" style="margin-left: 50px;">
-                <el-select clearable size="small"  style="width: 175px;"  v-model="formInline.taskType" placeholder="请选择采集类型">
+                <el-select clearable size="small" style="width: 175px;" v-model="formInline.taskType" placeholder="请选择采集类型">
                   <el-option label="CRON表达式" :value="0"></el-option>
                   <el-option label="轮询方式" :value="1"></el-option>
                 </el-select>
@@ -119,7 +119,7 @@
 
 <script>
 import Table from '@/views/newTable/index.vue'
-import { Query, newData, modifyData, moveData,start,stop } from "@/api/webApi"
+import { Query, newData, modifyData, moveData, start, stop } from "@/api/webApi"
 import * as _ from 'lodash'
 export default {
   name: 'NewService',
@@ -274,10 +274,10 @@ export default {
     handleStop () {
       if (this.dataObj.serviceID && this.dataType == 'edit') {
         this.dataObj.runState = 0
-        this.controlService(0, this.dataObj.serviceID)
+        this.controlService(0, this.dataObj)
       } else if (this.dataType == 'add' && this.arrs[this.arrs.length - 1].serviceID) {
         this.arrs[this.arrs.length - 1].runState = 0
-        this.controlService(0, this.arrs[this.arrs.length - 1].serviceID)
+        this.controlService(0, this.arrs[this.arrs.length - 1])
       }
       else {
         this.$message.error('请先添加当前服务后再操作')
@@ -365,7 +365,7 @@ export default {
           event: `${event}`,
         };
         const { code } =
-            event == 1
+          event == 1
             ? await newData(params)
             : event == 2
               ? await modifyData(params)

src/views/table/index.vue

@@ -263,7 +263,9 @@ export default {
     //设置新增修改表单类型
     fromDataType () {
       return function (type) {
-        return type.replace(/\([^\)]*\)/g, "");
+        if (type) {
+          return type.replace(/\([^\)]*\)/g, "");
+        }
       }
     },
 
@@ -288,7 +290,7 @@ export default {
     },
   },
   mounted () {
-    const { qid, title, auth_id } = this.$route.meta
+    const { title, auth_id } = this.$route.meta
     const { arrs } = getAuthData(auth_id)
     const table = arrs.filter(item => item.auth_type == 4)
     if (table && table.length) {
@@ -303,12 +305,12 @@ export default {
           this.autoBtnObj(item)
         })
       }
-      this.getQuery(obj.queryTemplateID);
+      this.getColumnData(obj.auth_id);
     } else {
       this.pageTitle = title;
-      if (qid) {
-        this.queryId = qid;
-        this.getQuery(qid);
+      if (auth_id) {
+        this.queryId = auth_id;
+        this.getColumnData(auth_id);
       }
     }
   },
@@ -321,8 +323,34 @@ export default {
     // this.$refs['table'].style.width = this.tableOther.table_width
   },
   methods: {
+    //获取表头数据
+    async getColumnData (id) {
+      try {
+        const { code, returnData } = await Query({
+          serviceId: SERVICE_ID.getTableColumnId,
+          dataContent: {
+            serviceOutPutId: id
+          },
+        });
+        if (code == 0) {
+          if (returnData && returnData.length) {
+            const titleColumn = returnData.find(
+              (item) => item.needShow === 1
+            );
+            if (titleColumn) {
+              this.rowTitle = titleColumn.columnName;
+            }
+            this.tableCols = returnData;
+            this.getQuery(this.queryId);
+          }
+        } else {
+          this.$message.error("获取表头数据失败");
+        }
+      } catch (error) {
+        console.log(error)
+      }
+    },
     autoBtnObj (item) {
-      console.log(item)
       switch (item.service_type) {
         case '1':
           this.btnQueryObj = item
@@ -460,7 +488,7 @@ export default {
     async getQuery (id, dataContent = this.dataContent) {
       try {
         this.loading = true;
-        const { code, returnData, columnset } = await Query({
+        const { code, returnData } = await Query({
           serviceId: id,
           page: ++this.page,
           pageSize: this.pageSize,
@@ -472,14 +500,8 @@ export default {
             this.noMore = true;
             this.loading = false;
           }
-          const titleColumn = columnset.find(
-            (item) => item.needShow === 1
-          );
-          if (titleColumn) {
-            this.rowTitle = titleColumn.columnName;
-          }
           this.tableData.push(...returnData);
-          this.tableCols = columnset;
+          // this.tableCols = columnset;
           this.serviceId = id;
           setTimeout(() => {
             this.initTableData();