修改

public/config.js

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

src/layout/mixin/getPublicData.js

@@ -18,7 +18,7 @@ export default {
     //查询
     async getQuery (id, type = false, dataContent = {}, pageSize) {
       try {
-        this.loading = true;
+        // this.loading = true;
         const { code, columnset, returnData } = await Query({
           serviceId: id,
           page: this.pageIndex,

src/utils/request.js

@@ -92,6 +92,7 @@ service.interceptors.response.use(
   },
   (error) => {
     const des500 = `${error}`.split(" ").includes("500");
+    return
     if (des500) {
       Message({
         message: "身份令牌过期或失效，即将重新登录",

src/views/newRole/index.vue

@@ -66,12 +66,11 @@
             <div class="newService-content-left-bottom">
               <el-scrollbar ref="scroll" style="height: 100%">
                 <div class="newService-content-left-bottom-tree">
-                  <el-tree ref="tree" :data="treeData" :props="defaultProps" highlight-current :filter-node-method="filterNode" default-expand-all node-key="auth_id" @node-click="handleNodeClick" :expand-on-click-node="false">
+                  <el-tree ref="tree" show-checkbox :data="treeData" :props="defaultProps" highlight-current :filter-node-method="filterNode" default-expand-all node-key="auth_id" @check="checkChange" @node-click="handleNodeClick" :expand-on-click-node="false">
                     <span class="custom-tree-node" slot-scope="{ node, data }">
                       <span class="customTxt">{{ node.label }}</span>
                       <span v-show="treeCheckId == data.auth_id" class="customBtn">
-                        <span v-if="data.auth_id != 0" class="ym">列授权</span>
-                        <span v-if="data.auth_id != 0" class="rm" @click.stop="handleRemove(node, data)">删除</span>
+                        <span @click="setItem(node,data)" v-if="data.auth_id != 0 && data.auth_type == 4" class="ym">列授权</span>
                       </span>
                     </span>
                   </el-tree>
@@ -82,19 +81,24 @@
           <div class="newService-content-right-bottom contents2 flex1">
             <div class="newService-content-left-top">
               <div class="flex head">
-                <div class="title">权限列表</div>
+                <div class="title">列授权</div>
               </div>
             </div>
             <div class="newService-content-left-bottom">
-              <el-scrollbar ref="scroll" style="height: 100%">
-                <el-checkbox-group v-model="checkGroup" size="small">
-                  <el-row :gutter="20">
-                    <el-col v-for="(item,index) in checkArrs" :key="index" :span="8">
-                      <el-checkbox :label="item.value" border>{{ item.label }}</el-checkbox>
-                    </el-col>
-                  </el-row>
-                </el-checkbox-group>
-              </el-scrollbar>
+              <template v-if="checkArrs.length">
+                <el-scrollbar ref="scroll" style="height: 100%">
+                  <el-checkbox-group @change="groupChange" v-model="checkGroup" size="small">
+                    <el-row :gutter="20">
+                      <el-col v-for="(item,index) in checkArrs" :key="index" :span="8">
+                        <el-checkbox :label="item.columnName" border>{{ item.columnLabel }}</el-checkbox>
+                      </el-col>
+                    </el-row>
+                  </el-checkbox-group>
+                </el-scrollbar>
+              </template>
+              <template v-else>
+                <el-empty description="暂无数据"></el-empty>
+              </template>
             </div>
           </div>
         </div>
@@ -142,12 +146,15 @@ export default {
         }
       ],
       treeCheckId: '',
+      treeCheckObj: {},
       defaultProps: {
         children: 'children',
         label: 'auth_name'
       },
       checkGroup: [],
-      checkArrs: new Array(10).fill({ label: '111', value: '111' })
+      checkArrs: [],
+      checkDatas: [],
+      checkGroups: []
     }
   },
   computed: {
@@ -242,22 +249,38 @@ export default {
       }
     },
     //服务列表-点击
-    handleClick (item, index) {
+    async handleClick (item, index) {
       this.dataType = 'edit'
       this.dataObj = _.cloneDeep(item)
       this.formInline = _.cloneDeep(item)
       this.activeIndex = index
       this.flag = false
+      const result = await this.getQuery(SERVICE_ID.authTreeId, false, { role_id: item.role_ID })
+      this.checkDatas.push(result)
+      if (result && result.length) {
+        const datas = []
+        result.forEach(item => {
+          datas.push(item.auth_id)
+        })
+        this.$refs.tree.setCheckedKeys(datas)
+        const treeDatas = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes())
+        const res = [...treeDatas, ...result].filter((item) => !(treeDatas.some((p) => item.auth_id == p.auth_id) && result.some((c) => item.auth_id == c.auth_id)))
+        setTimeout(() => {
+          res.forEach((item) => {
+            this.$refs.tree.setChecked(item.auth_id, false, false);
+          });
+        }, 50);
+      }
     },
     //服务列表-保存
     handleSave () {
       if (this.dataObj.role_ID && this.dataType == 'edit') {
-        this.generalDataReception(2, this.formInline)
+        this.generalDataReception(this.queryId, 2, this.formInline)
       } else if (this.dataType == 'add' && this.arrs[this.arrs.length - 1].role_ID) {
         this.formInline.role_ID = this.arrs[this.arrs.length - 1].role_ID
-        this.generalDataReception(2, this.formInline)
+        this.generalDataReception(this.queryId, 2, this.formInline)
       } else if (this.dataType == 'add') {
-        this.generalDataReception(1, this.formInline)
+        this.generalDataReception(this.queryId, 1, this.formInline)
       }
       else {
         this.$message.error('请先选中服务后再操作')
@@ -271,7 +294,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.generalDataReception(3, this.dataObj)
+          this.generalDataReception(this.queryId, 3, this.dataObj)
           this.activeIndex = null;
           this.dataObj = {};
           for (const key in this.formInline) {
@@ -292,7 +315,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.generalDataReception(3, this.arrs[this.arrs.length - 1])
+          this.generalDataReception(this.queryId, 3, this.arrs[this.arrs.length - 1])
           this.activeIndex = null;
           this.dataObj = {};
           for (const key in this.formInline) {
@@ -317,10 +340,10 @@ export default {
       }
     },
     //服务列表-增/删/改
-    async generalDataReception (event, data) {
+    async generalDataReception (id = this.queryId, event, data, type) {
       try {
         const params = {
-          serviceId: this.queryId,
+          serviceId: id,
           dataContent: data,
           event: `${event}`,
         };
@@ -332,8 +355,12 @@ export default {
               : await moveData(params);
         if (code == 0) {
           this.$message.success("操作成功");
-          this.resetTable();
-          this.getQueryList(this.queryId);
+          if (type) {
+
+          } else {
+            this.resetTable();
+            this.getQueryList(this.queryId);
+          }
         } else {
           this.$message.error("操作失败");
         }
@@ -343,6 +370,105 @@ export default {
     },
     handleNodeClick (data) {
       this.treeCheckId = data.auth_id
+      this.treeCheckObj = data
+    },
+    checkChange () {
+      if (this.dataObj.role_ID) {
+        const datas = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+        const arrs = datas.filter(item => item.auth_id != 0)
+        this.checkDatas.push(arrs)
+        const data1 = this.checkDatas[this.checkDatas.length - 1]; //最后一条数据
+        const data2 = this.checkDatas[this.checkDatas.length - 2]; //倒数第二条数据
+        if (data1.length > data2.length) {
+          this.checksBoxTs(data1, data2, "add");
+        } else {
+          this.checksBoxTs(data2, data1, "del");
+        }
+      } else {
+        this.$message.error('请选中角色后再操作');
+        this.$refs.tree.setCheckedKeys([]);
+      }
+    },
+    async checksBoxTs (datas, arr, type) {
+      const res = [...datas, ...arr].filter((item) => !(datas.some((p) => item.auth_id == p.auth_id) && arr.some((c) => item.auth_id == c.auth_id)));
+      res.forEach(item => {
+        item.role_id = this.dataObj.role_ID
+      })
+      if (type == 'add') {
+        this.generalDataReception(SERVICE_ID.authTreeId, 1, res, true)
+      } else {
+        this.generalDataReception(SERVICE_ID.authTreeId, 3, res, true)
+      }
+    },
+    async setItem (node, data) {
+      if (this.dataObj.role_ID) {
+        const result = await this.getQuery(SERVICE_ID.getTableColumnId, false, { serviceOutPutId: data.auth_id })
+        if (result && result) {
+          this.checkArrs = result
+          const res = await this.getQuery(SERVICE_ID.authTreeId, false, { auth_id: data.auth_id, role_id: this.dataObj.role_ID })
+          if (res && res.length) {
+            const datas = []
+            res.forEach(item => {
+              if (item.columnname) {
+                datas.push(item.columnname)
+              }
+            })
+            if (datas.length) {
+              this.checkGroups.push(datas)
+            }
+            this.checkGroup = datas
+          }
+        }
+      } else {
+        this.$message.error('请选中角色后再操作');
+      }
+    },
+    groupChange (val) {
+      this.checkGroups.push(val)
+      if (this.checkGroups.length == 1) {
+        const res = this.getColName(val)
+        const result = this.sendCheckData(res)
+        this.generalDataReception(SERVICE_ID.authTreeId, 1, result, true)
+      } else if (this.checkGroups.length > 1) {
+        const data1 = this.checkGroups[this.checkGroups.length - 1]; //最后一条数据
+        const data2 = this.checkGroups[this.checkGroups.length - 2]; //倒数第二条数据
+        const msg = [...data1, ...data2].filter((item) => !(data1.some((p) => item == p) && data2.some((c) => item == c)));
+        const cap = this.getColName(msg)
+        const result = this.sendCheckData(cap)
+        if (data1.length > data2.length) {
+          this.generalDataReception(SERVICE_ID.authTreeId, 1, result, true)
+        } else {
+          this.generalDataReception(SERVICE_ID.authTreeId, 3, result, true)
+        }
+      }
+    },
+    sendCheckData (arr) {
+      const newData = []
+      arr.forEach(item => {
+        const obj = {
+          "role_id": this.dataObj.role_ID,
+          "role_name": this.dataObj.role_name,
+          "role_status": this.dataObj.role_status,
+          "auth_id": this.treeCheckObj.auth_id,
+          "auth_type": this.treeCheckObj.auth_type,
+          "queryTemplateColumnSetID": item.queryTemplateColumnSetID,
+          "columnLabel": item.columnLabel,
+          "columnname": item.columnName
+        }
+        newData.push(obj)
+      })
+      return newData
+    },
+    getColName (arr) {
+      const res = []
+      this.checkArrs.forEach(item => {
+        arr.forEach(p => {
+          if (item.columnName == p) {
+            res.push(item)
+          }
+        })
+      })
+      return res
     },
     handleRemove (node, data) {
 

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

@@ -28,6 +28,7 @@
             <el-option label="修改" value="3"></el-option>
             <el-option label="删除" value="4"></el-option>
             <el-option label="其他" value="5"></el-option>
+            <el-option label="数据项" value="6"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item class="flex1" label="关联数据项">
@@ -66,6 +67,7 @@
 
 <script>
 import pb from '@/layout/mixin/getPublicData'
+import { initColumnSet } from '@/api/newLogin'
 export default {
   name: 'Button',
   mixins: [pb],
@@ -121,8 +123,8 @@ export default {
         if (!Array.isArray(obj.pass_parameters) && obj.pass_parameters) {
           obj.pass_parameters = obj.pass_parameters.split(',')
         }
-        if (obj.queryTemplateID || obj.serviceID) {
-          this.getRelationData(obj.queryTemplateID ?? obj.serviceID)
+        if (obj.up_auth_id) {
+          this.getRelationData(obj.up_auth_id)
         }
         this.form = obj
       },
@@ -137,6 +139,9 @@ export default {
       immediate: true
     }
   },
+  mounted () {
+    this.getRelationData()
+  },
   methods: {
     //清空表单
     clearForm () {
@@ -147,10 +152,12 @@ export default {
         }
       }
     },
-    async getRelationData (id) {
-      const result = await this.getQuery(id, true)
-      this.relationData = result
-      this.passData = result
+    async getRelationData (id = this.form.up_auth_id) {
+      const result = await this.getQuery(SERVICE_ID.getTableColumnId, false, { serviceOutPutId: id })
+      if (result && result.length) {
+        this.relationData = result
+        this.passData = result
+      }
     }
   }
 }

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

@@ -35,7 +35,7 @@
               <el-form-item class="flex1" prop="auth_name" label="权限项名称">
                 <el-input size="small" clearable placeholder="请输入权限项名称" v-model="form.auth_name"></el-input>
               </el-form-item>
-              <el-form-item class="flex1" prop="up_auth_id" label="上级权限项">
+              <el-form-item class="flex1" label="上级权限项">
                 <el-select @change="authChange" size="small" clearable v-model="form.up_auth_id" placeholder="请选择上级权限项">
                   <el-option v-for="(item,index) in authDataArr" :key="index" :label="item.auth_name" :value="item.auth_id"></el-option>
                 </el-select>
@@ -252,10 +252,7 @@ export default {
       }
     },
     authChange (val) {
-      const obj = this.authDataArr.filter(item => item.auth_id == val)[0]
-      if (obj['serviceID'] || obj['queryTemplateID']) {
-        this.authNum = obj['serviceID'] ?? obj['queryTemplateID']
-      }
+      this.authNum = val
     }
   }
 }

src/views/table/components/authButton.vue

@@ -34,7 +34,7 @@ export default {
         func = (row) => context.parent.handleEdit(row)
       } else if (service_type == 4) {
         func = (row) => context.parent.handleRemove(row)
-      } else {
+      } else if (service_type == 5) {
         func = (row, auth) => context.parent.handleOther(row, auth)
       }
 

src/views/table/css/index.scss

@@ -65,91 +65,20 @@
         }
       }
     }
-    .rmScs {
-      width: 48px;
-      height: 24px;
-      border-color: #9ebbf7;
-      box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.06);
-      border-radius: 4px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      float: left;
-      span {
-        color: #2d67e3;
-      }
-    }
-    .rmScser {
-      width: 60px;
-      height: 24px;
-      border-color: #9ebbf7;
-      box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.06);
-      border-radius: 4px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      float: left;
-      span {
-        color: #2d67e3;
-      }
-    }
-    .rmSc {
-      width: 48px;
-      height: 24px;
-      background: #eb2f3b;
-      box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.06);
-      border-radius: 4px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      span {
-        color: #ffffff;
-      }
-    }
-
-    .hrefBtn {
-      width: 48px;
-      height: 24px;
-      background: #6f81bc;
-      box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.06);
-      border-radius: 4px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      span {
-        color: #ffffff;
-      }
-    }
-    .tableStatus {
-      font-size: 14px;
-      .icon {
-        width: 14px;
-        height: 14px;
-        background: #2d67e3;
-        border-radius: 2px;
-        display: inline-block;
-        vertical-align: middle;
-        position: relative;
-        top: -2px;
-      }
-      .status0 {
-        position: relative;
-        top: 5px;
-      }
-      .status1 {
-        position: relative;
-        top: 5px;
-        .icon {
-          background-color: #afb4bf;
+    .is-click-btn{
+       & > div{
+        cursor: pointer;
+        &::after{
+          content: "";
+          display: block;
+          width: 100px;
+          position: absolute;
+          bottom: 10px;
+          left: 50%;
+          margin-left: -50px;
+          border-bottom: 1px solid #101116;
         }
-      }
-      .status2 {
-        position: relative;
-        top: 5px;
-        .icon {
-          background-color: #eb2f3b;
-        }
-      }
+       }
     }
     .el-table__fixed-right {
       thead {

src/views/table/index.vue

@@ -10,7 +10,7 @@
       </div>
       <template v-if="tableData.length || tableCols.length">
         <div style="height: calc(100% - 40px);">
-          <el-table v-el-table-infinite-scroll="load" :data="filteredTableData" :summary-method="getSummaries" :span-method="tableSpanMethod" stripe :show-summary="showSummary" border ref="table" :height="tableHeight ? tableHeight : minHeight - 8 + 'vh'" class="table infinite-list" style=" overflow: auto" :style="{width: tableWidth ? tableWidth : '100%'}" @select="selectHandler">
+          <el-table v-el-table-infinite-scroll="load" :data="filteredTableData" :summary-method="getSummaries" :span-method="tableSpanMethod" stripe :show-summary="showSummary" border @cell-click="cellClick" :cell-class-name="cellClass" ref="table" :height="tableHeight ? tableHeight : minHeight - 8 + 'vh'" class="table infinite-list" style=" overflow: auto" :style="{width: tableWidth ? tableWidth : '100%'}" @select="selectHandler">
             <el-table-column v-for="(item, index) in tableColsCopy" :sortable="item.needSort ? true : false" :key="index" :prop="item.columnName" :label="item.columnLabel" :show-overflow-tooltip="showOverflowTooltip">
               <template #header>
                 <span class="colTips">
@@ -38,7 +38,7 @@
                 </span>
               </template>
             </el-table-column>
-            <el-table-column fixed="right" label="操作" :width="fixedWidth">
+            <el-table-column v-if="authBtns.length" fixed="right" label="操作" :width="fixedWidth">
               <template slot-scope="scope">
                 <div class="hd-td">
                   <auth-button v-for="(item,index) in authBtns" :key="index" :auth="item" :row="scope.row" />
@@ -227,7 +227,10 @@ export default {
       btnRecordObj: {},
       isAuto: false,
       dialogFlag: false,
-      authBtns: []
+      authBtns: [],
+      authBtnCol: [],
+      authBtnColName: [],
+      urlParams: {}
     };
   },
   computed: {
@@ -288,9 +291,11 @@ export default {
     },
   },
   mounted () {
+    const { query } = this.$route
     const { title, auth_id } = this.$route.meta
     const { arrs } = getAuthData(auth_id)
     const table = arrs.filter(item => item.auth_type == 4)
+    this.urlParams = query
     if (table && table.length) {
       const obj = table[0]
       const { arrs } = getAuthData(obj.auth_id)
@@ -298,7 +303,13 @@ export default {
       this.tableOther = obj
       this.pageTitle = obj.auth_name;
       this.queryId = obj.queryTemplateID;
-      this.authBtns = arrs.filter(item => Number(item.service_type) > 2)
+      this.authBtns = arrs.filter(item => Number(item.service_type) > 2 && Number(item.service_type) < 6)
+      this.authBtnCol = arrs.filter(item => Number(item.service_type) == 6)
+      if (this.authBtnCol.length) {
+        this.authBtnCol.forEach(item => {
+          this.authBtnColName.push(item.relation_data)
+        })
+      }
       if (arrs && arrs.length) {
         arrs.forEach(item => {
           this.autoBtnObj(item)
@@ -340,7 +351,11 @@ export default {
               this.rowTitle = titleColumn.columnName;
             }
             this.tableCols = returnData;
-            this.getQuery(this.queryId);
+            if (Object.keys(this.urlParams).length) {
+              this.getQuery(this.queryId, this.urlParams);
+            } else {
+              this.getQuery(this.queryId);
+            }
           }
         } else {
           this.$message.error("获取表头数据失败");
@@ -405,7 +420,11 @@ export default {
         if (this.noMore || this.loading) {
           return;
         }
-        this.getQuery(this.queryId);
+        if (Object.keys(this.urlParams).length) {
+          this.getQuery(this.queryId, this.urlParams);
+        } else {
+          this.getQuery(this.queryId);
+        }
       }
     },
     resetTable () {
@@ -860,6 +879,37 @@ export default {
     //高级查询关闭
     dialogHide () {
       this.dialogFlag = false
+    },
+    //表格-单元格点击
+    cellClick (row, column) {
+      const dataBtns = this.authBtnCol
+      if (dataBtns && dataBtns.length) {
+        const clickBtn = dataBtns.filter(item => item.relation_data == column.property)[0]
+        if (clickBtn) {
+          const { open_method, route_info, pass_parameters } = clickBtn
+          if (open_method == 2) {
+            if (pass_parameters) {
+              const query = pass_parameters.split(',')
+              const obj = {}
+              query.forEach(item => {
+                obj[item] = row[item]
+              })
+              this.$router.push({
+                path: route_info,
+                query: obj
+              })
+            } else {
+              this.autoBtnClick(open_method, route_info)
+            }
+          }
+        }
+      }
+    },
+    //表格-设置单元格样式
+    cellClass ({ row, column, rowIndex, columnIndex }) {
+      if (this.authBtnColName.includes(column.property)) {
+        return 'is-click-btn'
+      }
     }
   },
 };